Mantis issue 0021465: EDF 2067 GEOM: Extrusion along a path leads to a self-intersect...

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

diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx
index b8c484e4d156f8ab91f5152878cf8ea2c4f6b7cf..91078320395c7b691bd39d6a5f1fa4723ada5ef7 100644 (file)
--- a/src/OBJECT/GEOM_InteractiveObject.cxx
+++ b/src/OBJECT/GEOM_InteractiveObject.cxx
@@ -1,12 +1,31 @@
-using namespace std;
-//  File      : GEOM_InteractiveObject.cxx
-//  Created   : Wed Feb 20 17:24:59 2002
-//  Author    : Christophe ATTANASIO
-//  Project   : SALOME
-//  Module    : GEOM
-//  Copyright : Open CASCADE 2002
-//  $Header$
+// Copyright (C) 2007-2011  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
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
+//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  File   : GEOM_InteractiveObject.cxx
+//  Author : Christophe ATTANASIO
+//  Module : GEOM
+//  $Header$
+//
 /*!
   \class GEOM_InteractiveObject GEOM_InteractiveObject.hxx
   \brief ....
@@ -21,34 +40,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;
   }