SALOME::GenericObj : Destroy() -> UnRegister()

diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
index 076dde49fdc43824b7de9508d5c79701953bd3e3..0f9bea8d3ad1e75a63fa9603f95cc4c915483286 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
@@ -1240,7 +1240,7 @@ void VisuGUI_ClippingDlg::SetPrs3d(VISU::Prs3d_i* thePrs)
 {
   if(thePrs != myPrs3d){
     if(myPrs3d)
-      myPrs3d->Destroy();
+      myPrs3d->UnRegister();
     if(thePrs)
       thePrs->Register();
     myPrs3d = thePrs;

diff --git a/src/VISUGUI/VisuGUI_Slider.cxx b/src/VISUGUI/VisuGUI_Slider.cxx
index f479c029839c0b2da31a28c38bec45ea99c9e80e..8cdc11f32f49f9cdbc2365cbe6436bc393749201 100644 (file)
--- a/src/VISUGUI/VisuGUI_Slider.cxx
+++ b/src/VISUGUI/VisuGUI_Slider.cxx
@@ -638,7 +638,7 @@ void VisuGUI_Slider::onValueChanged( int value )
     QApplication::restoreOverrideCursor();
   }
 
-  aView3D->Destroy();
+  aView3D->UnRegister();
 
   updateMemoryState();
 }

diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index 6c6618ab183b104d1bcf081f8eb8d5598e0755f3..4227cc7afb3506757e9886653d082e627e77acb6 100644 (file)
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -526,7 +526,7 @@ namespace VISU
       // Remove aSObject together with all its sub-objects
       VISU::RemoveFromStudy(theSObject,
                             false,  // remove not only IOR attribute, but Object With Children
-                            false); // not Destroy() sub-objects
+                            false); // not UnRegister() sub-objects
     }
   }
 

diff --git a/src/VISU_I/SALOME_GenericObjPointer.hh b/src/VISU_I/SALOME_GenericObjPointer.hh
index 2af65334018ad3431e12975cc3eab79b22308592..dc1cad3e833b8b9968cd79b60c839616b622a04e 100644 (file)
--- a/src/VISU_I/SALOME_GenericObjPointer.hh
+++ b/src/VISU_I/SALOME_GenericObjPointer.hh
@@ -57,10 +57,10 @@ namespace SALOME
     }
 
     void
-    Destroy()
+    UnRegister()
     {
       if(this->myPointer){
-       this->myPointer->Destroy();
+       this->myPointer->UnRegister();
        this->myPointer = NULL;
       }
     }
@@ -104,7 +104,7 @@ namespace SALOME
     //! Destroy smart pointer and remove the reference to its object.
     ~GenericObjPtr()
     {
-      this->Destroy();
+      this->UnRegister();
     }
 
     /*! 

diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
index 532e18dd27314fcc9e14a8f73d2e87f0697b1723..a6e4f94d0cc15d4a2150ad4da03c876cf67698e3 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
@@ -486,7 +486,7 @@ VISU::ColoredPrs3dCache_i
   CORBA::String_var anIOR = GetID();
   SALOMEDS::SObject_var aSObject = GetStudyDocument()->FindObjectIOR(anIOR.in());
   VISU::RemoveFromStudy(aSObject, false, true);
-  Destroy();
+  UnRegister();
 }
 
 std::string
@@ -526,7 +526,7 @@ VISU::ColoredPrs3dCache_i
     TPrs3dPtr aPrs3d(thePrs3d);
     myHolderMap[theHolderEntry].push_front(aPrs3d);  
     thePrs3d->SetHolderEntry( theHolderEntry );
-    thePrs3d->Destroy();
+    thePrs3d->UnRegister();
   }
   return thePrs3d;
 }

diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
index 82735358382fab5e6b23fb784a67291ff94e4eab..520a69d18a3051520ba64131dccc7441355b2974 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
@@ -299,7 +299,7 @@ namespace VISU
       SALOME::GenericObjPtr<TColoredPrs3d> aSameColoredPrs3d(new TColoredPrs3d(thePublishInStudyMode));
       Copy(theColoredPrs3d, aSameColoredPrs3d);
       if ( theCreateAsTemporalObject )
-       aSameColoredPrs3d->Destroy();
+       aSameColoredPrs3d->UnRegister();
       return aSameColoredPrs3d;
     }
   };

diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
index 8e6cf555e00d2270862242687f890f960c9697ac..aed6e4936699c5223d6ccf1b1574dec744433bb2 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
@@ -235,7 +235,7 @@ VISU::ColoredPrs3dHolder_i
   CORBA::String_var anIOR = GetID();
   SALOMEDS::SObject_var aSObject = GetStudyDocument()->FindObjectIOR(anIOR.in());
   VISU::RemoveFromStudy(aSObject, false);
-  Destroy();
+  UnRegister();
 }
 
 //----------------------------------------------------------------------------

diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index 3b32d82ea9282acd2ade293504bb1012a511af0e..f0cf7047f9e2ab6ce5fefbbe11d8a0c14088ad38 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -208,9 +208,9 @@ VISU::ColoredPrs3d_i
 //---------------------------------------------------------------
 void
 VISU::ColoredPrs3d_i
-::Destroy()
+::UnRegister()
 {
-  TSuperClass::Destroy();
+  TSuperClass::UnRegister();
 }
 
 //---------------------------------------------------------------

diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.hh b/src/VISU_I/VISU_ColoredPrs3d_i.hh
index dbae3b8b915f7652c3aae474ad67a1a143b25b0b..0de865f653bf8e45fc4e902213edbe7e15cbf1fa 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3d_i.hh
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.hh
@@ -62,7 +62,7 @@ namespace VISU
 
     virtual
     void
-    Destroy() = 0;
+    UnRegister() = 0;
   };
   typedef SALOME::GenericObjPtr<TMinMaxController> PMinMaxController;
 
@@ -80,7 +80,7 @@ namespace VISU
 
     virtual
     void
-    Destroy()
+    UnRegister()
     {
       vtkObjectBase::Delete();
     }
@@ -122,7 +122,7 @@ namespace VISU
 
     virtual
     void
-    Destroy();
+    UnRegister();
 
     virtual
     void

diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index 21a797ae3b033073b9108a99f0aa25581759c2e4..f18c8f35f3d7b010b9c6e323cd36aaf6856436d0 100644 (file)
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -425,7 +425,7 @@ VISU::Prs3d_i
     Execute()
     {
       //TInvokeSignalEvent::Execute();
-      myRemovable->Destroy();
+      myRemovable->UnRegister();
     }
   };
 

diff --git a/src/VISU_I/VISU_ResultUtils.cc b/src/VISU_I/VISU_ResultUtils.cc
index ea918c298cb5a5d858888b110f40417263e7ce9b..86457d7c87313ab5a2b1ff349ec5a0b217532f27 100644 (file)
--- a/src/VISU_I/VISU_ResultUtils.cc
+++ b/src/VISU_I/VISU_ResultUtils.cc
@@ -69,7 +69,7 @@ namespace VISU
   TResultManager
   ::~TResultManager()
   {
-    myResult->Destroy();
+    myResult->UnRegister();
   }
 
 

diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 2e80e13a217e597d6199b67a3d29a3d33bfd4c17..b158404c7da5666b528fde98a76ea61b276d6d58 100644 (file)
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -220,7 +220,7 @@ VISU::Result_i
     Execute()
     {
       VISU::RemoveFromStudy(myRemovable->GetSObject(),false);
-      myRemovable->Destroy();
+      myRemovable->UnRegister();
     }
   };