Fixed method GetSame for the case of two cylindrical surfaces that are part of the...

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

diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx
index 892cd143c3d9c996128f92cf170f54792d4a9b6e..628df2d2483d46d59e5d7f7d0faf61876ad2a59e 100644 (file)
--- a/src/OBJECT/GEOM_InteractiveObject.cxx
+++ b/src/OBJECT/GEOM_InteractiveObject.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 /*!
   \class GEOM_InteractiveObject GEOM_InteractiveObject.hxx
   \brief ....
@@ -34,6 +33,8 @@ using namespace std;
 
 #include "GEOM_InteractiveObject.ixx"
 
+using namespace std;
+
 GEOM_InteractiveObject::GEOM_InteractiveObject()
   : SALOME_InteractiveObject()
 {
@@ -41,34 +42,33 @@ GEOM_InteractiveObject::GEOM_InteractiveObject()
   myFatherIOR = "";
 }
 
-GEOM_InteractiveObject::GEOM_InteractiveObject(const Standard_CString anIOR,
-                                              const Standard_CString aFatherIOR,
-                                              const Standard_CString aComponentDataType,
-                                              const Standard_CString anEntry)
+GEOM_InteractiveObject::GEOM_InteractiveObject(const char* anIOR,
+                                              const char* aFatherIOR,
+                                              const char* aComponentDataType,
+                                              const char* anEntry)
   : SALOME_InteractiveObject(anEntry,aComponentDataType)
 {
-  myIOR       = new char [strlen(anIOR)+1];
-  strcpy( myIOR, anIOR);
-  myFatherIOR = new char [strlen(aFatherIOR)+1];
-  strcpy( myFatherIOR, aFatherIOR);
+  myIOR       = anIOR;
+  myFatherIOR = aFatherIOR;
 }
 
-Standard_CString GEOM_InteractiveObject::getIOR(){
-  return myIOR;
+const char* GEOM_InteractiveObject::getIOR(){
+  return myIOR.c_str();
 }
-Standard_CString GEOM_InteractiveObject::getFatherIOR(){
-  return myFatherIOR;
+
+const char* GEOM_InteractiveObject::getFatherIOR(){
+  return myFatherIOR.c_str();
 }
 
 Standard_Boolean GEOM_InteractiveObject::isSame(const Handle(SALOME_InteractiveObject)& anIO ){
   if ( anIO->hasEntry() && this->hasEntry() ) {
-    if ( strcmp(myEntry, anIO->getEntry() ) == 0 )
+    if ( myEntry == anIO->getEntry() )
       return Standard_True;
   }
   
   if ( anIO->IsKind(STANDARD_TYPE(GEOM_InteractiveObject))) {
     Handle(GEOM_InteractiveObject) theIO = Handle(GEOM_InteractiveObject)::DownCast( anIO );
-    if ( strcmp(myIOR, theIO->getIOR() ) == 0 )
+    if ( myIOR == theIO->getIOR() )
       return Standard_True;
   }