0022221: [CEA 819] Error "'NoneType' object is not callable" at Salome closure

[modules/smesh.git] / src / SMESH_I / SMESH_PythonDump.hxx

diff --git a/src/SMESH_I/SMESH_PythonDump.hxx b/src/SMESH_I/SMESH_PythonDump.hxx
index 0646d94d1551f673031d2b716a21912fb25fa94e..8783d9f5e8e69f61fd3b04961e5c81d7a50cdd39 100644 (file)
--- a/src/SMESH_I/SMESH_PythonDump.hxx
+++ b/src/SMESH_I/SMESH_PythonDump.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -40,18 +40,17 @@ class Resource_DataMapOfAsciiStringAsciiString;
 
 // ===========================================================================================
 /*!
- * \brief Tool converting SMESH engine calls into commands defined in smeshDC.py
+ * \brief Tool converting SMESH engine calls into commands defined in smeshBuilder.py
  *
  * Implementation is in SMESH_2smeshpy.cxx
  */
 // ===========================================================================================
 
-class SMESH_2smeshpy
+namespace SMESH_2smeshpy
 {
-public:
   /*!
-   * \brief Convert a python script using commands of smesh.py
-   * \param theScript - Input script
+   * \brief Convert a python script using commands of smeshBuilder.py
+   * \param theScript - the Input script to convert
    * \param theEntry2AccessorMethod - returns method names to access to
    *        objects wrapped with python class
    * \param theObjectNames - names of objects
@@ -60,8 +59,8 @@ public:
    *        to exclude commands relating to objects removed from study
    * \retval TCollection_AsciiString - Convertion result
    */
-  static TCollection_AsciiString
-  ConvertScript(const TCollection_AsciiString&            theScript,
+  void
+  ConvertScript(TCollection_AsciiString&                  theScript,
                 Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
                 Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
                 std::set< TCollection_AsciiString >&      theRemovedObjIDs,
@@ -102,6 +101,8 @@ namespace SMESH
     // string used to temporary quote variable names in order
     // not to confuse variables with string arguments
     static char Quote() { return '$'; }
+    // string preceding an entry of object storing the attribute holding var names
+    static const char* ObjPrefix() { return " # OBJ: "; }
   };
 
   // ===========================================================================================