Crash on abort of any non-sketch operation.

[modules/shaper.git] / src / XGUI / XGUI_Selection.h

diff --git a/src/XGUI/XGUI_Selection.h b/src/XGUI/XGUI_Selection.h
index 9202e97bb748fb8d9a8a8337fc11f96979e1f9d9..4868a9a80f7ffad28785f15f05cc8d354a26d158 100644 (file)
--- a/src/XGUI/XGUI_Selection.h
+++ b/src/XGUI/XGUI_Selection.h
@@ -16,35 +16,33 @@
 #include <NCollection_List.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include <list>
-
 class XGUI_Workshop;
 
-class XGUI_EXPORT XGUI_Selection: public ModuleBase_ISelection
+class XGUI_EXPORT XGUI_Selection : public ModuleBase_ISelection
 {
-public:
+ public:
   XGUI_Selection(XGUI_Workshop* theWorkshop);
 
   /// Returns a list of viewer selected presentations
   /// \param theShapeTypeToSkip the shapes with this type will be skipped during the result list build
   /// \return list of presentations
-  virtual std::list<ModuleBase_ViewerPrs> getSelected(int theShapeTypeToSkip = -1) const;
+  virtual QList<ModuleBase_ViewerPrs> getSelected(int theShapeTypeToSkip = -1) const;
 
   /// Returns a list of viewer highlited presentations
   /// \param theShapeTypeToSkip the shapes with this type will be skipped during the result list build
   /// \return list of presentations
-  virtual std::list<ModuleBase_ViewerPrs> getHighlighted(int theShapeTypeToSkip = -1) const;
+  virtual QList<ModuleBase_ViewerPrs> getHighlighted(int theShapeTypeToSkip = -1) const;
 
   /**
-  * Returns list of currently selected objects
-  */
+   * Returns list of currently selected objects
+   */
   virtual QList<ObjectPtr> selectedObjects() const;
 
   /**
-  * Returns list of currently selected results
-  */
-  virtual QResultList selectedResults() const;
-  
+   * Returns list of currently selected results
+   */
+  virtual QList<ObjectPtr> selectedPresentations() const;
+
   //! Returns list of currently selected QModelIndexes
   virtual QModelIndexList selectedIndexes() const;
 
@@ -52,10 +50,11 @@ public:
   virtual void selectedAISObjects(AIS_ListOfInteractive& theList) const;
 
   //! Returns list of currently selected shapes
-  virtual void selectedShapes(NCollection_List<TopoDS_Shape>& theList) const;
+  virtual void selectedShapes(NCollection_List<TopoDS_Shape>& theShapes, 
+    std::list<ObjectPtr>& theOwners) const;
 
-private:
+ private:
   XGUI_Workshop* myWorkshop;
 };
 
-#endif
\ No newline at end of file
+#endif