[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/actions
From:       David Faure <faure () kde ! org>
Date:       2009-09-30 14:32:42
Message-ID: 1254321162.541221.11149.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029687 by dfaure:

Fix double definition of signal, leading to:
QMetaObject::indexOfSignal:KCodecAction: Conflict with KSelectAction::triggered(QString)
Tested; still works.


 M  +5 -7      kcodecaction.h  


--- trunk/KDE/kdelibs/kdeui/actions/kcodecaction.h #1029686:1029687
@@ -82,15 +82,10 @@
 Q_SIGNALS:
         /**
          * Specific (proper) codec was selected
-         */
-	void triggered(QTextCodec *codec);
-
-        /**
-         * Specific (proper) codec was selected
          *
-         * @returns codec name
+         * Note that triggered(const QString&) is emitted too (as defined in KSelectAction)
          */
-        void triggered(const QString&);
+        void triggered(QTextCodec *codec);
 
         /**
          * Autodetection has been selected.
@@ -109,6 +104,9 @@
 protected Q_SLOTS:
 	virtual void actionTriggered(QAction*);
 
+protected:
+        using KSelectAction::triggered;
+
 private:
 	class Private;
 	Private* const d;
[prev in list] [next in list] [prev in thread] [next in thread]