Refs #4399. Another slight reorg for better structure

mantidproject · Mar 1, 2012 · 64b99a4 · 64b99a4
1 parent cc4ab28
commit 64b99a4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/...tidPythonInterface/kernel/PyEnvironment.h → ...erface/kernel/Environment/PyEnvironment.h b/...tidPythonInterface/kernel/PyEnvironment.h → ...erface/kernel/Environment/PyEnvironment.h
diff --git a/...idPythonInterface/kernel/WrapperHelpers.h → ...rface/kernel/Environment/WrapperHelpers.h b/...idPythonInterface/kernel/WrapperHelpers.h → ...rface/kernel/Environment/WrapperHelpers.h
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
@@ -1,7 +1,7 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/IAlgorithm.h"
-#include "MantidPythonInterface/kernel/PyEnvironment.h"
+#include "MantidPythonInterface/kernel/Environment/PyEnvironment.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmWrapper.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmWrapper.cpp
@@ -1,5 +1,5 @@
 #include "MantidPythonInterface/api/PythonAlgorithm/AlgorithmWrapper.h"
-#include "MantidPythonInterface/kernel/WrapperHelpers.h"
+#include "MantidPythonInterface/kernel/Environment/WrapperHelpers.h"
 #include <boost/python/class.hpp>
 
 using namespace boost::python;

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
@@ -36,8 +36,8 @@ set ( SRC_FILES
   src/Registry/SequenceTypeHandler.cpp
   src/Registry/TypeRegistry.cpp
   src/Registry/UpcastRegistry.cpp
-  src/PyEnvironment.cpp
-  src/WrapperHelpers.cpp
+  src/Environment/PyEnvironment.cpp
+  src/Environment/WrapperHelpers.cpp
 )
 
 set ( INC_FILES 
@@ -62,9 +62,9 @@ set ( INC_FILES
   ${HEADER_DIR}/kernel/Registry/UpcastRegistry.h
   ${HEADER_DIR}/kernel/PythonObjectInstantiator.h
   ${HEADER_DIR}/kernel/PropertyWithValue.h
-  ${HEADER_DIR}/kernel/PyEnvironment.h
+  ${HEADER_DIR}/kernel/Environment/PyEnvironment.h
   ${HEADER_DIR}/kernel/StlExportDefinitions.h
-  ${HEADER_DIR}/kernel/WrapperHelpers.h
+  ${HEADER_DIR}/kernel/Environment/WrapperHelpers.h
 )
 
 set ( PY_FILES 

diff --git a/...rface/mantid/kernel/src/PyEnvironment.cpp → .../kernel/src/Environment/PyEnvironment.cpp b/...rface/mantid/kernel/src/PyEnvironment.cpp → .../kernel/src/Environment/PyEnvironment.cpp
@@ -1,11 +1,9 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "MantidPythonInterface/kernel/PyEnvironment.h"
+#include "MantidPythonInterface/kernel/Environment/PyEnvironment.h"
 
-// This is technically not necessary but it ensures that Python.h is included
-// correctly
-#include <boost/python/object.hpp>
+#include <boost/python/detail/wrap_python.hpp>
 #include <frameobject.h>
 #include <cstring>
 

diff --git a/...face/mantid/kernel/src/WrapperHelpers.cpp → ...kernel/src/Environment/WrapperHelpers.cpp b/...face/mantid/kernel/src/WrapperHelpers.cpp → ...kernel/src/Environment/WrapperHelpers.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "MantidPythonInterface/kernel/WrapperHelpers.h"
+#include "MantidPythonInterface/kernel/Environment/WrapperHelpers.h"
 
 namespace Mantid
 {