Signal activated(int) conflicts with the same signal defined in QAction. Replaced...

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 6aea24408b7678b7020ec8c9f3654ea22ba850c4..d1fca010a201e9c312348d8f0b87e1ff8689291a 100755 (executable)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -884,7 +884,7 @@ void QtxListAction::onMultiple( const int numActions )
     myFrame->hide();
 
   if ( numActions > 0 )
-    emit activated( numActions );
+    emit triggered( numActions );
 }
 
 /*!
@@ -901,7 +901,7 @@ void QtxListAction::onTriggered( bool /*on*/ )
   if ( idx < 0 )
     return;
 
-  emit activated( idx + 1 );
+  emit triggered( idx + 1 );
 }
 
 /*!

diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index 956f65c7374ef9373d981cc15301e41ec7ae15ff..d4553a0fc8c32f1a4dc4e71c89a8a2e32f2d03b9 100755 (executable)
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.h
@@ -67,7 +67,7 @@ public:
   void             setCharsNumber( const int );
 
 signals:
-  void             activated( int );
+  void             triggered( int );
 
 private slots:
   void             onChanged();