TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 154 insertions, 147 deletions

diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 9bdbee27..497429f9 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -88,7 +88,7 @@ bool WinPopupLib::checkHost(const TQString &Name)
 
 	TQMap<TQString, WorkGroup>::Iterator end = theGroups.end();
 	for(TQMap<TQString, WorkGroup>::Iterator i = theGroups.begin(); i != end && !ret; i++) {
-		if ((*i).Hosts().contains(Name.upper())) {
+		if ((*i).Hosts().tqcontains(Name.upper())) {
 			ret = true;
 			break;
 		}
@@ -107,8 +107,8 @@ bool WinPopupLib::checkMessageDir()
 													   "If you have not configured anything yet (samba) please see\n"
 													   "Install Into Samba (Configure... -> Account -> Edit) information\n"
 													   "on how to do this.\n"
-													   "Should the directory be created? (May need root password)").arg(WP_POPUP_DIR),
-												  TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
+													   "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR),
+												  TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
 		if (tmpYesNo == KMessageBox::Yes) {
 			TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
 			if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
@@ -126,8 +126,8 @@ bool WinPopupLib::checkMessageDir()
 														   "%1 are wrong!\n"
 														   "You will not receive messages if you say no.\n"
 														   "You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
-														   "Fix? (May need root password)").arg(WP_POPUP_DIR),
-													  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+														   "Fix? (May need root password)").tqarg(WP_POPUP_DIR),
+													  TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 			if (tmpYesNo == KMessageBox::Yes) {
 				TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
 				if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true;
@@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData()
 	passedInitialHost = false;
 	todo.clear();
 	currentGroupsMap.clear();
-	currentHost = TQString::fromLatin1("LOCALHOST");
+	currentHost = TQString::tqfromLatin1("LOCALHOST");
 	startReadProcess(currentHost);
 }
 
@@ -173,7 +173,7 @@ void WinPopupLib::startReadProcess(const TQString &Host)
 
 void WinPopupLib::slotReadProcessReady(KProcIO *r)
 {
-	TQString tmpLine = TQString::null;
+	TQString tmpLine = TQString();
 	TQRegExp group("^Workgroup\\|(.*)\\|(.*)$"), host("^Server\\|(.*)\\|(.*)$"),
 			info("^Domain=\\[([^\\]]+)\\] OS=\\[([^\\]]+)\\] Server=\\[([^\\]]+)\\]"),
 			error("Connection.*failed");
@@ -184,7 +184,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r)
 		if (group.search(tmpLine) != -1) currentGroups[group.cap(1)] = group.cap(2);
 		if (error.search(tmpLine) != -1) {
 			kdDebug(14170) << "Connection to " << currentHost << " failed!" << endl;
-			if (currentHost == TQString::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure
+			if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure
 		}
 	}
 }
@@ -208,7 +208,7 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
 			TQMap<TQString, TQString>::ConstIterator end = currentGroups.end();
 			for (TQMap<TQString, TQString>::ConstIterator i = currentGroups.begin(); i != end; i++) {
 				TQString groupMaster = i.data();
-				if (!done.contains(groupMaster)) todo += groupMaster;
+				if (!done.tqcontains(groupMaster)) todo += groupMaster;
 			}
 		}
 
@@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
 				todo += groupMaster;
 			}
 		} else {
-			if (currentHost == TQString::fromLatin1("failed"))
+			if (currentHost == TQString::tqfromLatin1("failed"))
 				KMessageBox::error(Kopete::UI::Global::mainWidget(),
 								   i18n("Connection to localhost failed!\n"
 									    "Is your samba server running?"),
-								   TQString::fromLatin1("Winpopup"));
+								   TQString::tqfromLatin1("Winpopup"));
 		}
 	}
 
@@ -303,7 +303,7 @@ void WinPopupLib::readMessages(const KFileItemList &items)
 															  i18n("A message file could not be removed; "
 																   "maybe the permissions are wrong.\n"
 																   "Fix? (May need root password)"),
-															  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+															  TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 					if (tmpYesNo == KMessageBox::Yes) {
 						TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
 						if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) {
@@ -360,4 +360,4 @@ void WinPopupLib::settingsChanged(const TQString &smbClient, int groupFreq)
 #include "libwinpopup.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index 0e594932..1392dd46 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -29,7 +29,7 @@
 #include <kprocio.h>
 #include <kfileitem.h>
 
-const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
+const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup");
 
 class KDirLister;
 
@@ -44,9 +44,10 @@ public:
 	void addHosts(const TQStringList &newHosts) { groupHosts = newHosts; }
 };
 
