From: vsv <vsv@opencascade.com>
Date: Fri, 17 Oct 2008 06:42:11 +0000 (+0000)
Subject: Signal activated(int) conflicts with the same signal defined in QAction. Replaced... 
X-Git-Tag: V5_1_0a3~14
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb59739a16c717624435ad5ba4d1624e07ca4d96;p=modules%2Fgui.git

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

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 6aea24408..d1fca010a 100755
--- 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 956f65c73..d4553a0fc 100755
--- 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();