Copyright update 2020

[modules/gui.git] / src / GuiHelpers / StandardApp_Module.hxx

diff --git a/src/GuiHelpers/StandardApp_Module.hxx b/src/GuiHelpers/StandardApp_Module.hxx
index cf47c54ae7a0705826fb558e043a9b01b5f67db7..b73e2e6592a1176293a624dc9e7384aee6490b29 100644 (file)
--- a/src/GuiHelpers/StandardApp_Module.hxx
+++ b/src/GuiHelpers/StandardApp_Module.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2011-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2011-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // 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
@@ -16,7 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// Author : Guillaume Boulant (EDF) 
+// Author : Guillaume Boulant (EDF)
 
 #ifndef _STANDARDAPP_MODULE_HXX_
 #define _STANDARDAPP_MODULE_HXX_
@@ -86,7 +86,7 @@ public slots:
 public:
   /* Creates an action with standard default values */
   int createStandardAction(const QString& label,
-                          QObject * slotobject,
+                           QObject * slotobject,
                            const char* slotmember,
                            const QString& iconName=QString(),
                            const QString& tooltip=QString(),
@@ -94,7 +94,7 @@ public:
 
   void addActionInToolbar(int actionId);
   void addActionInMenubar(int actionId, int menuId=UNSPECIFIED_INT);
-  void addActionInPopupMenu(int actionId,const QString& rule="client='ObjectBrowser'");
+  void addActionInPopupMenu(int actionId,const QString& menus="",const QString& rule="client='ObjectBrowser'");
 
 protected:
   /* Implement this to create additionnal widget (e.g. docked widget) */
@@ -103,7 +103,7 @@ protected:
   virtual void createModuleActions();
 
   /* Use this to create a root entry in the study for this module */
-  void createStudyComponent(SUIT_Study*);
+  void createStudyComponent();
   /* Implement this to say if study component entry should be created
      at activation step */
   virtual bool createStudyComponentAtActivation();
@@ -125,7 +125,7 @@ protected:
   };
   virtual void setDockLayout(DockLayoutType layoutType);
   virtual void unsetDockLayout();
-  
+
   SUIT_ResourceMgr* _resourceMgr;
   int _defaultMenuId;
   int _defaultToolbarId;