ModuleBase_ViewerPrs is wrapped into shared_ptr: remove include of this class from...

diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h
index 5e33eecb584a73a08fa3c73e3f99b263e1208a98..269c115683bafe6cba17bc69b23380bd4673e768 100755 (executable)
--- a/src/ModuleBase/ModuleBase_IModule.h
+++ b/src/ModuleBase/ModuleBase_IModule.h
@@ -29,6 +29,9 @@ class Config_WidgetAPI;
 class ModuleBase_ModelWidget;\r
 class ModuleBase_Operation;\r
 class ModuleBase_IWorkshop;\r
+class ModelAPI_Result;\r
+\r
+class Handle_AIS_InteractiveObject;\r
 \r
 /**\r
  * \ingroup GUI\r
@@ -202,7 +205,7 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject
                                    const bool theUpdateViewer) {}\r
 \r
   /// Modifies the given presentation in the custom way.\r
-  virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,\r
+  virtual bool customisePresentation(std::shared_ptr<ModelAPI_Result> theResult, AISObjectPtr thePrs,\r
                                      GeomCustomPrsPtr theCustomPrs) { return false; };\r
 \r
   /// Update the object presentable properties such as color, lines width and other\r
@@ -231,7 +234,8 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject
   /// Create specific for the module presentation\r
   /// \param theResult an object for presentation\r
   /// \return created presentation or NULL(default value)\r
-  virtual Handle(AIS_InteractiveObject) createPresentation(const ResultPtr& theResult);\r
+  virtual Handle_AIS_InteractiveObject createPresentation(\r
+                           const std::shared_ptr<ModelAPI_Result>& theResult);\r
 \r
   //! Returns data object by AIS\r
   virtual ObjectPtr findPresentedObject(const AISObjectPtr& theAIS) const = 0;\r

diff --git a/src/ModuleBase/ModuleBase_ISelection.cpp b/src/ModuleBase/ModuleBase_ISelection.cpp
index 05bc1d6c1dbde197c76e1c23cf8e0dcd3d2cf051..1669c2381cea636b871832c37c1d69505faf146b 100644 (file)
--- a/src/ModuleBase/ModuleBase_ISelection.cpp
+++ b/src/ModuleBase/ModuleBase_ISelection.cpp
@@ -2,6 +2,8 @@
 
 #include "ModuleBase_ISelection.h"
 
+#include "ModuleBase_ViewerPrs.h"
+
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS.hxx>

diff --git a/src/ModuleBase/ModuleBase_ISelection.h b/src/ModuleBase/ModuleBase_ISelection.h
index fbfa973a6cd99e2419ecc59006cacc062622a8b8..65badd60f096ca26d28b5ebeff1096a46497be14 100644 (file)
--- a/src/ModuleBase/ModuleBase_ISelection.h
+++ b/src/ModuleBase/ModuleBase_ISelection.h
@@ -9,7 +9,6 @@
 
 #include "ModuleBase.h"
 #include "ModuleBase_Definitions.h"
-#include "ModuleBase_ViewerPrs.h"
 
 #include <ModelAPI_Result.h>
 #include <GeomAPI_Shape.h>
@@ -21,6 +20,7 @@
 
 #include <QList>
 
+class ModuleBase_ViewerPrs;
 class Handle_SelectMgr_EntityOwner;
 
 /**

diff --git a/src/ModuleBase/ModuleBase_IWorkshop.h b/src/ModuleBase/ModuleBase_IWorkshop.h
index 3c0fa44d14d622eaf264738d09d60db16b493025..45284de1bd2542f646356718eafa3272429e6448 100644 (file)
--- a/src/ModuleBase/ModuleBase_IWorkshop.h
+++ b/src/ModuleBase/ModuleBase_IWorkshop.h
@@ -10,7 +10,6 @@
 #include "ModuleBase.h"
 #include "ModuleBase_Definitions.h"
 #include <ModuleBase_FilterValidated.h>
-#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Object.h>
 #include <GeomAPI_AISObject.h>
@@ -23,6 +22,7 @@ class ModuleBase_IViewer;
 class ModuleBase_IPropertyPanel;
 class ModuleBase_Operation;
 class ModuleBase_FilterFactory;
+class ModuleBase_ViewerPrs;
 
 /**
  * \ingroup GUI

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index d12cfbeb2da066ed516182b0b6dd9b655595cf1e..1985400a453644d51c3836b917ee216dd87f687a 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp
@@ -5,6 +5,7 @@
 // Author:      Natalia ERMOLAEVA
 
 #include "ModuleBase_ModelWidget.h"
+#include "ModuleBase_ViewerPrs.h"
 #include "ModuleBase_Tools.h"
 
 #include <ModelAPI_Data.h>

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index 3da454d0ed46935cb369a35ebbe1f90a2e93a7b2..6712bc0299d715372cd3edb805c5bece054dc25c 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -8,7 +8,6 @@
 #define MODULEBASE_MODELWIDGET_H
 
 #include <ModuleBase.h>
-#include <ModuleBase_ViewerPrs.h>
 #include <ModuleBase_OperationFeature.h>
 #include <ModelAPI_Feature.h>
 
@@ -18,6 +17,7 @@
 
 class Config_WidgetAPI;
 class ModuleBase_IWorkshop;
+class ModuleBase_ViewerPrs;
 class QKeyEvent;
 
 /**\class ModuleBase_ModelWidget

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.h b/src/ModuleBase/ModuleBase_OperationFeature.h
index 48c374a65c4a55be5db7537d35e890485b78e447..6bc625b3e5ea63e14cf559ed5087739ce08a5c18 100755 (executable)
--- a/src/ModuleBase/ModuleBase_OperationFeature.h
+++ b/src/ModuleBase/ModuleBase_OperationFeature.h
@@ -12,7 +12,6 @@
 
 #include <ModuleBase.h>
 #include <ModuleBase_Operation.h>
-#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Object.h>
 #include <ModelAPI_CompositeFeature.h>
@@ -27,6 +26,7 @@ class ModuleBase_ModelWidget;
 class ModuleBase_ISelection;
 class ModuleBase_IViewer;
 class ModuleBase_IWorkshop;
+class ModuleBase_ViewerPrs;
 
 class QKeyEvent;
 

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 8e278515111d0b1c5a9542112b30f0b70d5f3edc..6e47e28923caf8f6bc9dd2c665d685d3bddc7d75 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -15,6 +15,7 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_Definitions.h>
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Object.h>

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 4d8034ed8dbf77a14acd0c696290cd7d8c2e2644..b9fe6ef9c9db8f643c71abfe33d7cce5514e4e31 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -14,6 +14,7 @@
 #include <ModuleBase_WidgetFactory.h>
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_ResultPrs.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_ResultConstruction.h>
 

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.h b/src/ModuleBase/ModuleBase_WidgetSelector.h
index 152b76f1ef24478427f85b7c1de3cc833201e614..b6af3a3f9de84ffcfb6bf571b7be5c191ba0821c 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.h
@@ -9,7 +9,6 @@
 
 #include "ModuleBase.h"
 #include "ModuleBase_WidgetValidated.h"
-#include <ModuleBase_ViewerPrs.h>
 #include "ModuleBase_Definitions.h"
 
 #include <ModelAPI_Object.h>
@@ -19,6 +18,8 @@
 class Config_WidgetAPI;
 class QWidget;
 class ModuleBase_IWorkshop;
+class ModuleBase_ViewerPrs;
+class ModelAPI_Result;
 
 /**
 * \ingroup GUI
@@ -94,7 +95,8 @@ protected:
   /// in the construction.
   /// \param theShape a shape
   /// \param theResult a selected result
-  bool acceptSubShape(const GeomShapePtr& theShape, const ResultPtr& theResult) const;
+  bool acceptSubShape(const GeomShapePtr& theShape,
+                      const std::shared_ptr<ModelAPI_Result>& theResult) const;
 
   /// Return an object and geom shape by the viewer presentation
   /// \param thePrs a selection

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index ff003f0e8dcf78f50a60524b514f18570d85c844..39387667a44beff6f08e46718020cd7cec8a53e9 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -13,6 +13,7 @@
 #include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_Filter.h>
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <Config_WidgetAPI.h>
 #include <Events_Loop.h>

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index 35ce69e16362d6b2dd60216a2062cebc8892ffed..e7154df8ef467895701acf69c0f274a3de0fe54f 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@ -10,7 +10,6 @@
 #include "ModuleBase.h"
 #include "ModuleBase_WidgetSelector.h"
 #include "ModuleBase_ViewerFilters.h"
-#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Attribute.h>
@@ -26,6 +25,7 @@ class QLabel;
 class QLineEdit;
 class QToolButton;
 class ModuleBase_IWorkshop;
+class ModuleBase_ViewerPrs;
 class ModelAPI_Validator;
 
 /**

diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp
index a78a1c893ec91d1fd1dfff115aab70e8b1c06a6b..0bc4aef1a1ab71808bd8874ef33e30a5f6a3dd78 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetValidated.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetValidated.cpp
@@ -5,6 +5,7 @@
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_ISelection.h>
 #include <ModuleBase_WidgetSelectorStore.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>

diff --git a/src/PartSet/PartSet_FilterInfinite.cpp b/src/PartSet/PartSet_FilterInfinite.cpp
index ce873e62e98affbbff489c2dee0036dde6a56d72..df38f4ceb781ddcaf9b37a13f6f025fc60c897e3 100755 (executable)
--- a/src/PartSet/PartSet_FilterInfinite.cpp
+++ b/src/PartSet/PartSet_FilterInfinite.cpp
@@ -8,6 +8,8 @@
 
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
+
 #include <ModelAPI_ResultConstruction.h>
 
 #include <AIS_InteractiveObject.hxx>

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index cb741d4f0c169ebdfc68f0ff0ecbe534611372e3..ca96ae5ccc909a026946596c02bc70fc8c8698f1 100755 (executable)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -41,6 +41,7 @@
 #include <ModuleBase_OperationFeature.h>
 #include <ModuleBase_WidgetFactory.h>
 #include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Events.h>

diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h
index 93084a2ae04a3be4c86eab5ff996994a0376f7b7..6b70b2341fa431e90ba3892e25c211a4e65ea3e3 100755 (executable)
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@ -35,6 +35,7 @@ class PartSet_MenuMgr;
 class PartSet_CustomPrs;
 class PartSet_SketcherMgr;
 class PartSet_SketcherReetntrantMgr;
+class ModelAPI_Result;
 
 class QAction;
 
@@ -228,7 +229,8 @@ public:
                                    const bool theUpdateViewer);
 
   /// Modifies the given presentation in the custom way.
-  virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,
+  virtual bool customisePresentation(std::shared_ptr<ModelAPI_Result> theResult,
+                                     AISObjectPtr thePrs,
                                      std::shared_ptr<GeomAPI_ICustomPrs> theCustomPrs);
 
   /// Update the object presentable properties such as color, lines width and other
@@ -252,7 +254,8 @@ public:
   /// Create specific for the module presentation
   /// \param theResult an object for presentation
   /// \return created presentation or NULL(default value)
-  virtual Handle(AIS_InteractiveObject) createPresentation(const ResultPtr& theResult);
+  virtual Handle(AIS_InteractiveObject) createPresentation(
+                              const std::shared_ptr<ModelAPI_Result>& theResult);
 
   //! Returns data object by AIS
   virtual ObjectPtr findPresentedObject(const AISObjectPtr& theAIS) const;

diff --git a/src/PartSet/PartSet_OperationPrs.cpp b/src/PartSet/PartSet_OperationPrs.cpp
index 76e143c826b85faaf2e472c44602446afd8ed3c1..98bd33298ad97893bd67d675ac121f5379b88883 100755 (executable)
--- a/src/PartSet/PartSet_OperationPrs.cpp
+++ b/src/PartSet/PartSet_OperationPrs.cpp
@@ -16,6 +16,7 @@
 #include "ModuleBase_IModule.h"
 #include <ModuleBase_IPropertyPanel.h>
 #include <ModuleBase_ModelWidget.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Result.h>
 #include <ModelAPI_Attribute.h>

diff --git a/src/PartSet/PartSet_Tools.h b/src/PartSet/PartSet_Tools.h
index 292e4c84c31b8f68b0f756ad04837709812e03e4..bd68e4fb6596b2606ba79787de47d6cf9b74466e 100755 (executable)
--- a/src/PartSet/PartSet_Tools.h
+++ b/src/PartSet/PartSet_Tools.h
@@ -9,7 +9,6 @@
 
 #include "PartSet.h"
 
-#include <ModuleBase_ViewerPrs.h>
 #include <gp_Pnt.hxx>
 
 #include <QPoint>
@@ -29,11 +28,13 @@ class Handle_V3d_View;
 class ModuleBase_ViewerPrs;
 class ModuleBase_IWorkshop;
 class GeomDataAPI_Point2D;
+class GeomAPI_Shape;
 class GeomAPI_Pln;
 class GeomAPI_Pnt2d;
 class GeomAPI_Pnt;
 class GeomAPI_Edge;
 class GeomAPI_Vertex;
+class ModelAPI_Result;
 
 /*!
  * \class PartSet_Tools
@@ -159,7 +160,8 @@ public:
   /// \param theObject a selected result object
   /// \param theSketch a sketch feature
   /// \return result of found feature or NULL
-  static ResultPtr findFixedObjectByExternal(const TopoDS_Shape& theShape, 
+  static std::shared_ptr<ModelAPI_Result> findFixedObjectByExternal(
+                                             const TopoDS_Shape& theShape,
                                              const ObjectPtr& theObject, 
                                              CompositeFeaturePtr theSketch);
 
@@ -170,7 +172,8 @@ public:
   /// \param theSketch a sketch feature
   /// \param theTemporary the created external object is temporary, execute is not performed for it
   /// \return result of created feature
-  static ResultPtr createFixedObjectByExternal(const TopoDS_Shape& theShape, 
+  static std::shared_ptr<ModelAPI_Result> createFixedObjectByExternal(
+                                               const TopoDS_Shape& theShape, 
                                                const ObjectPtr& theObject, 
                                                CompositeFeaturePtr theSketch,
                                                const bool theTemporary = false);
@@ -186,13 +189,15 @@ public:
   /// \param theSketch - the sketch feature
   /// \param theEdge - the edge
   /// \return result object with external edge if it is found
-  static ResultPtr findExternalEdge(CompositeFeaturePtr theSketch, std::shared_ptr<GeomAPI_Edge> theEdge);
+  static std::shared_ptr<ModelAPI_Result> findExternalEdge(CompositeFeaturePtr theSketch,
+                                                           std::shared_ptr<GeomAPI_Edge> theEdge);
 
   /// Returns Result object if the given sketch contains external vertex equal to the given
   /// \param theSketch - the sketch feature
   /// \param theVert - the vertex
   /// \return result object with external vertex if it is found
-  static ResultPtr findExternalVertex(CompositeFeaturePtr theSketch, std::shared_ptr<GeomAPI_Vertex> theVert);
+  static std::shared_ptr<ModelAPI_Result> findExternalVertex(CompositeFeaturePtr theSketch,
+                                                        std::shared_ptr<GeomAPI_Vertex> theVert);
 
   /// Returns whether the selected presentation has a shape with the vertex type
   /// \param thePrs a selected presentation
@@ -219,7 +224,7 @@ public:
   * \param theWorkshop a reference to workshop
   * \return a geometry shape
   */
