Merge remote branch 'origin/task/8983_rm_workspaceitr'

mantidproject · Mar 3, 2014 · d523676 · d523676
2 parents 673033c + f4307dd
commit d523676
Show file tree

Hide file tree

Showing 34 changed files with 500 additions and 1,765 deletions.
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -69,8 +69,6 @@ set ( SRC_FILES
 	src/JointDomain.cpp
 	src/LinearScale.cpp
 	src/LiveListenerFactory.cpp
-	src/LocatedDataRef.cpp
-	src/LocatedDataValue.cpp
 	src/LogManager.cpp
 	src/LogarithmScale.cpp
 	src/MDGeometry.cpp
@@ -174,7 +172,6 @@ set ( INC_FILES
 	inc/MantidAPI/ICatalogInfoService.h
 	inc/MantidAPI/IConstraint.h
 	inc/MantidAPI/ICostFunction.h
-	inc/MantidAPI/IDataItem.h
 	inc/MantidAPI/IDomainCreator.h
 	inc/MantidAPI/IEventList.h
 	inc/MantidAPI/IEventWorkspace.h
@@ -187,7 +184,6 @@ set ( INC_FILES
 	inc/MantidAPI/IFunctionValues.h
 	inc/MantidAPI/IFunctionWithLocation.h
 	inc/MantidAPI/ILiveListener.h
-	inc/MantidAPI/ILocatedData.h
 	inc/MantidAPI/IMDEventWorkspace.h
 	inc/MantidAPI/IMDHistoWorkspace.h
 	inc/MantidAPI/IMDIterator.h
@@ -217,8 +213,6 @@ set ( INC_FILES
 	inc/MantidAPI/JointDomain.h
 	inc/MantidAPI/LinearScale.h
 	inc/MantidAPI/LiveListenerFactory.h
-	inc/MantidAPI/LocatedDataRef.h
-	inc/MantidAPI/LocatedDataValue.h
 	inc/MantidAPI/LogManager.h
 	inc/MantidAPI/LogarithmScale.h
 	inc/MantidAPI/MDGeometry.h
@@ -260,8 +254,6 @@ set ( INC_FILES
 	inc/MantidAPI/WorkspaceFactory.h
 	inc/MantidAPI/WorkspaceGroup.h
 	inc/MantidAPI/WorkspaceHistory.h
-	inc/MantidAPI/WorkspaceIterator.h
-	inc/MantidAPI/WorkspaceIteratorCode.h
 	inc/MantidAPI/WorkspaceOpOverloads.h
 	inc/MantidAPI/WorkspaceProperty.h
 	inc/MantidAPI/WorkspaceValidators.h

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IDataItem.h b/Code/Mantid/Framework/API/inc/MantidAPI/IDataItem.h
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ILocatedData.h b/Code/Mantid/Framework/API/inc/MantidAPI/ILocatedData.h
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/LocatedDataRef.h b/Code/Mantid/Framework/API/inc/MantidAPI/LocatedDataRef.h
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/LocatedDataValue.h b/Code/Mantid/Framework/API/inc/MantidAPI/LocatedDataValue.h
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -4,17 +4,17 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include <boost/scoped_ptr.hpp>
 #include "MantidAPI/DllConfig.h"
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/ExperimentInfo.h"
 #include "MantidAPI/IMDWorkspace.h"
-#include "MantidAPI/Axis.h"
 #include "MantidAPI/ISpectrum.h"
 #include "MantidAPI/MatrixWSIndexCalculator.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/Sample.h"
 #include "MantidAPI/SpectraDetectorTypes.h"
-#include "MantidAPI/WorkspaceIterator.h"
+
+#include <boost/scoped_ptr.hpp>
 
 namespace Mantid
 {
@@ -68,10 +68,6 @@ namespace Mantid
       // The Workspace Factory create-from-parent method needs direct access to the axes.
       friend class WorkspaceFactoryImpl;
 
-      /// Typedef for the workspace_iterator to use with a Workspace
-      typedef workspace_iterator<LocatedDataRef, MatrixWorkspace> iterator;
-      /// Typedef for the const workspace_iterator to use with a Workspace
-      typedef workspace_iterator<const LocatedDataRef, const MatrixWorkspace> const_iterator;
       /// Initialize
       void initialize(const std::size_t &NVectors, const std::size_t &XLength, const std::size_t &YLength);
       /// Delete