Merge with version on tag OCC-V2_1_0d

[modules/geom.git] / src / OBJECT / GEOM_InteractiveObject.hxx

diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx
index a14c40783a16bc34257d687a921a6aa9036934f8..93911dfe005593d3d92d43ef70cc3bcca373f7d3 100644 (file)
--- a/src/OBJECT/GEOM_InteractiveObject.hxx
+++ b/src/OBJECT/GEOM_InteractiveObject.hxx
@@ -72,14 +72,14 @@ public:
  // Methods PUBLIC
  // 
 Standard_EXPORT GEOM_InteractiveObject();
-Standard_EXPORT GEOM_InteractiveObject(const Standard_CString anIOR,
-                                      const Standard_CString aFatherIOR,
-                                      const Standard_CString aComponentDataType,
-                                      const Standard_CString anEntry = "");
-Standard_EXPORT   void setIOR(const Standard_CString anEntry) ;
-Standard_EXPORT   Standard_CString getIOR() ;
-Standard_EXPORT   void setFatherIOR(const Standard_CString anEntry) ;
-Standard_EXPORT   Standard_CString getFatherIOR() ;
+Standard_EXPORT GEOM_InteractiveObject(const char* anIOR,
+                                      const char* aFatherIOR,
+                                      const char* aComponentDataType,
+                                      const char* anEntry = "");
+Standard_EXPORT   void setIOR(const char* anEntry) ;
+Standard_EXPORT   const char* getIOR() ;
+Standard_EXPORT   void setFatherIOR(const char* anEntry) ;
+Standard_EXPORT   const char* getFatherIOR() ;
 Standard_EXPORT   virtual Standard_Boolean isSame(const Handle(SALOME_InteractiveObject)& anIO) ;
 Standard_EXPORT   ~GEOM_InteractiveObject();
 
@@ -110,8 +110,8 @@ private:
 
  // Fields PRIVATE
  //
-Standard_CString myIOR;
-Standard_CString myFatherIOR;
+std::string myIOR;
+std::string myFatherIOR;
 
 
 };