Replace Q_SIGNALS and Q_SLOTS

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 477975ca20)
10 months ago · 7ad14b004a
parent 3b1e4bbb3d
commit 7ad14b004a
25 changed files with 63 additions and 63 deletions
--- a/akregator/HACKING
+++ b/akregator/HACKING
@ -87,17 +87,17 @@ class should be roughly as follows:
 public typedefs:
 public ctors:
 public methods:
-public Q_SLOTS:
-Q_SIGNALS:
+public slots:
+signals:
 protected methods:
-protected Q_SLOTS:
+protected slots:
 protected fields:
 private methods:
-private Q_SLOTS:
+private slots:
 private fields:
 private ctors: // if you define ctors/dtor as private, put them at end

-If there are no private Q_SLOTS there is no need for two private sections, however
+If there are no private slots there is no need for two private sections, however
 private functions and private variables should be clearly separated.

 The implementations files -- .cpp files -- should follow (when possible) the
@ -163,10 +163,10 @@ class Test : public TQObject

        static Test *instance() { return m_instance; }

-    public Q_SLOTS:
+    public slots:
        void receive(QSomething &);

-    Q_SIGNALS:
+    signals:
        void send(QSomething &);

    protected:
@ -174,7 +174,7 @@ class Test : public TQObject

        static void someProtectedStaticFunc();

-    protected Q_SLOTS:
+    protected slots:
        void protectedSlot();

    protected:
@ -185,7 +185,7 @@ class Test : public TQObject

        static int staticPrivateMethod();

-    private Q_SLOTS:
+    private slots:
        void privateSlotIndeed(int youWonder);

    private:
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@ -452,10 +452,10 @@
        <slot>setEnabled(bool)</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
    <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">klineedit.h</include>
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@ -546,10 +546,10 @@ If you want to change anything, press Back and make your changes; otherwise, pre
    <tabstop>certificateTE</tabstop>
    <tabstop>generatePB</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotEmailAddressChanged(const TQString&amp;)</slot>
    <slot access="protected">slotGenerateCertificate()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">klineedit.h</include>
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@ -201,7 +201,7 @@
    <tabstop>strikeoutCB</tabstop>
    <tabstop>defaultLookPB</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotForegroundClicked()</slot>
    <slot access="protected">slotBackgroundClicked()</slot>
    <slot access="protected">slotFontClicked()</slot>
@ -210,6 +210,6 @@
    <slot access="protected">slotItalicClicked()</slot>
    <slot access="protected">slotBoldClicked()</slot>
    <slot access="protected">slotStrikeoutClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service
        <slot>slotMoveDown()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotAddService()</slot>
    <slot access="protected">slotDeleteService()</slot>
    <slot access="protected">slotServiceChanged( TQListViewItem* )</slot>
    <slot access="protected">slotServiceSelected( TQListViewItem* )</slot>
    <slot access="protected">slotMoveUp()</slot>
    <slot access="protected">slotMoveDown()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/kaddressbook/editors/imaddressbase.ui
+++ b/kaddressbook/editors/imaddressbase.ui
@ -81,9 +81,9 @@
    <tabstop>cmbProtocol</tabstop>
    <tabstop>edtAddress</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot>slotProtocolChanged( const TQString &amp; )</slot>
    <slot>slotProtocolChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@ -164,9 +164,9 @@
        <slot>reject()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot>editParameterName(TQListViewItem *)</slot>
    <slot access="protected">slotAccept()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@ -565,7 +565,7 @@
    <tabstop>PushButton1</tabstop>
    <tabstop>PushButton8_3</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot>readKabc()</slot>
    <slot>readModelInformation()</slot>
    <slot>readPhonebook()</slot>
@ -578,6 +578,6 @@
    <slot>termAddOutput( const char *line )</slot>
    <slot>toggleConnection()</slot>
    <slot>deleteMobPhonebook()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/karm/TODO
