Merge branch 'master' of https://git.salome-platform.org/git/modules/gui

[modules/gui.git] / src / CAM / CAM_Application.h

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 1477238122df128d774e7a31e65e0e2f5845c113..5944e55d34b8adf0a90d5448e6bbf25bd6caab12 100755 (executable)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -64,6 +64,11 @@ public:
 
   virtual bool        activateModule( const QString& );
 
+  bool                activateOperation( const QString& modName, int actionId );
+  bool                activateOperation( const QString& modName, const QString& actionId );
+  bool                activateOperation( const QString& modName, const QString& actionId,
+                                         const QString& pluginName );
+
   virtual void        contextMenuPopup( const QString&, QMenu*, QString& );
 
   static QString      moduleName( const QString& );
@@ -88,6 +93,8 @@ protected:
 
   static QString      moduleLibrary( const QString&, const bool = true );
 
+  virtual bool        abortAllOperations();
+
 private:
   void                readModuleList();