Rename RegisterDataItemInterface to DataItemInterface.

Refs #8996
mantidproject · Feb 17, 2014 · 52351ae · 52351ae
1 parent 096a518
commit 52351ae
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/...rnel/Registry/RegisterDataItemInterface.h → ...rface/kernel/Registry/DataItemInterface.h b/...rnel/Registry/RegisterDataItemInterface.h → ...rface/kernel/Registry/DataItemInterface.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_PYTHONINTERFACE_REGISTERDATEITEMINTERFACE_H_
-#define MANTID_PYTHONINTERFACE_REGISTERDATEITEMINTERFACE_H_
+#ifndef MANTID_PYTHONINTERFACE_DATEITEMINTERFACE_H_
+#define MANTID_PYTHONINTERFACE_DATEITEMINTERFACE_H_
 /**
     Copyright &copy; 2014 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
 
@@ -42,12 +42,12 @@ namespace Mantid { namespace PythonInterface
      * insert method.
      */
     template<typename IType>
-    struct DLLExport RegisterDataItemInterface
+    struct DLLExport DataItemInterface
     {
       typedef boost::shared_ptr<IType> IType_sptr;
       typedef boost::weak_ptr<IType> IType_wptr;
       /// Constructor
-      RegisterDataItemInterface() 
+      DataItemInterface() 
       {
         using namespace boost::python;
         using namespace Registry;
@@ -58,7 +58,7 @@ namespace Mantid { namespace PythonInterface
         TypeRegistry::subscribe< TypedPropertyValueHandler<IType_sptr> >();
       }
       /// Register a downcast for this ID
-      RegisterDataItemInterface & castFromID(const std::string &id)
+      DataItemInterface & castFromID(const std::string &id)
       {
         using namespace Registry;
         DowncastRegistry::subscribe<IType>(id);
@@ -69,4 +69,4 @@ namespace Mantid { namespace PythonInterface
   }
 }}
 
-#endif /* MANTID_PYTHONINTERFACE_REGISTERDATEITEMINTERFACE_H_ */
+#endif /* MANTID_PYTHONINTERFACE_DATEITEMINTERFACE_H_ */
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp
@@ -1,12 +1,12 @@
 #include "MantidAPI/IEventWorkspace.h"
 #include "MantidAPI/IEventList.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/object.hpp>
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
 /**
@@ -26,7 +26,7 @@ void export_IEventWorkspace()
     .def("clearMRU", &IEventWorkspace::clearMRU, args("self"), "Clear the most-recently-used lists")
     ;
 
-  RegisterDataItemInterface<IEventWorkspace>()
+  DataItemInterface<IEventWorkspace>()
     // map IDs to this interface
     .castFromID("EventWorkspace")
   ;

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
@@ -1,11 +1,11 @@
 #include "MantidAPI/IMDEventWorkspace.h"
 
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 #include <boost/python/class.hpp>
 #include <boost/python/register_ptr_to_python.hpp>
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
 namespace
@@ -31,7 +31,7 @@ void export_IMDEventWorkspace()
   ;
 
   //-----------------------------------------------------------------------------------------------
-  RegisterDataItemInterface<IMDEventWorkspace> entry;
+  DataItemInterface<IMDEventWorkspace> entry;
   // The IDs for the MDEventWorkpaces are constructed from the event types and number of dimensions
   const char *eventTypes[NUM_EVENT_TYPES]= { "MDEvent", "MDLeanEvent" };
 

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
@@ -1,14 +1,14 @@
 #include "MantidAPI/IMDHistoWorkspace.h"
 #include "MantidPythonInterface/kernel/Converters/CArrayToNDArray.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/copy_non_const_reference.hpp>
 #include <boost/python/numeric.hpp>
 
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 namespace Converters = Mantid::PythonInterface::Converters;
 using namespace boost::python;
 
@@ -189,7 +189,7 @@ void export_IMDHistoWorkspace()
 
   //-------------------------------------------------------------------------------------------------
 
-  RegisterDataItemInterface<IMDHistoWorkspace>()
+  DataItemInterface<IMDHistoWorkspace>()
     .castFromID("MDHistoWorkspace")
   ;
 }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
@@ -1,12 +1,12 @@
 #include "MantidAPI/IMDWorkspace.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/enum.hpp>
 #include <boost/python/self.hpp>
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
 void export_IMDWorkspace()
@@ -22,6 +22,6 @@ void export_IMDWorkspace()
     .def("getNEvents", &IMDWorkspace::getNEvents, args("self"), "Returns the total number of events, contributed to the workspace")
     ;
 
-  RegisterDataItemInterface<IMDWorkspace>();
+  DataItemInterface<IMDWorkspace>();
 }
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
@@ -1,11 +1,11 @@
 #include "MantidAPI/IPeaksWorkspace.h"
 #include "MantidAPI/IPeak.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 #include <boost/python/class.hpp>
 #include <boost/python/return_internal_reference.hpp>
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
 void export_IPeaksWorkspace()
@@ -25,7 +25,7 @@ void export_IPeaksWorkspace()
 
   //-------------------------------------------------------------------------------------------------
 
-  RegisterDataItemInterface<IPeaksWorkspace>()
+  DataItemInterface<IPeaksWorkspace>()
     .castFromID("PeaksWorkspace")
   ;
 }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
@@ -5,7 +5,7 @@
 #include "MantidPythonInterface/kernel/Converters/NDArrayToVector.h"
 #include "MantidPythonInterface/kernel/Converters/PySequenceToVector.h"
 #include "MantidPythonInterface/kernel/Converters/CloneToNumpy.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/list.hpp>
@@ -21,7 +21,7 @@
 #include <numpy/arrayobject.h>
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
 namespace
@@ -390,7 +390,7 @@ void export_ITableWorkspace()
 
   //-------------------------------------------------------------------------------------------------
 
-  RegisterDataItemInterface<ITableWorkspace>()
+  DataItemInterface<ITableWorkspace>()
     .castFromID("TableWorkspace")
   ;
 }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -5,7 +5,7 @@
 #include "MantidPythonInterface/kernel/Converters/WrapWithNumpy.h"
 #include "MantidPythonInterface/kernel/Policies/RemoveConst.h"
 #include "MantidPythonInterface/kernel/Policies/VectorToNumpy.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/overloads.hpp>
@@ -246,7 +246,7 @@ void export_MatrixWorkspace()
       "RebinnedOutput", "SpecialWorkspace2D", "Workspace2D", "WorkspaceSingleValue"
   };
 
-  Registry::RegisterDataItemInterface<MatrixWorkspace> entry;
+  Registry::DataItemInterface<MatrixWorkspace> entry;
   for(int i = 0; i < NUM_IDS; ++i)
   {
     entry.castFromID(WORKSPACE_IDS[i]);

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -1,13 +1,13 @@
 #include "MantidAPI/Workspace.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/overloads.hpp>
 #include <boost/python/copy_const_reference.hpp>
 
 using namespace Mantid::API;
 using Mantid::Kernel::DataItem;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
 namespace
@@ -33,5 +33,5 @@ void export_Workspace()
 
   //-------------------------------------------------------------------------------------------------
 
-  RegisterDataItemInterface<Workspace>();
+  DataItemInterface<Workspace>();
 }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
@@ -1,12 +1,12 @@
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidPythonInterface/kernel/Policies/DowncastingPolicies.h"
-#include "MantidPythonInterface/kernel/Registry/RegisterDataItemInterface.h"
+#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/return_value_policy.hpp>
 
 using namespace Mantid::API;
-using Mantid::PythonInterface::Registry::RegisterDataItemInterface;
+using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 namespace Policies = Mantid::PythonInterface::Policies;
 
@@ -31,7 +31,7 @@ void export_WorkspaceGroup()
 
   //-----------------------------------------------------------------------------------------------
 
-  RegisterDataItemInterface<WorkspaceGroup>()
+  DataItemInterface<WorkspaceGroup>()
     .castFromID("WorkspaceGroup")
   ;
 }