-class WinPopupLib : public QObject
+class WinPopupLib : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	WinPopupLib(const TQString &smbClient,int groupFreq);
@@ -89,4 +90,4 @@ signals:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index 21286d54..c9f63825 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>WPAddContactBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WPAddContactBase</cstring>
     </property>
@@ -26,23 +26,23 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout59</cstring>
+                <cstring>tqlayout59</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout57</cstring>
+                        <cstring>tqlayout57</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel2_2</cstring>
                             </property>
@@ -59,7 +59,7 @@
                                 <string>The hostname you would like to use to send WinPopup messages to.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1_2</cstring>
                             </property>
@@ -78,9 +78,9 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout58</cstring>
+                        <cstring>tqlayout58</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -115,9 +115,9 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -133,7 +133,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -180,7 +180,7 @@
     <tabstop>mHostGroup</tabstop>
     <tabstop>mRefresh</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index 464c426d..b12e9c2c 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>WPEditAccountBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WPEditAccountBase</cstring>
     </property>
@@ -25,22 +25,22 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="TQLabel" row="0" column="1">
             <property name="name">
                 <cstring>labelStatusMessage</cstring>
             </property>
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tabWidget10</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -51,7 +51,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox51</cstring>
                         </property>
@@ -62,15 +62,15 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout40</cstring>
+                                    <cstring>tqlayout40</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>label1</cstring>
                                         </property>
@@ -87,7 +87,7 @@
                                             <string>The hostname you would like to use to send WinPopup messages as.  Note that this does not have to be the actual hostname of the machine to send messages, but it does to receive them.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>mHostName</cstring>
                                         </property>
@@ -116,7 +116,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox22</cstring>
                         </property>
@@ -127,7 +127,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel12</cstring>
                                 </property>
@@ -142,11 +142,11 @@
                                 <property name="text">
                                     <string>To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignTop</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_3</cstring>
                                 </property>
@@ -154,7 +154,7 @@
                                     <string>The samba server must be configured and running.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
@@ -163,7 +163,7 @@
 However, the recommended way is to ask your administrator to create this directory ('mkdir -p -m 0777 /var/lib/winpopup') and add
 'message command = _PATH_TO_/winpopup-send.sh %s %m %t &amp;' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignTop</set>
                                 </property>
                             </widget>
@@ -179,7 +179,7 @@ However, the recommended way is to ask your administrator to create this directo
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>16</height>
@@ -188,7 +188,7 @@ However, the recommended way is to ask your administrator to create this directo
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -209,14 +209,14 @@ However, the recommended way is to ask your administrator to create this directo
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>135</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox5</cstring>
                         </property>
@@ -227,7 +227,7 @@ However, the recommended way is to ask your administrator to create this directo
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>textLabel2_2</cstring>
                                 </property>
@@ -237,7 +237,7 @@ However, the recommended way is to ask your administrator to create this directo
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -248,7 +248,7 @@ However, the recommended way is to ask your administrator to create this directo
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel4</cstring>
                                 </property>
@@ -256,7 +256,7 @@ However, the recommended way is to ask your administrator to create this directo
                                     <string>Host check frequency:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -264,17 +264,17 @@ However, the recommended way is to ask your administrator to create this directo
                                     <string>Path to 'smbclient' executable:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
+                            <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                                 <property name="name">
-                                    <cstring>layout6</cstring>
+                                    <cstring>tqlayout6</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout5</cstring>
+                                            <cstring>tqlayout5</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -299,7 +299,7 @@ However, the recommended way is to ask your administrator to create this directo
                                                     <number>1</number>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>textLabel6</cstring>
                                                 </property>
@@ -344,10 +344,10 @@ However, the recommended way is to ask your administrator to create this directo
     <tabstop>mHostName</tabstop>
     <tabstop>doInstallSamba</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>installSamba()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index a899e3ca..d717c9c4 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>WPUserInfoWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WPUserInfoWidget</cstring>
     </property>
@@ -24,23 +24,23 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>lblComputerName</cstring>
                             </property>
@@ -57,7 +57,7 @@
                                 <string>The hostname of the computer for this contact.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2_2</cstring>
                             </property>
