X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Object.cpp;h=3f186739fcd9e569cdeef2de9850985504ca6ec0;hb=88ee9b2b81cf93a6324336b57e30cc8a3a487499;hp=24a2b2d55c32740f5976a67d7bb7fc97c0f94b6b;hpb=83bbce5aee090aed21034874cd38c0c838f1733f;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Object.cpp b/src/ModelAPI/ModelAPI_Object.cpp
index 24a2b2d55..3f186739f 100644
--- a/src/ModelAPI/ModelAPI_Object.cpp
+++ b/src/ModelAPI/ModelAPI_Object.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModelAPI_Object.cpp
-// Created:     19 May 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
+//
+// 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, or (at your option) any later version.
+//
+// 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
+//
 
 #include "ModelAPI_Object.h"
 #include "ModelAPI_Document.h"
@@ -12,7 +25,7 @@
 
 bool ModelAPI_Object::isInHistory()
 {
-  if (myData.get() && myData->isValid()) {
+  if (myData->isValid()) {
     return myData->isInHistory();
   }
   return true; // default value
@@ -22,7 +35,7 @@ void ModelAPI_Object::setInHistory(
   const std::shared_ptr<ModelAPI_Object> theObject, const bool theFlag)
 {
   if (isInHistory() != theFlag) {
-    if (myData.get() && myData->isValid()) {
+    if (myData->isValid()) {
       myData->setIsInHistory(theFlag);
     }
     myDoc->updateHistory(theObject);
@@ -44,7 +57,7 @@ std::shared_ptr<ModelAPI_Document> ModelAPI_Object::document() const
   return myDoc;
 }
 
-void ModelAPI_Object::attributeChanged(const std::string& theID)
+void ModelAPI_Object::attributeChanged(const std::string& /*theID*/)
 {
 }
 
@@ -68,8 +81,9 @@ void ModelAPI_Object::setDoc(std::shared_ptr<ModelAPI_Document> theDoc)
 
 void ModelAPI_Object::erase()
 {
-  if (myData) myData->erase();
-  setData(DataPtr());
+  if (myData->isValid() && myData != myData->invalidPtr())
+    myData->erase();
+  setData(myData->invalidPtr());
 }
 
 bool ModelAPI_Object::isDisplayed()