Suppression of warnings, application launching problems in different cases (on Window...

[modules/shaper.git] / src / ModuleBase / ModuleBase_ViewerPrs.cpp

diff --git a/src/ModuleBase/ModuleBase_ViewerPrs.cpp b/src/ModuleBase/ModuleBase_ViewerPrs.cpp
index 38e4c71a3d7f274a74451544d89e25e9b344e7f1..17ff60d1968580a2b0bf35d7139acc9d7d797d9e 100644 (file)
--- a/src/ModuleBase/ModuleBase_ViewerPrs.cpp
+++ b/src/ModuleBase/ModuleBase_ViewerPrs.cpp
@@ -1,19 +1,33 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModuleBase_ViewerPrs.cpp
-// Created:     20 Apr 2014
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2021  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 "ModuleBase_ViewerPrs.h"
 
 #include <ModuleBase_ResultPrs.h>
+#include <StdSelect_BRepOwner.hxx>
 
-ModuleBase_ViewerPrs::ModuleBase_ViewerPrs(ObjectPtr theResult, 
-                                           const GeomShapePtr& theShape, 
-                                           Handle_SelectMgr_EntityOwner theOwner) 
+ModuleBase_ViewerPrs::ModuleBase_ViewerPrs(ObjectPtr theResult,
+                                           const GeomShapePtr& theShape,
+                                           Handle(SelectMgr_EntityOwner) theOwner)
 : myResult(theResult),
-  myShape(theShape),
-  myOwner(theOwner)
+  myOwner(theOwner),
+  myShape(theShape)
 {
 }
 
@@ -31,7 +45,7 @@ bool ModuleBase_ViewerPrs::isEqual(ModuleBase_ViewerPrs* thePrs) const
                        (myShape.get() && myShape->isEqual(thePrs->shape()));
   bool isEqualIO = (myInteractive == thePrs->interactive()) == Standard_True;
 
-  bool isEqualOwner = (myOwner.Access() == thePrs->owner().Access());
+  bool isEqualOwner = myOwner.get() == thePrs->owner().get();
   if (isEqualResult && isEqualShape && isEqualIO &&
       !isEqualOwner) { /// owners are different
     // as we might loading object with the same shape in different modes like
@@ -52,7 +66,7 @@ bool ModuleBase_ViewerPrs::isEqual(ModuleBase_ViewerPrs* thePrs) const
     // and set in the sub-solid AIS. ViewerPrs of these fictive owners are accepted as equal
     // as they use the same shape and result(of compsolid)
     Handle(StdSelect_BRepOwner) aCSolidOwner1 = Handle(StdSelect_BRepOwner)::DownCast(myOwner);
-    Handle(StdSelect_BRepOwner) aCSolidOwner2 = 
+    Handle(StdSelect_BRepOwner) aCSolidOwner2 =
       Handle(StdSelect_BRepOwner)::DownCast(thePrs->owner());
     isEqualIO = !aCSolidOwner1.IsNull() && !aCSolidOwner2.IsNull();
     if (!aCSolidOwner1.IsNull() && !aCSolidOwner2.IsNull())
@@ -73,7 +87,7 @@ bool ModuleBase_ViewerPrs::operator==(const ModuleBase_ViewerPrs& thePrs)
                        (myShape.get() && myShape->isEqual(thePrs.shape()));
   bool isEqualIO = (myInteractive == thePrs.interactive()) == Standard_True;
 
-  bool isEqualOwner = (myOwner.Access() == thePrs.owner().Access());
+  bool isEqualOwner = myOwner.get() == thePrs.owner().get();
   if (isEqualResult && isEqualShape && isEqualIO &&
       !isEqualOwner) { /// owners are different
     // as we might loading object with the same shape in different modes like
@@ -94,7 +108,7 @@ bool ModuleBase_ViewerPrs::operator==(const ModuleBase_ViewerPrs& thePrs)
     // and set in the sub-solid AIS. ViewerPrs of these fictive owners are accepted as equal
     // as they use the same shape and result(of compsolid)
     Handle(StdSelect_BRepOwner) aCSolidOwner1 = Handle(StdSelect_BRepOwner)::DownCast(myOwner);
-    Handle(StdSelect_BRepOwner) aCSolidOwner2 = 
+    Handle(StdSelect_BRepOwner) aCSolidOwner2 =
       Handle(StdSelect_BRepOwner)::DownCast(thePrs.owner());
     isEqualIO = !aCSolidOwner1.IsNull() && !aCSolidOwner2.IsNull();
     if (!aCSolidOwner1.IsNull() && !aCSolidOwner1.IsNull())