Refs #10833 Renaming the xml definitions for vates

mantidproject · Jan 14, 2015 · d436330 · d436330
1 parent 212d489
commit d436330
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx
@@ -11,7 +11,7 @@
 #include "MantidVatesAPI/FieldDataToMetadata.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/NoThresholdRange.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidVatesAPI/vtkDataSetToNonOrthogonalDataSet.h"
 #include "MantidVatesAPI/vtkDataSetToWsName.h"
 #include "MantidVatesAPI/vtkSplatterPlotFactory.h"

diff --git a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
@@ -22,12 +22,12 @@ src/MedianAndBelowThresholdRange.cpp
 src/MetadataToFieldData.cpp
 src/NoThresholdRange.cpp
 src/ProgressAction.cpp
-src/RebinningCutterXMLDefinitions.cpp
 src/RebinningKnowledgeSerializer.cpp
 src/SynchronisingGeometryPresenter.cpp
 src/TimeStepToTimeStep.cpp
 src/TimeToTimeStep.cpp
 src/UserDefinedThresholdRange.cpp
+src/VatesXMLDefinitions.cpp
 src/vtkDataSetFactory.cpp
 src/vtkDataSetToGeometry.cpp
 src/vtkDataSetToImplicitFunction.cpp
@@ -74,14 +74,14 @@ inc/MantidVatesAPI/IMDDimensionComparitor.h
 inc/MantidVatesAPI/MetadataToFieldData.h
 inc/MantidVatesAPI/NoThresholdRange.h
 inc/MantidVatesAPI/ProgressAction.h
-inc/MantidVatesAPI/RebinningCutterXMLDefinitions.h 
 inc/MantidVatesAPI/RebinningKnowledgeSerializer.h
 inc/MantidVatesAPI/SQWLoadingPresenter.h
 inc/MantidVatesAPI/SynchronisingGeometryPresenter.h
 inc/MantidVatesAPI/ThresholdRange.h
 inc/MantidVatesAPI/TimeStepToTimeStep.h
 inc/MantidVatesAPI/TimeToTimeStep.h
 inc/MantidVatesAPI/UserDefinedThresholdRange.h
+inc/MantidVatesAPI/VatesXMLDefinitions.h 
 inc/MantidVatesAPI/vtkDataSetFactory.h
 inc/MantidVatesAPI/vtkDataSetToGeometry.h
 inc/MantidVatesAPI/vtkDataSetToImplicitFunction.h

diff --git a/...dVatesAPI/RebinningCutterXMLDefinitions.h → .../inc/MantidVatesAPI/VatesXMLDefinitions.h b/...dVatesAPI/RebinningCutterXMLDefinitions.h → .../inc/MantidVatesAPI/VatesXMLDefinitions.h
@@ -1,5 +1,5 @@
-#ifndef REBINNINGCUTTERXMLDEFINITIONS_H_
-#define REBINNINGCUTTERXMLDEFINITIONS_H_
+#ifndef VATESXMLDEFINITIONS_H_
+#define VATESXMLDEFINITIONS_H_
 
 #include <string>
 #include "MantidKernel/System.h"
@@ -10,7 +10,7 @@ namespace VATES
 
 /**
 
- This type contains definitions that will be found in the xml schema for the rebinning instructions, but must be used in
+ This type contains definitions that will be found in the xml schema of VATES, but must be used in
  code as part of the peristance/fetching routines. This file provides a single location for definitions to aid future maintenance.
 
  @author Owen Arnold, Tessella plc

diff --git a/Code/Mantid/Vates/VatesAPI/src/MDEWLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDEWLoadingPresenter.cpp
@@ -5,7 +5,7 @@
 #include "MantidGeometry/MDGeometry/NullImplicitFunction.h"
 #include "MantidVatesAPI/RebinningKnowledgeSerializer.h"
 #include "MantidVatesAPI/MetadataToFieldData.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidVatesAPI/Common.h"
 
 #include <boost/algorithm/string.hpp>

diff --git a/Code/Mantid/Vates/VatesAPI/src/MDHWLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDHWLoadingPresenter.cpp
@@ -6,7 +6,7 @@
 #include "MantidGeometry/MDGeometry/NullImplicitFunction.h"
 #include "MantidVatesAPI/RebinningKnowledgeSerializer.h"
 #include "MantidVatesAPI/MetadataToFieldData.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidVatesAPI/vtkDataSetToNonOrthogonalDataSet.h"
 #include "MantidVatesAPI/vtkDataSetToWsName.h"
 #include "MantidVatesAPI/Common.h"

diff --git a/Code/Mantid/Vates/VatesAPI/src/RebinningCutterXMLDefinitions.cpp b/Code/Mantid/Vates/VatesAPI/src/RebinningCutterXMLDefinitions.cpp
diff --git a/Code/Mantid/Vates/VatesAPI/src/RebinningKnowledgeSerializer.cpp b/Code/Mantid/Vates/VatesAPI/src/RebinningKnowledgeSerializer.cpp
@@ -5,7 +5,7 @@
 #include <boost/format.hpp>
 #include "MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h"
 #include "MantidVatesAPI/RebinningKnowledgeSerializer.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 
 using Mantid::Geometry::MDGeometryXMLDefinitions;
 namespace Mantid

diff --git a/Code/Mantid/Vates/VatesAPI/src/VatesXMLDefinitions.cpp b/Code/Mantid/Vates/VatesAPI/src/VatesXMLDefinitions.cpp
@@ -0,0 +1,9 @@
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
+
+namespace Mantid
+{
+namespace VATES
+{
+
+}
+}
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToGeometry.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToGeometry.cpp
@@ -1,6 +1,6 @@
 #include "MantidVatesAPI/vtkDataSetToGeometry.h"
 #include "MantidVatesAPI/FieldDataToMetadata.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h"
 #include "vtkDataSet.h"
 

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToImplicitFunction.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToImplicitFunction.cpp
@@ -1,6 +1,6 @@
 #include "MantidVatesAPI/vtkDataSetToImplicitFunction.h"
 #include "MantidVatesAPI/FieldDataToMetadata.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h"
 #include "MantidAPI/ImplicitFunctionFactory.h"
 #include "MantidGeometry/MDGeometry/NullImplicitFunction.h"

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToWsLocation.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToWsLocation.cpp
@@ -1,6 +1,6 @@
 #include "MantidVatesAPI/vtkDataSetToWsLocation.h"
 #include "MantidVatesAPI/FieldDataToMetadata.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h"
 #include <vtkDataSet.h>
 #include <Poco/DOM/DOMParser.h>

diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToWsName.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkDataSetToWsName.cpp
@@ -1,6 +1,6 @@
 #include "MantidVatesAPI/vtkDataSetToWsName.h"
 #include "MantidVatesAPI/FieldDataToMetadata.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLDefinitions.h"
 #include <vtkDataSet.h>
 #include <Poco/DOM/DOMParser.h>

diff --git a/Code/Mantid/Vates/VatesAPI/test/MockObjects.h b/Code/Mantid/Vates/VatesAPI/test/MockObjects.h
@@ -17,7 +17,7 @@
 #include "MantidVatesAPI/vtkDataSetFactory.h"
 #include "MantidVatesAPI/MDLoadingView.h"
 #include "MantidVatesAPI/ProgressAction.h"
-#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
+#include "MantidVatesAPI/VatesXMLDefinitions.h"
 #include "MantidVatesAPI/WorkspaceProvider.h"
 #include "MantidAPI/NullCoordTransform.h"
 #include "MantidAPI/FrameworkManager.h"