X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCAM%2FCAM_Module.h;h=74a2b6e75cfcc2ba1fbb26d6ed853a6ccad89746;hb=e6caa123c65e3c4a3017364ec5bb4225fd898465;hp=a49447a9fec22f1c74c98a7800aef478247ac353;hpb=73360495025aaf52997b98eaeb85e6cabe1b300f;p=modules%2Fgui.git diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h index a49447a9f..74a2b6e75 100755 --- a/src/CAM/CAM_Module.h +++ b/src/CAM/CAM_Module.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -29,6 +29,8 @@ #include #include #include +#include +#include class QAction; class QMenu; @@ -139,6 +141,9 @@ protected: int registerAction( const int, QAction* ); bool unregisterAction( const int ); bool unregisterAction( QAction* ); + // IMN 05/03/2015: we copied myActionMap for reset/unset actions accelerator keys + // after activate/deactivate modules + QMap, QKeySequence> myActionShortcutMap; //!< copy actions shortcut map private: CAM_Application* myApp; //!< parent application object