From: asl <asl@opencascade.com>
Date: Tue, 1 Sep 2015 07:09:59 +0000 (+0300)
Subject: Issue #862: new implementation of operations abort on save
X-Git-Tag: V_1.4.0_beta4~157
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a969416f74ed6c25b2e1c2199f0a8f13b74b185e;p=modules%2Fshaper.git

Issue #862: new implementation of operations abort on save
---

diff --git a/src/NewGeom/NewGeom_Module.cpp b/src/NewGeom/NewGeom_Module.cpp
index dae10ab34..18188e575 100644
--- a/src/NewGeom/NewGeom_Module.cpp
+++ b/src/NewGeom/NewGeom_Module.cpp
@@ -125,7 +125,6 @@ void NewGeom_Module::initialize(CAM_Application* theApp)
   if (anApp)
   {
     connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
-    connect(anApp, SIGNAL(abortAllOperations( bool& )), this, SLOT(onAbortAllOperations( bool& )));
   }
 }
 
@@ -626,7 +625,7 @@ void NewGeom_Module::inspectSalomeModules()
   }
 }
 
-void NewGeom_Module::onAbortAllOperations( bool& isNextOperationAllowed )
+bool NewGeom_Module::abortAllOperations()
 {
-  isNextOperationAllowed = workshop()->operationMgr()->abortAllOperations();
+  return workshop()->operationMgr()->abortAllOperations();
 }
diff --git a/src/NewGeom/NewGeom_Module.h b/src/NewGeom/NewGeom_Module.h
index 2275931fe..6024fa843 100644
--- a/src/NewGeom/NewGeom_Module.h
+++ b/src/NewGeom/NewGeom_Module.h
@@ -157,8 +157,6 @@ Q_OBJECT
   /// Obtains the current application and updates its actions
   void onUpdateCommandStatus();
 
-  void onAbortAllOperations( bool& );
-
  protected:
    /// Create data model
   CAM_DataModel* createDataModel();
@@ -166,6 +164,8 @@ Q_OBJECT
   /// Create popup menu manager
   virtual QtxPopupMgr* popupMgr();
 
+  virtual bool abortAllOperations();
+
  private:
    /// Create selector for OCC Viewer
    /// \param theMgr view manager