Refs #4399. Tidy up namespace name and have better file name

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

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/...erface/kernel/Environment/PyEnvironment.h → ...nInterface/kernel/Environment/CallStack.h b/...erface/kernel/Environment/PyEnvironment.h → ...nInterface/kernel/Environment/CallStack.h
@@ -35,11 +35,7 @@ namespace Mantid
 {
   namespace PythonInterface
   {
-    /**
-     * The PyEnvironment namespace defines functions that query some aspect
-     * of the currently running Python environment
-     */
-    namespace PyEnvironment
+    namespace Environment
     {
       /// Is the given function name in the call stack
       DLLExport bool isInCallStack(const char * name, _frame* startFrame = NULL);

diff --git a/...d/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Environment/WrapperHelpers.h b/...d/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Environment/WrapperHelpers.h
@@ -11,7 +11,7 @@ namespace Mantid
 {
   namespace PythonInterface
   {
-    namespace WrapperHelpers
+    namespace Environment
     {
       /**
       This namespace contains helper functions for classes that are overridden in Python

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/Environment/PyEnvironment.h"
+#include "MantidPythonInterface/kernel/Environment/CallStack.h"
 
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
@@ -33,7 +33,7 @@ namespace
     UNUSED_ARG(self);
     IAlgorithm_sptr alg;
     int async(0);
-    if( Mantid::PythonInterface::PyEnvironment::isInCallStack("PyExec") )
+    if( Mantid::PythonInterface::Environment::isInCallStack("PyExec") )
     {
       alg = AlgorithmManager::Instance().createUnmanaged(name, version);
       alg->initialize();

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmWrapper.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmWrapper.cpp
@@ -20,7 +20,7 @@ namespace Mantid
     {
       static const char * method = "name";
       std::string name;
-      if( WrapperHelpers::typeHasAttribute(*this, method) )
+      if( Environment::typeHasAttribute(*this, method) )
       {
         name = call<std::string>(get_override(method).ptr()); // Avoid a warning with just calling return fn() which docs say you can do.
       }
@@ -49,7 +49,7 @@ namespace Mantid
     {
       static const char * method = "version";
       int version(1);
-      if( WrapperHelpers::typeHasAttribute(*this, method) )
+      if( Environment::typeHasAttribute(*this, method) )
       {
         version = call<int>(get_override(method).ptr()); // Avoid a warning with just calling return fn() which docs say you can do.
       }
@@ -73,9 +73,9 @@ namespace Mantid
     {
       static const char * method = "category";
       std::string cat("PythonAlgorithms");
-      if (  WrapperHelpers::typeHasAttribute(*this, method) )
+      if (  Environment::typeHasAttribute(*this, method) )
       {
-        cat = boost::python::call<std::string>(this->get_override(method).ptr());
+        cat = call<std::string>(this->get_override(method).ptr());
       }
       return cat;
     }

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

diff --git a/.../kernel/src/Environment/PyEnvironment.cpp → ...ntid/kernel/src/Environment/CallStack.cpp b/.../kernel/src/Environment/PyEnvironment.cpp → ...ntid/kernel/src/Environment/CallStack.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "MantidPythonInterface/kernel/Environment/PyEnvironment.h"
+#include "MantidPythonInterface/kernel/Environment/CallStack.h"
 
 #include <boost/python/detail/wrap_python.hpp>
 #include <frameobject.h>
@@ -11,13 +11,13 @@ namespace Mantid
 {
   namespace PythonInterface
   {
-    namespace PyEnvironment
+    namespace Environment
     {
       /**
        * Is the given function name in the call stack
        * @param name :: The name of the function call to search for
        * @param startFrame :: An optional frame to start from, if NULL then the current frame is
-       * retrieved from the interpeter
+       * retrieved from the interpreter
        * @return True if the function name is found in the stack, false otherwise
        */
       bool isInCallStack(const char * name, PyFrameObject* startFrame)

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Environment/WrapperHelpers.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Environment/WrapperHelpers.cpp
@@ -7,7 +7,7 @@ namespace Mantid
 {
   namespace PythonInterface
   {
-    namespace WrapperHelpers
+    namespace Environment
     {
       /** Checks whether the given object's type dictionary contains the named attribute.
        *