Salome HOME
Fix too long line (>100 characters)
[modules/shaper.git] / src / XGUI / XGUI_MenuMgr.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 7a56457..8a6fce0
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        XGUI_MenuMgr.cpp
-// Created:     13 Apr 2016
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <XGUI_MenuMgr.h>
 #include <XGUI_Workshop.h>
@@ -43,7 +56,7 @@ XGUI_MenuMgr::XGUI_MenuMgr(XGUI_Workshop* theWorkshop)
 void XGUI_MenuMgr::processEvent(const std::shared_ptr<Events_Message>& theMessage)
 {
   //A message to start feature creation received.
-  if (theMessage->eventID() == 
+  if (theMessage->eventID() ==
       Events_Loop::loop()->eventByName(Config_FeatureMessage::GUI_EVENT())) {
     std::shared_ptr<Config_FeatureMessage> aFeatureMsg =
        std::dynamic_pointer_cast<Config_FeatureMessage>(theMessage);
@@ -85,7 +98,7 @@ void XGUI_MenuMgr::addFeature(const std::shared_ptr<Config_FeatureMessage>& theM
     }
     if (aNestedActions.contains(FEATURE_WHEN_NESTED_ABORT)) {
       QAction* anAction = anActionsMgr->operationStateAction(XGUI_ActionsMgr::AbortAll);
-      QObject::connect(anAction, SIGNAL(triggered()), anOperationMgr, SLOT(abortAllOperations()));
+      QObject::connect(anAction, SIGNAL(triggered()), anOperationMgr, SLOT(onAbortAllOperation()));
       aNestedActList << anAction;
     }
   }
@@ -130,7 +143,7 @@ std::shared_ptr<XGUI_MenuWorkbench> XGUI_MenuMgr::findWorkbench(const std::strin
       aResultWorkbench = aWorkbench;
   }
   if (!aResultWorkbench) {
-    aResultWorkbench = 
+    aResultWorkbench =
       std::shared_ptr<XGUI_MenuWorkbench>(new XGUI_MenuWorkbench(theWorkbenchName));
     myWorkbenches.push_back(aResultWorkbench);
   }
@@ -152,11 +165,11 @@ void XGUI_MenuMgr::createFeatureActions()
     for (; aGIt != aGLast; aGIt++) {
       const std::shared_ptr<XGUI_MenuGroup> aGroup = *aGIt;
       std::string aGName = aGroup->getName();
-      const std::list<std::shared_ptr<Config_FeatureMessage> >& aFeaturesInfo = 
+      const std::list<std::shared_ptr<Config_FeatureMessage> >& aFeaturesInfo =
         aGroup->featuresInfo();
-      std::list<std::shared_ptr<Config_FeatureMessage> >::const_iterator aFIt = 
+      std::list<std::shared_ptr<Config_FeatureMessage> >::const_iterator aFIt =
         aFeaturesInfo.begin(), aFLast = aFeaturesInfo.end();
-      int aFSize = aFeaturesInfo.size();
+      size_t aFSize = aFeaturesInfo.size();
       for(int i = 0; aFIt != aFLast; aFIt++, i++) {
         std::shared_ptr<Config_FeatureMessage> aMessage = *aFIt;
         bool aUseSeparator = i == aFSize-1;
@@ -195,7 +208,7 @@ QAction* XGUI_MenuMgr::buildAction(const std::shared_ptr<Config_FeatureMessage>&
     }
     if (aNestedActions.contains(FEATURE_WHEN_NESTED_ABORT)) {
       QAction* anAction = anActionsMgr->operationStateAction(XGUI_ActionsMgr::AbortAll);
-      QObject::connect(anAction, SIGNAL(triggered()), anOperationMgr, SLOT(abortAllOperations()));
+      QObject::connect(anAction, SIGNAL(triggered()), anOperationMgr, SLOT(onAbortAllOperation()));
       aNestedActList << anAction;
     }
     anAction = aSalomeConnector->addFeatureOfNested(theWchName.c_str(), aFeatureInfo,