Update from BR_V5_DEV 13Feb2009

[modules/gui.git] / src / SUIT / SUIT_ActionOperation.h

diff --git a/src/SUIT/SUIT_ActionOperation.h b/src/SUIT/SUIT_ActionOperation.h
index bed11e318b3be184d977bf49295a4afe7dc10153..f4f8e895188fea7e2bb4ea17eef6fa185390497c 100644 (file)
--- a/src/SUIT/SUIT_ActionOperation.h
+++ b/src/SUIT/SUIT_ActionOperation.h
@@ -1,58 +1,62 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA 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.
-// 
-// 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.
+//
+//  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
 //
 #ifndef SUIT_ACTIONOPERATION_H
 #define SUIT_ACTIONOPERATION_H
 
 #include "SUIT_Operation.h"
 
-class QtxAction;
+#include <QKeySequence>
+
+class QIcon;
 class QString;
-class QIconSet;
-class QKeySequence;
 class QWidget;
 
+class QtxAction;
+
 /*!Provide support QtxAction*/
 class SUIT_EXPORT SUIT_ActionOperation : public SUIT_Operation
 {
        Q_OBJECT
 
 public:
-       SUIT_ActionOperation( SUIT_Application* theApp );
+       SUIT_ActionOperation( SUIT_Application* );
        virtual ~SUIT_ActionOperation();
 
        QtxAction*   action() const;
 
        /** @name GUI management*/
        //@{
-       virtual void setAction( const QString& text, const QIconSet& icon, const QString& menuText,
-                               QKeySequence accel, QObject* parent, const char* name = 0, bool toggle = false );
+       virtual void setAction( const QString& text, const QIcon& icon, const QString& menuText,
+                                                 QKeySequence accel, QObject* parent, bool toggle = false );
 
-       virtual void setAction( const QString& text, const QString& menuText, QKeySequence accel,
-                               QObject* parent, const char* name = 0, bool toggle = false );
+       virtual void setAction( const QString& text, const QString& menuText,
+                          QKeySequence accel, QObject* parent, bool toggle = false );
        virtual void setAction( QtxAction* theAction );
        
        bool         addTo( QWidget* theWidget );
-       bool         addTo( QWidget* theWidget, int thePos );
-       
+
        void         setStatusTip( const QString& theTip );
        //@}
-       
+
 private:
        QtxAction*   myAction;