PAL18573: geometric entities are created with incorrect name

diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
index 4f7270c09af28da88f98c2ebdce1317c44b096d3..3b434925ff0df3227d2c12f6089b4d7de03be468 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
@@ -476,7 +476,7 @@ GEOM::GEOM_Object_ptr BlocksGUI_ExplodeDlg::getFather( GEOM::GEOM_Object_ptr )
 // Function : getNewObjectName
 // Purpose  : Redefine this method to return proper name for a new object
 //================================================================
-const char* BlocksGUI_ExplodeDlg::getNewObjectName() const
+QString BlocksGUI_ExplodeDlg::getNewObjectName() const
 {
-  return "";
+  return QString::null;
 }

diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
index 05cbb334565f962aad4a0fcf510f3d4c41be39e5..eaa59afbb1d6e54defd934ca63957e78fd23d1fa 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
@@ -48,7 +48,7 @@ protected:
   virtual bool                       execute( ObjectList& );
   virtual GEOM::GEOM_Object_ptr      getFather( GEOM::GEOM_Object_ptr );
 
-  virtual const char*                getNewObjectName() const; 
+  virtual QString                    getNewObjectName() const; 
 
 private:
   void                               Init();

diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index 24b693a387011da042b1a08453d0e015836d164e..4f466c7452961b49c7be2e4925c9073f064cc2d1 100644 (file)
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
@@ -597,7 +597,7 @@ GEOM::GEOM_Object_ptr EntityGUI_SubShapeDlg::getFather( GEOM::GEOM_Object_ptr )
   return myObject;
 }
 
-const char* EntityGUI_SubShapeDlg::getNewObjectName() const
+QString EntityGUI_SubShapeDlg::getNewObjectName() const
 {
-  return "";
+  return QString::null;
 }

diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h
index 27d71f38e3b57c23e148057e9e3544a6e88eb3f1..6d64deb1c4f46721936e620dba4e29ba79f8b34b 100644 (file)
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.h
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h
@@ -48,7 +48,7 @@ protected:
   virtual bool                        isValid( QString& );
   virtual bool                        execute( ObjectList& );
   virtual GEOM::GEOM_Object_ptr       getFather( GEOM::GEOM_Object_ptr );
-  virtual const char*                 getNewObjectName() const;
+  virtual QString                     getNewObjectName() const;
 
 private slots:
   void                                ClickOnOk();

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 73d1a04beacc4476bacda475feec3a6e76138835..d2c9cfdebe1b8c11119d40a41e1ac933e0a75e85 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -902,9 +902,9 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj )
 // Function : getNewObjectName
 // Purpose  : Redefine this method to return proper name for a new object
 //================================================================
-const char* GEOMBase_Helper::getNewObjectName() const
+QString GEOMBase_Helper::getNewObjectName() const
 {
-  return "";
+  return QString::null;
 }
 
 //================================================================

diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
index 2e02f353020d90bd51354a1f626090297325295e..3a13c3f1fe4c3616fbeccd91c4722d20da66c665 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -171,7 +171,7 @@ protected:
   // for <theObj> or a nil reference if <theObj> should be published
   // as a top-level object.
 
-  virtual const char* getNewObjectName() const; 
+  virtual QString getNewObjectName() const; 
   virtual void addSubshapesToStudy();
 
   GEOM::GEOM_Object_ptr findObjectInFather( GEOM::GEOM_Object_ptr theFather, const QString& theName );

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index b1a50b0af99ebfe483f6538161fdfc39bcb0f908..34538ae90b548c6750f2b6b4f35ce91231d94b4b 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -224,9 +224,9 @@ void GEOMBase_Skeleton::initName( const QString& thePrefix )
 // function : getNewObjectName()
 // purpose  : returns contents of Name field
 //=================================================================================
-const char* GEOMBase_Skeleton::getNewObjectName() const
+QString GEOMBase_Skeleton::getNewObjectName() const
 {
-  return myMainFrame->ResultName->text().toLatin1().constData();
+  return myMainFrame->ResultName->text();
 }
 
 //=================================================================================

diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index f674edf84364857673ef1c36b2ff887f27e1b055..b41134016337cb854d2e5336e0c40a046e1ad468 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -70,7 +70,7 @@ protected:
 
     /*! returns contents of "Name" field
      */
-    virtual const char* getNewObjectName() const;
+    virtual QString getNewObjectName() const;
 
     /*! returns id of a selected "constructor" radio button or '-1' in case of error
      */

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index f40ff99d97a0fa818742fbce130d5bd534e0f3f1..017dd7030342f6186e1fc6d3ee72ea9357570330 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -774,7 +774,7 @@ bool GroupGUI_GroupDlg::execute( ObjectList& objects )
       _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
       if ( SO ) {
         _PTR(StudyBuilder) aBuilder (study->studyDS()->NewBuilder());
-        aBuilder->SetName( SO, getNewObjectName() );
+        aBuilder->SetName( SO, getNewObjectName().toLatin1().constData() );
       }
     }
   }

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index 44277ab710b3ebd8cb94608deed8f510f5675d18..2edd2a186aca311f41be408ed1185db6ea97a4ee 100644 (file)
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -531,7 +531,7 @@ bool RepairGUI_GlueDlg::onAcceptLocal()
         for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) {
          QString aName( "" );
           if ( nbObjs > 1 ) {
-            aName = strlen( getNewObjectName() ) ? GEOMBase::GetDefaultName( getNewObjectName() ) : GEOMBase::GetDefaultName( getPrefix( *it ) );
+            aName = getNewObjectName().length() ? GEOMBase::GetDefaultName( getNewObjectName() ) : GEOMBase::GetDefaultName( getPrefix( *it ) );
           }
           else {
             aName = getNewObjectName();