@@ -65,7 +65,7 @@
                                 <string>Comment:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -82,7 +82,7 @@
                                 <string>The workgroup or domain the contact's computer is on.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -99,7 +99,7 @@
                                 <string>The operating system the contact's computer is running.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -118,9 +118,9 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -208,7 +208,7 @@
     <tabstop>sOS</tabstop>
     <tabstop>sServer</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="0"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index d7439628..addb88bb 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -34,8 +34,8 @@
 
 class KPopupMenu;
 
-WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name)
-	: Kopete::Account(parent, accountID, name)
+WPAccount::WPAccount(WPProtocol *tqparent, const TQString &accountID, const char *name)
+	: Kopete::Account(tqparent, accountID, name)
 {
 //	kdDebug(14170) <<  "WPAccount::WPAccount()" << endl;
 
@@ -66,7 +66,7 @@ const TQStringList WPAccount::getHosts(const TQString &Group)
 bool WPAccount::checkHost(const TQString &Name)
 {
 //	kdDebug() << "WPAccount::checkHost: " << Name << endl;
-	if (Name.upper() == TQString::fromLatin1("LOCALHOST")) {
+	if (Name.upper() == TQString::tqfromLatin1("LOCALHOST")) {
 		// Assume localhost is always there, but it will not appear in the samba output.
 		// Should never happen as localhost is now forbidden as contact, just for safety. GF
 		return true;
@@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name)
 	}
 }
 
-bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact )
+bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact )
 {
 //	kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl;
 
 	if (!contacts()[contactId]) {
-		WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact);
+		WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact);
 		return newContact != 0;
 	} else {
 		kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl;
@@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu()
 
 	/// How to remove an action from Kopete::Account::actionMenu()? GF
 
-	KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
-	theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId()));
+	KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this);
+	theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId()));
 
 	if (mProtocol)
 	{
@@ -189,21 +189,21 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio
 {
 	kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl;
 
-	if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
+	if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
 	mProtocol->sendMessage(Body, Destination);
 }
 
 void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason)
 {
-	if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
+	if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
 		connect( status );
-	else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
+	else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
 		disconnect();
-	else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
+	else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
 		setAway( true, reason );
 }
 
 #include "wpaccount.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index ae3744de..eb343541 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -48,10 +48,11 @@ class KopeteWinPopup;
 class WPAccount : public Kopete::Account
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 // Kopete::Account overloading
 public:
-	WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0);
+	WPAccount(WPProtocol *tqparent, const TQString& accountID, const char *name = 0);
 	~WPAccount();
 
 	virtual KActionMenu* actionMenu();			// Per-protocol actions for the systray and the status bar
@@ -61,8 +62,8 @@ public slots:
 	virtual void connect(const Kopete::OnlineStatus &);						// Connect to server
 	virtual void disconnect();					// Disconnect from server
 
-	void goAvailable() { setAway(false, TQString::null); }		// Two convenience slots
-	void goAway() { setAway(true, TQString::null); }			// for available and away
+	void goAvailable() { setAway(false, TQString()); }		// Two convenience slots
+	void goAway() { setAway(true, TQString()); }			// for available and away
 
 // Stuff used internally & by colleague classes
 public:
@@ -88,10 +89,10 @@ public slots:
 	void slotGotNewMessage(const TQString &Body, const TQDateTime &Arrival, const TQString &From);
 
 	/* Reimplemented from Kopete::Account */
-	void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString::null);
+	void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString());
 
 protected:
-	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
+	virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact);
 
 private slots:
 //	void updateAccountId();
@@ -104,4 +105,4 @@ private:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index e5912c14..c463cc02 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -36,9 +36,9 @@
 #include "wpaccount.h"
 #include "wpaddcontact.h"
 
-WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name) : AddContactPage(parent, name)
+WPAddContact::WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name) : AddContactPage(tqparent, name)
 {
-//	kdDebug(14170) << "WPAddContact::WPAddContact(<owner>, " << newAccount << ", <parent>, " << name << ")" << endl;
+//	kdDebug(14170) << "WPAddContact::WPAddContact(<owner>, " << newAccount << ", <tqparent>, " << name << ")" << endl;
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	theDialog = new WPAddContactBase(this);
@@ -93,7 +93,7 @@ bool WPAddContact::validateData()
 
 	// If our own host is not allowed as contact localhost should be forbidden as well,
 	// additionally somehow localhost as contact crashes when receiving a message from it?? GF
-	if (tmpHostName.upper() == TQString::fromLatin1("LOCALHOST")) {
+	if (tmpHostName.upper() == TQString::tqfromLatin1("LOCALHOST")) {
 		KMessageBox::sorry(this, i18n("<qt>LOCALHOST is not allowed as contact.</qt>"), i18n("WinPopup"));
 		return false;
 	}
@@ -112,4 +112,4 @@ bool WPAddContact::apply(Kopete::Account *theAccount, Kopete::MetaContact *theMe
 #include "wpaddcontact.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h
index 156e7db9..1828bcf9 100644
--- a/kopete/protocols/winpopup/wpaddcontact.h
+++ b/kopete/protocols/winpopup/wpaddcontact.h
@@ -34,13 +34,14 @@ namespace Kopete { class MetaContact; }
 class WPAddContact: public AddContactPage
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 private:
 	WPAccount *theAccount;
 	WPAddContactBase *theDialog;
 
 public:
-	WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name = 0);
+	WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name = 0);
 	~WPAddContact();
 
 	virtual bool validateData();
@@ -55,4 +56,4 @@ public slots:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index 801b9865..3e70b349 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// Qt Includes
+// TQt Includes
 #include <tqregexp.h>
 
 // KDE Includes
@@ -30,7 +30,7 @@
 WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, const TQString &nickName, Kopete::MetaContact *metaContact)
 	: Kopete::Contact(account, newHostName, metaContact)
 {
-//	kdDebug(14170) << "WPContact::WPContact(<account>, " << newHostName << ", " << nickName << ", <parent>)" << endl;
+//	kdDebug(14170) << "WPContact::WPContact(<account>, " << newHostName << ", " << nickName << ", <tqparent>)" << endl;
 	kdDebug(14170) << "WPContact::WPContact: " << this << endl;
 
 	TQString theNickName = nickName;
@@ -38,7 +38,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
 	if (theNickName.isEmpty()) {
 		// Construct nickname from hostname with first letter to upper. GF
 		theNickName = newHostName.lower();
-		theNickName = theNickName.replace(0, 1, theNickName[0].upper());
+		theNickName = theNickName.tqreplace(0, 1, theNickName[0].upper());
 	}
 
 	setNickName(theNickName);
@@ -51,13 +51,13 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
 	// Initialise and start the periodical checking for contact's status
 	setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline);
 
-	connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
-	checkStatus.start(1000, false);
+	connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus()));
+	checktqStatus.start(1000, false);
 }
 
 TQPtrList<KAction> * WPContact::customContextMenuActions()
 {
-	//myActionCollection = new KActionCollection(parent);
+	//myActionCollection = new KActionCollection(tqparent);
 	return 0;
 }
 
@@ -89,14 +89,14 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr
 bool WPContact::isOnline() const
 {
 	kdDebug(14170) << "[WPContact::isOnline()]" << endl;
-	return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 */
 
 bool WPContact::isReachable()
 {
 //	kdDebug(14170) << "[WPContact::isReachable()]" << endl;
-	return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 
 void WPContact::slotChatSessionDestroyed()
@@ -131,7 +131,7 @@ void deleteContact()
 }
 */
 
-void WPContact::slotCheckStatus()
+void WPContact::slotChecktqStatus()
 {
 	bool oldWasConnected = myWasConnected;
 	bool newIsOnline = false;
@@ -141,11 +141,11 @@ void WPContact::slotCheckStatus()
 	if (acct) newIsOnline = acct->checkHost(contactId());
 
 	if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) {
-		Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline;
+		Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline;
 		if (myWasConnected && newIsOnline) {
-				tmpStatus = WPProtocol::protocol()->WPOnline;
+				tmptqStatus = WPProtocol::protocol()->WPOnline;
 		}
-		setOnlineStatus(tmpStatus);
+		setOnlineStatus(tmptqStatus);
 	}
 }
 
@@ -186,4 +186,4 @@ void WPContact::slotSendMessage( Kopete::Message& message )
 #include "wpcontact.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 93d18c53..c7bc336f 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -21,7 +21,7 @@
 // KDE Includes
 #include <kaction.h>
 
-// Qt Includes
+// TQt Includes
 //#include <tqvaluestack.h>
 #include <tqdatetime.h>
 #include <tqptrlist.h>
@@ -49,6 +49,7 @@ namespace Kopete { class MetaContact; }
 class WPContact: public Kopete::Contact
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	WPContact(Kopete::Account *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact);
@@ -61,7 +62,7 @@ public:
 
 public slots:
 	virtual void slotUserInfo();
