X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetSelector.h;h=9db264010e91e3813143ea69043288440aae20ca;hb=c040abb8ae7ecff3c1b7d0dd97a9bf88972df93c;hp=152b76f1ef24478427f85b7c1de3cc833201e614;hpb=2469ecd08c3b16def494626928ff81e575bdfe3d;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.h b/src/ModuleBase/ModuleBase_WidgetSelector.h
index 152b76f1e..9db264010 100755
--- 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
@@ -79,7 +80,11 @@ protected:
 
   /// Retunrs a list of possible shape types
   /// \return a list of shapes
-  virtual QIntList getShapeTypes() const = 0;
+  QIntList getShapeTypes() const;
+
+  /// Retunrs a list of possible shape types
+  /// \return a list of shapes
+  virtual QIntList shapeTypes() const = 0;
 
   /// Computes and updates name of selected object in the widget
   // NDS: has body is temporary
@@ -94,7 +99,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
@@ -107,8 +113,9 @@ protected:
   //----------- Class members -------------
   /// Returns a name in the next form: attribute_feature_name/attribute_id
   /// \param theAttribute a model attribute
+  /// \param theWorkshop a workshop class instance
   /// \return string value
-  static std::string generateName(const AttributePtr& theAttribite,
+  static std::string generateName(const AttributePtr& theAttribute,
                                   ModuleBase_IWorkshop* theWorkshop);
 };