-  static GeomShapePtr findShapeBy2DPoint(const AttributePtr& theAttribute,
+  static std::shared_ptr<GeomAPI_Shape> findShapeBy2DPoint(const AttributePtr& theAttribute,
                                          ModuleBase_IWorkshop* theWorkshop);
 
   /**

diff --git a/src/PartSet/PartSet_Validators.cpp b/src/PartSet/PartSet_Validators.cpp
index 9258568434ddd24225864a5315d53094676140fe..38ef8be3a061a371ceb08401c4dbbd656a46a3b3 100755 (executable)
--- a/src/PartSet/PartSet_Validators.cpp
+++ b/src/PartSet/PartSet_Validators.cpp
@@ -17,6 +17,7 @@
 #include <ModuleBase_ISelection.h>
 #include <ModuleBase_WidgetShapeSelector.h>
 #include <ModuleBase_OperationFeature.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_AttributeSelection.h>

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
index f3e429361a3b7433835353c590fc618281101cf3..e8695bf2172b8a614ed39739443c2b7d293f6dcb 100755 (executable)
--- a/src/PartSet/PartSet_WidgetMultiSelector.cpp
+++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp
@@ -16,6 +16,7 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <Config_WidgetAPI.h>
 

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.h b/src/PartSet/PartSet_WidgetMultiSelector.h
index d3d367119808ddb1d9ccd40091de652a8d9b47f2..b079c75301fdc39fe8d3c033762209840973393b 100644 (file)
--- a/src/PartSet/PartSet_WidgetMultiSelector.h
+++ b/src/PartSet/PartSet_WidgetMultiSelector.h
@@ -11,11 +11,11 @@
 #include "PartSet.h"
 
 #include <ModuleBase_WidgetMultiSelector.h>
-#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_CompositeFeature.h>
 
 class PartSet_ExternalObjectsMgr;
+class ModuleBase_ViewerPrs;
 
 /**
 * \ingroup Modules

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index f5e9903da932000e6eb492d1b706fa57b0751c93..07270eacc49863bb744569ce9eca6dce10195faa 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -17,6 +17,7 @@
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_IViewWindow.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
index c291eb0ff7d6598923284f50fc0e19bd79921b1e..aa20ad82c28af9445c7993988c37e9d1d549e4c4 100755 (executable)
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -13,6 +13,8 @@
 #include <ModelAPI_Validator.h>
 
 #include <ModuleBase_Definitions.h>
+#include <ModuleBase_ViewerPrs.h>
+
 #include <Config_WidgetAPI.h>
 
 #include <PartSet_ExternalObjectsMgr.h>

diff --git a/src/PartSet/PartSet_WidgetSketchCreator.cpp b/src/PartSet/PartSet_WidgetSketchCreator.cpp
index 91d36980b1b78cf63e6498c17f21bc763d2435fc..ba9f9f124ee448081ff3794d84bc114669215bd9 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchCreator.cpp
+++ b/src/PartSet/PartSet_WidgetSketchCreator.cpp
@@ -37,6 +37,8 @@
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_IPropertyPanel.h>
 #include <ModuleBase_OperationFeature.h>
+#include <ModuleBase_ViewerPrs.h>
+
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 2468786c43859ced97f6586a46310ef28c820908..66c6bf5a8ec945aeb6062ea0873488c4008633c5 100644 (file)
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -1,9 +1,5 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
-/*
- * XGUI_ActionsMgr.cpp
- */
-
 #ifndef HAVE_SALOME
 #include <AppElements_Command.h>
 #endif

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index 6122c232f2af642a6f36549f55651ddac6879269..051fa80283b963cc977166e4844b8f26a5c13cae 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -31,6 +31,7 @@
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_OperationAction.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <QAction>
 #include <QActionGroup>

diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index bfb5ce29fc8303efdb18c09f4adacdd43b7dbd63..e969fbf013a8e57de5885ec6dacb84975f0bf1fc 100644 (file)
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -25,6 +25,7 @@
 #include <ModuleBase_ResultPrs.h>
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <GeomAPI_Shape.h>
 #include <GeomAPI_IPresentable.h>

diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h
index 0ef3285f8fd2760ac8bdda2d1710d7a16f465a69..a25c306f731862c9ad79e1ac60d6eb3ef8a33ca8 100644 (file)
--- a/src/XGUI/XGUI_Displayer.h
+++ b/src/XGUI/XGUI_Displayer.h
@@ -18,7 +18,6 @@
 #include <ModelAPI_Result.h>
 
 #include <ModuleBase_Definitions.h>
-#include <ModuleBase_ViewerPrs.h>
 
 #include <GeomAPI_ICustomPrs.h>
 
@@ -29,6 +28,7 @@
 #include <QObject>
 #include <QColor>
 
+class ModuleBase_ViewerPrs;
 class ModelAPI_Feature;
 class XGUI_Workshop;
 

diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp
index 6e9a0abc94048dd58a0d298e4a63d0fcd8596c64..07fcafc613a47684e1ae3d049b507a1f81ebe0fc 100644 (file)
--- a/src/XGUI/XGUI_Selection.cpp
+++ b/src/XGUI/XGUI_Selection.cpp
@@ -11,6 +11,7 @@
 #include "XGUI_ObjectsBrowser.h"
 
 #include "ModuleBase_ResultPrs.h"
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Tools.h>

diff --git a/src/XGUI/XGUI_Selection.h b/src/XGUI/XGUI_Selection.h
index f1de36228944e8abd69cf3989926df66c5304427..570820e2c7744ecb022fc6f7287729eed2c935d3 100644 (file)
--- a/src/XGUI/XGUI_Selection.h
+++ b/src/XGUI/XGUI_Selection.h
@@ -9,7 +9,6 @@
 
 #include "XGUI.h"
 
-#include <ModuleBase_ViewerPrs.h>
 #include <ModuleBase_Definitions.h>
 #include <ModuleBase_ISelection.h>
 
@@ -22,6 +21,7 @@
 
 class XGUI_Workshop;
 class Handle_SelectMgr_EntityOwner;
+class ModuleBase_ViewerPrs;
 
 /**
 * \ingroup GUI