refs #5955 Fixing build caused by move.

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h

@@ -40,7 +40,7 @@ namespace MDAlgorithms
     void exec();
 
     template<typename MDE, size_t nd>
-    void finish(typename MDEventWorkspace<MDE, nd>::sptr ws);
+    void finish(typename MDEvents::MDEventWorkspace<MDE, nd>::sptr ws);
 
 
   };

Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp

@@ -37,6 +37,7 @@ A very similar algorithm to this is [[ImportMDHistoWorkspace]], which takes it's
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
+using namespace Mantid::MDEvents;
 
 namespace Mantid
 {

Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp

@@ -34,6 +34,7 @@ namespace MDAlgorithms
   using namespace Mantid::Kernel;
   using namespace Mantid::API;
   using namespace Mantid::Geometry;
+  using namespace Mantid::MDEvents;
 
   // Register the algorithm into the AlgorithmFactory
   DECLARE_ALGORITHM(CreateMDWorkspace)

Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h

@@ -11,6 +11,7 @@
 
 using namespace Mantid;
 using namespace Mantid::MDEvents;
+using namespace Mantid::MDAlgorithms;
 using namespace Mantid::API;
 
 class CreateMDHistoWorkspaceTest : public CxxTest::TestSuite

Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h

@@ -13,9 +13,10 @@
 #include <iostream>
 #include <Poco/File.h>
 
-using namespace Mantid::MDEvents;
 using namespace Mantid::API;
 using namespace Mantid::Geometry;
+using namespace Mantid::MDEvents;
+using namespace Mantid::MDAlgorithms;
 
 class CreateMDWorkspaceTest : public CxxTest::TestSuite
 {

Code/Mantid/Framework/MDEvents/test/MDEventInserterTest.h

@@ -7,9 +7,9 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/IMDEventWorkspace.h"
+#include "MantidAPI/IAlgorithm.h"
 #include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidMDEvents/MDEvent.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
 #include <iostream>
 #include <iomanip>
 
@@ -36,16 +36,16 @@ private:
     {
       ADS.remove(outWSName);
     }
-
-    CreateMDWorkspace createAlg;
-    createAlg.initialize();
-    createAlg.setProperty("Dimensions", 2);
-    createAlg.setPropertyValue("Extents", "-10,10,-10,10");
-    createAlg.setPropertyValue("Names", "A, B");
-    createAlg.setPropertyValue("Units", "m, m");
-    createAlg.setPropertyValue("EventType", eventType);
-    createAlg.setPropertyValue("OutputWorkspace", outWSName);
-    createAlg.execute();
+    
+    IAlgorithm* createAlg = FrameworkManager::Instance().createAlgorithm("CreateMDWorkspace");
+    createAlg->initialize();
+    createAlg->setProperty("Dimensions", 2);
+    createAlg->setPropertyValue("Extents", "-10,10,-10,10");
+    createAlg->setPropertyValue("Names", "A, B");
+    createAlg->setPropertyValue("Units", "m, m");
+    createAlg->setPropertyValue("EventType", eventType);
+    createAlg->setPropertyValue("OutputWorkspace", outWSName);
+    createAlg->execute();
 
     return ADS.retrieveWS<IMDEventWorkspace>(outWSName);
   }

Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h

@@ -15,7 +15,7 @@
 #include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidMDEvents/MDGridBox.h"
 #include "MantidMDEvents/MDLeanEvent.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
+//#include "MantidMDEvents/CreateMDWorkspace.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/mersenne_twister.hpp>

Code/Mantid/Vates/VatesAPI/test/MockObjects.h

 #ifndef VATESAPI_TEST_MOCKOBJECTS_H
 #define VATESAPI_TEST_MOCKOBJECTS_H
 
-#include "MantidMDEvents/CreateMDWorkspace.h"
+//#include "MantidMDAlgorithms/CreateMDWorkspace.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/IMDIterator.h"
 #include "MantidAPI/IMDWorkspace.h"
@@ -22,6 +22,7 @@
 #include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
 #include "MantidVatesAPI/WorkspaceProvider.h"
 #include "MantidAPI/NullCoordTransform.h"
+#include "MantidAPI/FrameworkManager.h"
 #include <gmock/gmock.h>
 #include <vtkFieldData.h>
 #include <vtkCharArray.h>
@@ -316,14 +317,15 @@ class FakeProgressAction : public Mantid::VATES::ProgressAction
   {
     using namespace Mantid::API;
     AnalysisDataService::Instance().remove("3D_Workspace");
-    Mantid::MDEvents::CreateMDWorkspace create;
-    create.initialize();
-    create.setProperty("Dimensions", 4);
-    create.setPropertyValue("Extents","0,5,0,5,0,5,0,5");
-    create.setPropertyValue("Names","A,B,C,D");
-    create.setPropertyValue("Units","A,A,A,A");
-    create.setPropertyValue("OutputWorkspace", "3D_Workspace");
-    create.execute();
+    IAlgorithm* create = FrameworkManager::Instance().createAlgorithm("CreateMDWorkspace");
+
+    create->initialize();
+    create->setProperty("Dimensions", 4);
+    create->setPropertyValue("Extents","0,5,0,5,0,5,0,5");
+    create->setPropertyValue("Names","A,B,C,D");
+    create->setPropertyValue("Units","A,A,A,A");
+    create->setPropertyValue("OutputWorkspace", "3D_Workspace");
+    create->execute();
     return AnalysisDataService::Instance().retrieve("3D_Workspace");
   }