XRefs #8913 Fix algorithm history typedef dependencies.

mantidproject · Apr 28, 2014 · 0b5f05e · 0b5f05e
1 parent add7c42
commit 0b5f05e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/API/test/WorkspaceHistoryTest.h b/Code/Mantid/Framework/API/test/WorkspaceHistoryTest.h
@@ -210,7 +210,7 @@ class WorkspaceHistoryTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS(history.size(), 1);
     TS_ASSERT_EQUALS(history.empty(), false);
 
-    const WorkspaceHistory::AlgorithmHistories & algs = history.getAlgorithmHistories();
+    const Mantid::API::AlgorithmHistories & algs = history.getAlgorithmHistories();
     TS_ASSERT_EQUALS(algs.size(), 1);
     TS_ASSERT_EQUALS(history.getAlgorithmHistory(0).name(), "FirstAlgorithm");
     TS_ASSERT_EQUALS((*algs.begin()).name(), "FirstAlgorithm");

diff --git a/Code/Mantid/Framework/Algorithms/src/GeneratePythonScript.cpp b/Code/Mantid/Framework/Algorithms/src/GeneratePythonScript.cpp
@@ -79,8 +79,8 @@ void GeneratePythonScript::exec()
 
   // Cycle through the AlgorithHistory objects of the workspace, create a string for each one,
   // and then add them to the list.
-  const WorkspaceHistory::AlgorithmHistories  & algHistories = wsHistory.getAlgorithmHistories();
-  WorkspaceHistory::AlgorithmHistories::const_iterator algHistIter = algHistories.begin();
+  const Mantid::API::AlgorithmHistories  & algHistories = wsHistory.getAlgorithmHistories();
+ Mantid::API::AlgorithmHistories::const_iterator algHistIter = algHistories.begin();
 
   std::vector<std::string> orderedHists;
   for( ; algHistIter != algHistories.end(); ++algHistIter)

diff --git a/Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp b/Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp
@@ -388,8 +388,8 @@ namespace Mantid
         // print whether it is normalized by monitor or pcharge
         bool norm_by_current = false;
         bool norm_by_monitor = false;
-        const WorkspaceHistory::AlgorithmHistories& algohist = workspace->getHistory().getAlgorithmHistories();
-        for (WorkspaceHistory::AlgorithmHistories::const_iterator it = algohist.begin(); it != algohist.end(); ++it)
+        const Mantid::API::AlgorithmHistories& algohist = workspace->getHistory().getAlgorithmHistories();
+        for (Mantid::API::AlgorithmHistories::const_iterator it = algohist.begin(); it != algohist.end(); ++it)
         {
           if (it->name().compare("NormaliseByCurrent") == 0)
             norm_by_current = true;

diff --git a/Code/Mantid/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp b/Code/Mantid/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
@@ -273,7 +273,7 @@ AlgEnvHistoryGrpBox* AlgorithmHistoryWindow::createEnvHistGrpBox(const Environme
 AlgHistoryProperties* AlgorithmHistoryWindow::createAlgHistoryPropWindow()
 {	
   std::vector<PropertyHistory> histProp;
-  const WorkspaceHistory::AlgorithmHistories & entries = m_algHist.getAlgorithmHistories();
+  const Mantid::API::AlgorithmHistories & entries = m_algHist.getAlgorithmHistories();
   auto rIter = entries.rbegin();
   histProp=(*rIter).getProperties();
 
@@ -329,7 +329,7 @@ void AlgorithmHistoryWindow::writeToScriptFile()
 
 void AlgorithmHistoryWindow::populateAlgHistoryTreeWidget()
 {
-  const WorkspaceHistory::AlgorithmHistories & entries = m_algHist.getAlgorithmHistories();
+  const Mantid::API::AlgorithmHistories & entries = m_algHist.getAlgorithmHistories();
   auto ralgHistory_Iter = entries.rbegin();
   std::string algrithmName;
   algrithmName=(*ralgHistory_Iter).name();