-	void slotCheckStatus();	// the call back for the checkStatus timer
+	void slotChecktqStatus();	// the call back for the checktqStatus timer
 	void slotNewMessage(const TQString &Body, const TQDateTime &Arrival);
 
 private slots:
@@ -72,7 +73,7 @@ private slots:
 private:
 	bool myWasConnected;	// true if protocol connected at last check
 
-	TQTimer checkStatus;		// checks the status of this contact every second or so
+	TQTimer checktqStatus;		// checks the status of this contact every second or so
 //	KActionCollection *myActionCollection;
 							// holds all the protocol specific actions (not many!)
 	Kopete::ChatSession *m_manager;
@@ -83,4 +84,4 @@ private:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 6e1d1aba..2fa5775c 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -45,10 +45,10 @@
 #include "wpeditaccount.h"
 #include "wpprotocol.h"
 
-WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount)
-	: WPEditAccountBase(parent), KopeteEditAccountWidget(theAccount)
+WPEditAccount::WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount)
+	: WPEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount)
 {
-	kdDebug(14170) << "WPEditAccount::WPEditAccount(<parent>, <theAccount>)";
+	kdDebug(14170) << "WPEditAccount::WPEditAccount(<tqparent>, <theAccount>)";
 
 	mProtocol = WPProtocol::protocol();
 
@@ -65,13 +65,13 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount)
 	}
 	else {
 		// no QT/KDE function? GF
-		TQString theHostName = TQString::null;
+		TQString theHostName = TQString();
 		char *tmp = new char[255];
 
 		if (tmp != 0) {
 			gethostname(tmp, 255);
 			theHostName = tmp;
-			if (theHostName.contains('.') != 0) theHostName.remove(theHostName.find('.'), theHostName.length());
+			if (theHostName.tqcontains('.') != 0) theHostName.remove(theHostName.tqfind('.'), theHostName.length());
 			theHostName = theHostName.upper();
 		}
 
@@ -135,4 +135,4 @@ Kopete::Account *WPEditAccount::apply()
 #include "wpeditaccount.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h
index 4714e197..5817709a 100644
--- a/kopete/protocols/winpopup/wpeditaccount.h
+++ b/kopete/protocols/winpopup/wpeditaccount.h
@@ -35,13 +35,14 @@ namespace Kopete { class Account; }
 class WPEditAccount: public WPEditAccountBase, public KopeteEditAccountWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 private:
 	WPProtocol *mProtocol;
 	WPAccount *mAccount;
 
 public:
-	WPEditAccount(TQWidget *parent, Kopete::Account *theAccount);
+	WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount);
 
 	virtual bool validateData();
 	void writeConfig();
@@ -54,4 +55,4 @@ public slots:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 71d4a76a..66ef7fac 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -48,17 +48,17 @@ typedef KGenericFactory<WPProtocol> WPProtocolFactory;
 K_EXPORT_COMPONENT_FACTORY( kopete_wp, WPProtocolFactory( "kopete_wp" )  )
 
 // WP Protocol
-WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ )
-: Kopete::Protocol( WPProtocolFactory::instance(), parent, name ),
-	WPOnline(  Kopete::OnlineStatus::Online,  25, this, 0,  TQString::null, i18n("Online"),  i18n("Online")),
+WPProtocol::WPProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ )
+: Kopete::Protocol( WPProtocolFactory::instance(), tqparent, name ),
+	WPOnline(  Kopete::OnlineStatus::Online,  25, this, 0,  TQString(), i18n("Online"),  i18n("Online")),
 	WPAway(    Kopete::OnlineStatus::Away,    20, this, 1,  "wp_away",     i18n("Away"),    i18n("Away")),
-	WPOffline( Kopete::OnlineStatus::Offline, 0,  this, 2,  TQString::null, i18n("Offline"), i18n("Offline"))
+	WPOffline( Kopete::OnlineStatus::Offline, 0,  this, 2,  TQString(), i18n("Offline"), i18n("Offline"))
 {
 //	kdDebug(14170) << "WPProtocol::WPProtocol()" << endl;
 
 	sProtocol = this;
 
-	// Load Status Actions
+	// Load tqStatus Actions
 //	initActions();
 	// TODO: Maybe use this in the future?
 
@@ -79,11 +79,11 @@ WPProtocol::~WPProtocol()
 	sProtocol = 0;
 }
 