+++ b/karm/TODO
@ -1,6 +1,6 @@
 * KarmWindow::makeMenus -> export TDEAction?  KarmWindow::contextMenuRequest
 * QPopupMenu should be static!  put connect( ..contextMenu at the right place
-* mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action
+* mainwindow: move tray signals into tray.cpp add mouse double-click action
 * (start new timer, stop old) to "Configure
  Shortcuts" dialog.

--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@ -402,9 +402,9 @@
    <tabstop>btnExport</tabstop>
    <tabstop>btnCancel</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot>enableExportButton()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">kdateedit.h</include>
--- a/karm/doc/Mainpage.dox
+++ b/karm/doc/Mainpage.dox
@ -24,7 +24,7 @@ order and can return a pointer to a KCal::Todo object that holds the same
 information.

 Preferences is a singleton that stores configuration options.  It raises
-Q_SIGNALS when options change (for example, the location where the karm data is
+signals when options change (for example, the location where the karm data is
 stored) so the application can react and adjust.

 KarmStorage is a singleton that creates an interface for storing KArm data.
@ -35,7 +35,7 @@ format.

 /** \page sig_slot_index Index of Signals and Slots

-To get an understanding of the flow program, it may be useful to see an overview of all of the Q_SIGNALS, Q_SLOTS, and
+To get an understanding of the flow program, it may be useful to see an overview of all of the signals, slots, and
 connections. See \see connections to get an index of what signal is connected to which slot.

 \section overview Summary of what each class provides
@ -60,9 +60,9 @@ connections. See \see connections to get an index of what signal is connected to
    <tr><td>Task</td>             <td>&nbsp;</td> <td>&nbsp;</td> <td>Y     </td> <td>&nbsp;</td></tr>
 </table>

-\section Q_SIGNALS Listing of all of the Q_SIGNALS
+\section signals Listing of all of the signals

-These are the Q_SIGNALS:
+These are the signals:
 <ol>
    <li>IdleTimer::extractTime(int)
    <li>IdleTimer::stopTimer()
@ -83,7 +83,7 @@ These are the Q_SIGNALS:
    <li>Preferences::hideOnClose(bool)
 </ol>

-\section Q_SLOTS Listing of the Q_SLOTS
+\section slots Listing of the slots

 \subsection public Public Slots

--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@ -702,7 +702,7 @@
 <variables>
    <variable>KDGanttViewItem * myItem</variable>
 </variables>
-<Q_SLOTS>
+<slots>
    <slot>init()</slot>
    <slot>ChangeText_clicked()</slot>
    <slot>ChangeStart_clicked()</slot>
@ -732,6 +732,6 @@
    <slot>CalBox_toggled( bool mode )</slot>
    <slot>PrioSlider_valueChanged( int val )</slot>
    <slot returnType="KDGanttViewItem *">getItem()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to
 function that want to use the identity reference. Store the UOID
 instead if you need to keep track of the identity. You may also want
 to connect to one of the KPIM::IdentityManager::changed() or ::deleted()
-Q_SIGNALS, if you want to do special processing in case the identity
+signals, if you want to do special processing in case the identity
 changes.

 Thus, in the ConfigureDialog, you will see non-const KPIM::Identity
@ -277,7 +277,7 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are :

 FolderJob classes - These classes allow asynchronous operations on
 KMFolder's. You create a Job on the heap, connect to one of its 
-Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob
+signals and wait for the job to finish. Folders serve as FolderJob
 factories. For example, to retrieve the full message from a folder
 you do :

@ -859,7 +859,7 @@ public:
    QTimer::singleShot( 10*1000, this, TQ_SLOT(slotTimeout()) );
  }

-private Q_SLOTS:
+private slots:
  void slotTimeout() { notify(): }

 private:
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@ -351,10 +351,10 @@
        <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
    </image>
 </images>
-<Q_SLOTS>
+<slots>
    <slot>mAdd_clicked()</slot>
    <slot>mRemove_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">kactivelabel.h</include>
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@ -630,9 +630,9 @@
    <variable>TQValueList&lt;TQGuardedPtr&lt;KMFolder&gt; &gt; mFolders;</variable>
    <variable>KMFolderDir *mFolderDIr;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotChangeIcon( TQString )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@ -210,10 +210,10 @@
        <slot>changed()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected">useExternalMailerToggled(bool)</slot>
    <slot access="protected">loginToggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in declaration">tdecmodule.h</include>
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@ -74,7 +74,7 @@ See e.g. tdepim/kaddressbook/kaddressbook.desktop

 Designing DCOP interfaces
 =========================
-Porting the kroupware Q_SIGNALS/Q_SLOTS to DCOP requires some changes.
+Porting the kroupware signals/slots to DCOP requires some changes.
 For instance any non-const reference (such as those used for returning
 values to the caller) has to be changed. If there is more than one
 value to be returned, you need to
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@ -297,9 +297,9 @@ Only to-dos which have least one attendee will be checked.  If you are not in th
        <slot>setEnabled(bool)</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot>updateFilter()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">knuminput.h</include>
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@ -620,12 +620,12 @@ For security reasons, it is not recommended to store your password in the config
    <include location="global" impldecl="in declaration">kdemacros.h</include>
    <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
    <signal>changed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
    <slot>slotChanged()</slot>
-</Q_SLOTS>
+</slots>
 <exportmacro>KDE_EXPORT</exportmacro>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@ -234,9 +234,9 @@
    <tabstop>chPassivePopup</tabstop>
    <tabstop>chPassiveDate</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotProtocolChanged( const TQString&amp; )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">klineedit.h</include>
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@ -1665,7 +1665,7 @@
    <tabstop>chPassiveDate</tabstop>
    <tabstop>pbEdit</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotEditBox()</slot>
    <slot access="protected">slotActivated( const TQString&amp; )</slot>
    <slot access="protected">slotActivated( const int )</slot>
@ -1676,7 +1676,7 @@
    <slot access="protected">slotChangeNewAnim()</slot>
    <slot access="protected">slotNormalAnimToggled( bool )</slot>
    <slot access="protected">slotNewAnimToggled( bool )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@ -163,7 +163,7 @@
        <slot>slotEditBox()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected">slotActivated( const TQString&amp; )</slot>
    <slot access="protected">slotActivated( const int )</slot>
    <slot>slotOK()</slot>
@ -171,6 +171,6 @@
    <slot>slotCancel()</slot>
    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, TDEConfig* )</slot>
    <slot access="protected">slotEditBox()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@ -105,16 +105,16 @@
 <includes>
    <include location="local" impldecl="in implementation">progress_dialog.ui.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
    <signal>cancelPressed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
    <slot>setText( const TQString &amp; str )</slot>
    <slot>setNumberOfBoxes( int number )</slot>
    <slot>setProgressOfBoxes( int number )</slot>
    <slot>setNumberOfSteps( int number )</slot>
    <slot>setProgress( int number )</slot>
    <slot access="private" specifier="non virtual">cancelbutton()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/ktnef/gui/attachpropertydialogbase.ui
+++ b/ktnef/gui/attachpropertydialogbase.ui
@ -271,9 +271,9 @@
        <slot>saveClicked()</slot>
    </connection>
 </connections>
-<Q_SLOTS>
+<slots>
    <slot access="protected">saveClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
    <include location="global" impldecl="in implementation">tdelistview.h</include>
--- a/tdeabc/frontend/mainWindow.ui
+++ b/tdeabc/frontend/mainWindow.ui
@ -1365,7 +1365,7 @@
    <variable>TQString mCurrentAddress</variable>
    <variable>TQString mCurrentPhone</variable>
 </variables>
-<Q_SLOTS>
+<slots>
    <slot>init()</slot>
    <slot>destroy()</slot>
    <slot>fileSave()</slot>
@ -1404,6 +1404,6 @@
    <slot>addressBookLocked()</slot>
    <slot>addressBookUnlocked()</slot>
    <slot>fileOpenStd()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>