Porting to Qt 4

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 57956449a775292830e12c9359b68d2c7f7f05b3..b74804837e3b244e683eac1442d251fe75a38e3a 100755 (executable)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -579,16 +579,17 @@ QtxListAction::QtxListAction( QObject* parent )
 /*!
   \brief Constructor.
   \param icon action icon
-  \param text menu text
+  \param menuText menu text
   \param accel key accelerator
   \param parent parent object
 */
-QtxListAction::QtxListAction( const QIcon& icon, const QString& text, int accel, QObject* parent )
+QtxListAction::QtxListAction( const QIcon& icon, const QString& menuText, 
+                             int accel, QObject* parent )
 : QWidgetAction( parent ),
   myFrame( 0 )
 {
   setIcon( icon );
-  setText( text );
+  setText( menuText );
   setShortcut( accel );
 
   initialize();
@@ -596,15 +597,56 @@ QtxListAction::QtxListAction( const QIcon& icon, const QString& text, int accel,
 
 /*!
   \brief Constructor.
-  \param text menu text
+  \param menuText menu text
+  \param accel key accelerator
+  \param parent parent object
+*/
+QtxListAction::QtxListAction( const QString& menuText, int accel, QObject* parent )
+: QWidgetAction( parent ),
+  myFrame( 0 )
+{
+  setText( menuText );
+  setShortcut( accel );
+
+  initialize();
+}
+
+/*!
+  \brief Constructor.
+  \param text action description text (tooltip)
+  \param menuText menu text
+  \param accel key accelerator
+  \param parent parent object
+*/
+QtxListAction::QtxListAction( const QString& text, const QString& menuText, 
+                             int accel, QObject* parent )
+: QWidgetAction( parent ),
+  myFrame( 0 )
+{
+  setText( menuText );
+  setShortcut( accel );
+  setToolTip( text );
+
+  initialize();
+}
+
+/*!
+  \brief Constructor.
+  \param text action description text (tooltip)
+  \param icon action icon
+  \param menuText menu text
+  \param accel key accelerator
   \param parent parent object
 */
-QtxListAction::QtxListAction( const QString& text, int accel, QObject* parent )
+QtxListAction::QtxListAction( const QString& text, const QIcon& icon, 
+                             const QString& menuText, int accel, QObject* parent )
 : QWidgetAction( parent ),
-myFrame( 0 )
+  myFrame( 0 )
 {
-  setText( text );
+  setIcon( icon );
+  setText( menuText );
   setShortcut( accel );
+  setToolTip( text );
 
   initialize();
 }

diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index a300ef25867de001f95308256db3caec1a756bfe..1ec4c31e3bac93ec8dd8a4dcc041a486e44343c2 100755 (executable)
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.h
@@ -49,7 +49,9 @@ public:
 public:
   QtxListAction( QObject* = 0 );
   QtxListAction( const QString&, int, QObject* );
+  QtxListAction( const QString&, const QString&, int, QObject* );
   QtxListAction( const QIcon&, const QString&, int, QObject* );
+  QtxListAction( const QString&, const QIcon&, const QString&, int, QObject* );
   virtual ~QtxListAction();
 
   int              popupMode() const;