-AddContactPage *WPProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount)
+AddContactPage *WPProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount)
 {
-//	kdDebug(14170) << "WPProtocol::createAddContactWidget(<parent>, " << theAccount << ")" << endl;
+//	kdDebug(14170) << "WPProtocol::createAddContactWidget(<tqparent>, " << theAccount << ")" << endl;
 
-	return new WPAddContact(parent, dynamic_cast<WPAccount *>(theAccount));
+	return new WPAddContact(tqparent, dynamic_cast<WPAccount *>(theAccount));
 }
 
 Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContact,
@@ -108,9 +108,9 @@ Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContac
 	return theAccount->contacts()[contactId];
 }
 
-KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
+KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
 {
-	return new WPEditAccount(parent, account);
+	return new WPEditAccount(tqparent, account);
 }
 
 Kopete::Account *WPProtocol::createNewAccount(const TQString &accountId)
@@ -152,7 +152,7 @@ void WPProtocol::installSamba()
 void WPProtocol::slotReceivedMessage(const TQString &Body, const TQDateTime &Time, const TQString &From)
 {
 	bool foundContact = false;
-	TQString accountKey = TQString::null;
+	TQString accountKey = TQString();
 	TQDict<Kopete::Account> Accounts = Kopete::AccountManager::self()->accounts(protocol());
 	for (TQDictIterator<Kopete::Account> it(Accounts); it.current(); ++it) {
 		TQDict<Kopete::Contact> Contacts = it.current()->contacts();
@@ -184,4 +184,4 @@ void WPProtocol::sendMessage(const TQString &Body, const TQString &Destination)
 #include "wpprotocol.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h
index b54f4972..aa7f6955 100644
--- a/kopete/protocols/winpopup/wpprotocol.h
+++ b/kopete/protocols/winpopup/wpprotocol.h
@@ -48,14 +48,15 @@ class WPAccount;
 class WPProtocol : public Kopete::Protocol
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 // Kopete::Protocol overloading
 public:
-	WPProtocol( TQObject *parent, const char *name, const TQStringList &args );
+	WPProtocol( TQObject *tqparent, const char *name, const TQStringList &args );
 	~WPProtocol();
 
-	virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount);
-	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
+	virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount);
+	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
 	virtual Kopete::Account *createNewAccount(const TQString &accountId);
 
 	const TQStringList getGroups() {return popupClient->getGroups(); }
@@ -91,4 +92,4 @@ private:
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index e50805f5..5090836d 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -32,13 +32,13 @@
 #include "wpaccount.h"
 #include "wpcontact.h"
 
-WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *parent, const char* name )
-	: KDialogBase( parent, name, false, TQString::null, Close, Close, false ), m_contact(contact),
+WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *tqparent, const char* name )
+	: KDialogBase( tqparent, name, false, TQString(), Close, Close, false ), m_contact(contact),
 	  Comment(i18n("N/A")), Workgroup(i18n("N/A")), OS(i18n("N/A")), Software(i18n("N/A"))
 {
 //	kdDebug( 14170 ) << k_funcinfo << endl;
 
-	setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) );
+	setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) );
 
 	m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" );
 	setMainWidget( m_mainWidget );
@@ -76,7 +76,7 @@ void WPUserInfo::startDetailsProcess(const TQString &host)
 
 void WPUserInfo::slotDetailsProcessReady(KProcIO *d)
 {
-	TQString tmpLine = TQString::null;
+	TQString tmpLine = TQString();
 	TQRegExp info("^Domain=\\[(.*)\\]\\sOS=\\[(.*)\\]\\sServer=\\[(.*)\\]$"), host("^Server\\|(.*)\\|(.*)$");
 
 	while (d->readln(tmpLine) > -1) {
@@ -111,4 +111,4 @@ void WPUserInfo::slotCloseClicked()
 #include "wpuserinfo.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;
diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h
index 2059ba2c..c0bd533c 100644
--- a/kopete/protocols/winpopup/wpuserinfo.h
+++ b/kopete/protocols/winpopup/wpuserinfo.h
@@ -34,9 +34,10 @@ class WPContact;
 class WPUserInfo : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		WPUserInfo( WPContact *, WPAccount *, TQWidget *parent = 0, const char* name = "WPUserInfo" );
+		WPUserInfo( WPContact *, WPAccount *, TQWidget *tqparent = 0, const char* name = "WPUserInfo" );
 
 		void startDetailsProcess(const TQString &host);
 
@@ -58,4 +59,4 @@ class WPUserInfo : public KDialogBase
 #endif
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; indent-width 4; replace-trailing-space-save on;
+// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on;