Refs #12396. Use Mantid::VATES namespace.

mantidproject · Jul 17, 2015 · 1f32952 · 1f32952
1 parent 8717bac
commit 1f32952
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHWSignalArray.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHWSignalArray.h
@@ -28,9 +28,15 @@
 
 #include "vtkTypeTemplate.h"  // For templated vtkObject API
 #include "vtkObjectFactory.h" // for vtkStandardNewMacro
+#include "vtkIdList.h"
+#include "vtkVariant.h"
+#include "vtkVariantCast.h"
 
 #include "MantidDataObjects/MDHistoWorkspaceIterator.h"
 
+namespace Mantid {
+namespace VATES {
+
 template <class Scalar>
 class vtkMDHWSignalArray : public vtkTypeTemplate<vtkMDHWSignalArray<Scalar>,
                                                   vtkMappedDataArray<Scalar>> {
@@ -111,11 +117,6 @@ class vtkMDHWSignalArray : public vtkTypeTemplate<vtkMDHWSignalArray<Scalar>,
   Scalar m_temporaryTuple[1];
 };
 
-#include "vtkIdList.h"
-#include "vtkObjectFactory.h"
-#include "vtkVariant.h"
-#include "vtkVariantCast.h"
-
 //------------------------------------------------------------------------------
 // Can't use vtkStandardNewMacro on a templated class.
 template <class Scalar>
@@ -488,6 +489,8 @@ template <class Scalar> vtkMDHWSignalArray<Scalar>::vtkMDHWSignalArray() {}
 
 //------------------------------------------------------------------------------
 template <class Scalar> vtkMDHWSignalArray<Scalar>::~vtkMDHWSignalArray() {}
+}
+}
 
 #endif // vtkMDHWSignalArray_h
 

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkStructuredPointsArray.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkStructuredPointsArray.h
@@ -28,14 +28,17 @@
 
 #include "vtkTypeTemplate.h"  // For templated vtkObject API
 #include "vtkObjectFactory.h" // for vtkStandardNewMacro
+#include "vtkIdList.h"
+#include "vtkVariant.h"
+#include "vtkVariantCast.h"
+//#include <vtkMatrix3x3.h>
 
 #include "MantidDataObjects/MDHistoWorkspace.h"
-#include "MantidAPI/NullCoordTransform.h"
-#include <vtkMatrix3x3.h>
 
 #include <cstdlib>
 
-class vtkImageData;
+namespace Mantid {
+namespace VATES {
 
 template <class Scalar>
 class vtkStructuredPointsArray
@@ -120,12 +123,6 @@ class vtkStructuredPointsArray
   Mantid::DataObjects::MDHistoWorkspace *m_workspace;
 };
 
-#include "vtkIdList.h"
-#include "vtkObjectFactory.h"
-#include "vtkVariant.h"
-#include "vtkVariantCast.h"
-#include "vtkImageData.h"
-
 //------------------------------------------------------------------------------
 // Can't use vtkStandardNewMacro on a templated class.
 template <class Scalar>
@@ -561,6 +558,8 @@ vtkStructuredPointsArray<Scalar>::vtkStructuredPointsArray() {}
 //------------------------------------------------------------------------------
 template <class Scalar>
 vtkStructuredPointsArray<Scalar>::~vtkStructuredPointsArray() {}
+}
+}
 
 #endif // vtkStructuredPointsArray_h