9 files changed, 25 insertions, 25 deletions
diff --git a/kopete/protocols/groupwise/DESIGN b/kopete/protocols/groupwise/DESIGN
index 86fb1dac..aa976191 100644
--- a/kopete/protocols/groupwise/DESIGN
+++ b/kopete/protocols/groupwise/DESIGN
@@ -19,7 +19,7 @@ Add new event tasks
 		ChatOwner changed	- vlarge Event proto update
 (large update -> requires new EventTransfer subclass)
 
-Update Client with event Q_SIGNALS
+Update Client with event signals
 	Broadcast DONE
 	Chatroom
 
diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui
index 09121e54..9660720c 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui
+++ b/kopete/protocols/irc/ui/networkconfig.ui
@@ -370,13 +370,13 @@
     <tabstop>saveButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<Q_SIGNALS>
+<signals>
     <signal>accepted()</signal>
     <signal>rejected()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN
index bfd1cd6c..628ecda4 100644
--- a/kopete/protocols/jabber/jingle/DESIGN
+++ b/kopete/protocols/jabber/jingle/DESIGN
@@ -60,11 +60,11 @@ JingleSessionManager manage the JingleSession pointers. Do not delete it in user
 
 * JingleSessionManager(JabberAccount *)
 
-* public Q_SLOTS:
+* public slots:
 * JingleSession *createSession(const TQString &sessionType, const JidList &peers);
 * void removeSession(JingleSession *);
 
-Q_SIGNALS:
+signals:
 * void incomingSession(const TQString &sessionType, JingleSession *session);
 
 JingleSession
@@ -89,10 +89,10 @@ Base class for Jingle session. A session is a
 // Return Session XML namespace
 * virtual TQString sessionType() = 0;
 
-protected Q_SLOTS:
+protected slots:
 	void sendStanza(const TQString &stanza) { account()->client->send(stanza);
 
-Q_SIGNALS:
+signals:
 	void accepted();
 	void declined();
 	void terminated();
@@ -105,7 +105,7 @@ Hold the PhoneSessionClient object.
 connect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&)));
 
 
-private Q_SLOTS:
+private slots:
 	void receiveStanza(const TQString &stanza);
 	
 VoiceConversationDialog
diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui
index f5f40392..28e4a610 100644
--- a/kopete/protocols/jabber/ui/dlgchatjoin.ui
+++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui
@@ -122,9 +122,9 @@
     <tabstop>leServer</tabstop>
     <tabstop>leNick</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>slotBowse()</slot>
     <slot>slotJoin()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
index ba344add..d542a942 100644
--- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui
+++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
@@ -172,12 +172,12 @@
         <slot>slotDoubleClick(int,int,int,const TQPoint&amp;)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotQuery()</slot>
     <slot>slotJoin()</slot>
     <slot>slotClick(int row, int col, int button, const TQPoint&amp; mousePos)</slot>
     <slot>slotDoubleClick(int row, int col, int button, const TQPoint&amp; mousePos)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in declaration">kdialog.h</include>
diff --git a/kopete/protocols/oscar/liboscar/HACKING b/kopete/protocols/oscar/liboscar/HACKING
index 38325050..1e1185d0 100644
--- a/kopete/protocols/oscar/liboscar/HACKING
+++ b/kopete/protocols/oscar/liboscar/HACKING
@@ -122,15 +122,15 @@ not be inline in the headers.  The organization of the members in a class should
 roughly as follows:
 
 public:
-public Q_SLOTS:
+public slots:
 protected:
-protected Q_SLOTS:
-Q_SIGNALS:
+protected slots:
+signals:
 private: // member funtions
-private Q_SLOTS:
+private slots:
 private: // member variables
 
-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
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index df48d194..0dcd2a47 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -344,9 +344,9 @@ However, the recommended way is to ask your administrator to create this directo
     <tabstop>mHostName</tabstop>
     <tabstop>doInstallSamba</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>installSamba()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
index 90bbffd8..2f30df79 100644
--- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
@@ -457,8 +457,8 @@
     <tabstop>mAutoConnect</tabstop>
     <tabstop>buttonRegister</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="private" specifier="nicht virtual">slotSelectPicture()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
index 63d7973e..571573f4 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
@@ -326,12 +326,12 @@
         <slot>btnRemove_clicked()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>btnAdd_clicked()</slot>
     <slot>btnRemove_clicked()</slot>
     <slot>btnAddCustom_clicked()</slot>
     <slot>btnCancel_clicked()</slot>
     <slot>btnInvite_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>