From a43d07a86c50cc5ca90f0e0f549cfd545a5dea07 Mon Sep 17 00:00:00 2001 From: sbh Date: Fri, 30 Jan 2015 11:21:01 +0300 Subject: [PATCH] Rename canAbortOperation on branch Dev_1.1.0 as in 3ef4f71fa94dbd4055244bd7715061b0eacae517 --- src/PartSet/PartSet_Module.cpp | 2 +- src/XGUI/XGUI_OperationMgr.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 3a51f9ab1..26da028d4 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -480,7 +480,7 @@ void PartSet_Module::deleteObjects() XGUI_Workshop* aWorkshop = aConnector->workshop(); XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr(); - if (!isSketchOp && anOpMgr->canAbortOperation()) { + if (!isSketchOp && anOpMgr->canStopOperation()) { ModuleBase_Operation* aCurrentOp = anOpMgr->currentOperation(); if (aCurrentOp) { aCurrentOp->abort(); diff --git a/src/XGUI/XGUI_OperationMgr.h b/src/XGUI/XGUI_OperationMgr.h index 04505fed0..e69eb70fa 100644 --- a/src/XGUI/XGUI_OperationMgr.h +++ b/src/XGUI/XGUI_OperationMgr.h @@ -50,6 +50,9 @@ Q_OBJECT /// Returns true is operation manager has an operation with given Id. bool hasOperation(const QString& theId) const; + /// Returns true if the operation can be aborted + bool canStopOperation(); + /// Find and return operation by its Id. ModuleBase_Operation* findOperation(const QString& theId) const; @@ -130,9 +133,6 @@ signals: protected: - /// Returns true if the operation can be aborted - bool canStopOperation(); - /// Commits the current operatin if it is valid bool commitOperation(); -- 2.39.2