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

18 files changed, 135 insertions, 127 deletions

diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 03439b9d..1547141d 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -64,7 +64,7 @@ Configuration::Configuration(krfb_mode mode) :
 	connect(invMngDlg.deleteOneButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteOnePressed()));
 	connect(invMngDlg.deleteAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteAllPressed()));
 	invMngDlg.listView->setSelectionMode(TQListView::Extended);
-	invMngDlg.listView->setMinimumSize(TQSize(400, 100)); // QTs size is much to small
+	invMngDlg.listView->setMinimumSize(TQSize(400, 100)); // TQTs size is much to small
 
 	connect(&invDlg, TQT_SIGNAL(createInviteClicked()),
 		TQT_SLOT(showPersonalInvitationDialog()));
@@ -148,7 +148,7 @@ void Configuration::doKinetdConf() {
 			lastExpiration = t;
 		it++;
 	}
-	if (lastExpiration.isNull() || (lastExpiration < TQDateTime::currentDateTime())) {
+	if (lastExpiration.isNull() || (lastExpiration < TQDateTime::tqcurrentDateTime())) {
 		setKInetdEnabled(false);
 		portNum = -1;
 	}
@@ -181,7 +181,7 @@ void Configuration::loadFromKConfig() {
 	for (int i = 0; i < num; i++)
 		invitationList.push_back(Invitation(&c, i));
 
-	invalidateOldInvitations();
+	tqinvalidateOldInvitations();
 	if (invNum != invitationList.size())
 		emit invitationNumChanged(invitationList.size());
 
@@ -212,7 +212,7 @@ void Configuration::saveToKConfig() {
 }
 
 void Configuration::saveToDialogs() {
-	invalidateOldInvitations();
+	tqinvalidateOldInvitations();
 	TQValueList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		Invitation &inv = *(it++);
@@ -241,7 +241,7 @@ Invitation Configuration::createInvitation() {
 	return inv;
 }
 
-void Configuration::invalidateOldInvitations() {
+void Configuration::tqinvalidateOldInvitations() {
 	TQValueList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		if (!(*it).isValid())
@@ -439,7 +439,7 @@ void Configuration::inviteEmail() {
 	emit invitationNumChanged(invitationList.size());
 
 	KApplication *app = KApplication::kApplication();
-	app->invokeMailer(TQString::null, TQString::null, TQString::null,
+	app->invokeMailer(TQString(), TQString(), TQString(),
 		i18n("Desktop Sharing (VNC) invitation"),
 		i18n("You have been invited to a VNC session. If you have the KDE Remote "
                      "Desktop Connection installed, just click on the link below.\n\n"
@@ -453,15 +453,15 @@ void Configuration::inviteEmail() {
 		     "	http://%7:%8/\n"
 		     "\n"
 		     "For security reasons this invitation will expire at %9.")
-			.arg(inv.password())
-			.arg(hostname())
-			.arg(port())
-			.arg(hostname())
-			.arg(port())
-			.arg(inv.password())
-			.arg(hostname())
-			.arg(5800) // determine with dcop ... later ...
-			.arg(KGlobal::locale()->formatDateTime(inv.expirationTime())));
+			.tqarg(inv.password())
+			.tqarg(hostname())
+			.tqarg(port())
+			.tqarg(hostname())
+			.tqarg(port())
+			.tqarg(inv.password())
+			.tqarg(hostname())
+			.tqarg(5800) // determine with dcop ... later ...
+			.tqarg(KGlobal::locale()->formatDateTime(inv.expirationTime())));
 }
 
 ////////////// invoke kcontrol module //////////////////////////
diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h
index 57e03385..dd8f5fb7 100644
--- a/krfb/krfb/configuration.h
+++ b/krfb/krfb/configuration.h
@@ -49,6 +49,7 @@ enum krfb_mode {
 class Configuration : public TQObject, public DCOPObject {
 		K_DCOP
    	Q_OBJECT
+//	TQ_OBJECT
 public:
 	Configuration(krfb_mode mode);
 	virtual ~Configuration();
@@ -96,7 +97,7 @@ private:
         void saveToDialogs();
 	Invitation createInvitation();
 	void closeInvDlg();
-	void invalidateOldInvitations();
+	void tqinvalidateOldInvitations();
 	void setKInetdEnabled(const TQDateTime &date);
 	void setKInetdEnabled(bool enabled);
 	void setKInetdServiceRegistrationEnabled(bool enabled);
diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc
index d767b5a2..f881f28d 100644
--- a/krfb/krfb/connectiondialog.cc
+++ b/krfb/krfb/connectiondialog.cc
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true, i18n( "New Connection" ),
+ConnectionDialog::ConnectionDialog( TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true, i18n( "New Connection" ),
                    Ok|Cancel, Cancel, true )
 {
   m_connectWidget = new ConnectionWidget( this, "ConnectWidget" );
diff --git a/krfb/krfb/connectiondialog.h b/krfb/krfb/connectiondialog.h
index c5f7e589..967587a5 100644
--- a/krfb/krfb/connectiondialog.h
+++ b/krfb/krfb/connectiondialog.h
@@ -27,9 +27,10 @@ class ConnectionWidget;
 class ConnectionDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConnectionDialog( TQWidget *parent, const char *name );
+    ConnectionDialog( TQWidget *tqparent, const char *name );
     ~ConnectionDialog() {};
 
     void setRemoteHost( const TQString &host );
diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui
index e053adf9..93cb3a4e 100644
--- a/krfb/krfb/connectionwidget.ui
+++ b/krfb/krfb/connectionwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConnectionWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NewConnectWidget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <number>0</number>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>mainTextLabel</cstring>
             </property>
@@ -71,7 +71,7 @@
             <property name="textFormat">
                 <enum>AutoText</enum>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="indent">
@@ -80,7 +80,7 @@
             <property name="wordwrap" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="6" colspan="1">
             <property name="name">
                 <cstring>pixmapLabel</cstring>
             </property>
@@ -92,13 +92,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
@@ -123,7 +123,7 @@
                 <number>0</number>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="2">
+        <widget class="TQLabel" row="3" column="2">
             <property name="name">
                 <cstring>remoteHost</cstring>
             </property>
@@ -136,7 +136,7 @@
                 <string>123.234.123.234</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="5" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>cbAllowRemoteControl</cstring>
             </property>
@@ -155,7 +155,7 @@
                 <string>If you turn this option on, the remote user can enter keystrokes and use your mouse pointer. This gives them full control over your computer, so be careful. When the option is disabled the remote user can only watch your screen.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="1">
+        <widget class="TQLabel" row="3" column="1">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -178,7 +178,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>84</height>
@@ -195,7 +195,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
@@ -204,5 +204,5 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc
index e764036c..d06feefe 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cc
@@ -25,8 +25,8 @@
 TQString cryptStr(const TQString &aStr) {
         TQString result;
         for (unsigned int i = 0; i < aStr.length(); i++)
-                result += (aStr[i].unicode() < 0x20) ? aStr[i] :
-                                TQChar(0x1001F - aStr[i].unicode());
+                result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
+                                TQChar(0x1001F - aStr[i].tqunicode());
         return result;
 }
 
@@ -59,8 +59,8 @@ static TQString readableRandomString(int length) {
 Invitation::Invitation() :
 	m_viewItem(0) {
 	m_password = readableRandomString(4)+"-"+readableRandomString(3);
-	m_creationTime = TQDateTime::currentDateTime();
-	m_expirationTime = TQDateTime::currentDateTime().addSecs(INVITATION_DURATION);
+	m_creationTime = TQDateTime::tqcurrentDateTime();
+	m_expirationTime = TQDateTime::tqcurrentDateTime().addSecs(INVITATION_DURATION);
 }
 
 Invitation::Invitation(const Invitation &x) :
@@ -71,9 +71,9 @@ Invitation::Invitation(const Invitation &x) :
 }
 
 Invitation::Invitation(KConfig* config, int num) {
-	m_password = cryptStr(config->readEntry(TQString("password%1").arg(num), ""));
-	m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num));
-	m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(num));
+	m_password = cryptStr(config->readEntry(TQString("password%1").tqarg(num), ""));
+	m_creationTime = config->readDateTimeEntry(TQString("creation%1").tqarg(num));
+	m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").tqarg(num));
 	m_viewItem = 0;
 }
 
@@ -93,9 +93,9 @@ Invitation &Invitation::operator= (const Invitation&x) {
 }
 
 void Invitation::save(KConfig *config, int num) const {
-	config->writeEntry(TQString("password%1").arg(num), cryptStr(m_password));
-	config->writeEntry(TQString("creation%1").arg(num), m_creationTime);
-	config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime);
+	config->writeEntry(TQString("password%1").tqarg(num), cryptStr(m_password));
+	config->writeEntry(TQString("creation%1").tqarg(num), m_creationTime);
+	config->writeEntry(TQString("expiration%1").tqarg(num), m_expirationTime);
 }
 
 TQString Invitation::password() const {
@@ -111,7 +111,7 @@ TQDateTime Invitation::creationTime() const {
 }
 
 bool Invitation::isValid() const {
-	return m_expirationTime > TQDateTime::currentDateTime();
+	return m_expirationTime > TQDateTime::tqcurrentDateTime();
 }
 
 void Invitation::setViewItem(KListViewItem *i) {
diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc
index f3b202a9..046a7a92 100644
--- a/krfb/krfb/invitedialog.cc
+++ b/krfb/krfb/invitedialog.cc
@@ -27,8 +27,8 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-InviteDialog::InviteDialog( TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true, i18n( "Invitation" ),
+InviteDialog::InviteDialog( TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true, i18n( "Invitation" ),
       User1|Close|Help, NoDefault, true )
 {
   m_inviteWidget = new InviteWidget( this, "InviteWidget" );
@@ -59,7 +59,7 @@ void InviteDialog::enableInviteButton( bool enable )
 void InviteDialog::setInviteCount( int count )
 {
   m_inviteWidget->btnManageInvite->setText(
-      i18n( "&Manage Invitations (%1)..." ).arg( count ) );
+      i18n( "&Manage Invitations (%1)..." ).tqarg( count ) );
 }
 
 #include "invitedialog.moc"
diff --git a/krfb/krfb/invitedialog.h b/krfb/krfb/invitedialog.h
index a1de109b..6ce32097 100644
--- a/krfb/krfb/invitedialog.h
+++ b/krfb/krfb/invitedialog.h
@@ -27,9 +27,10 @@ class InviteWidget;
 class InviteDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    InviteDialog( TQWidget *parent, const char *name );
+    InviteDialog( TQWidget *tqparent, const char *name );
     ~InviteDialog() {}
 
     void enableInviteButton( bool enable );
diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui
index b0d80c36..9a137d31 100644
--- a/krfb/krfb/invitewidget.ui
+++ b/krfb/krfb/invitewidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>InviteWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>InviteWidget</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -47,7 +47,7 @@
 &lt;a href="whatsthis:&lt;p&gt;An invitation creates a one-time password that allows the receiver to connect to your desktop. It is valid for only one successful connection and will expire after an hour if it has not been used. When somebody connects to your computer a dialog will appear and ask you for permission. The connection will not be established before you accept it. In this dialog you can also restrict the other person to view your desktop only, without the ability to move your mouse pointer or press keys.&lt;/p&gt;&lt;p&gt;If you want to create a permanent password for Desktop Sharing, allow 'Uninvited Connections' in the configuration.&lt;/p&gt;"&gt;More about invitations...&lt;/a&gt;</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="7" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="7" colspan="1">
             <property name="name">
                 <cstring>pixmapLabel</cstring>
             </property>
@@ -59,13 +59,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
@@ -80,7 +80,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -94,14 +94,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="2">
+        <widget class="TQPushButton" row="3" column="2">
             <property name="name">
                 <cstring>btnCreateInvite</cstring>
             </property>
@@ -125,7 +125,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>24</height>
@@ -142,14 +142,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="5" column="2">
+        <widget class="TQPushButton" row="5" column="2">
             <property name="name">
                 <cstring>btnManageInvite</cstring>
             </property>
@@ -157,7 +157,7 @@
                 <string>&amp;Manage Invitations (%1)...</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="2">
+        <widget class="TQPushButton" row="4" column="2">
             <property name="name">
                 <cstring>btnEmailInvite</cstring>
             </property>
@@ -178,7 +178,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>89</height>
@@ -187,11 +187,11 @@
         </spacer>
     </grid>
 </widget>
-<signals>
+<Q_SIGNALS>
     <signal>createInviteClicked()</signal>
     <signal>emailInviteClicked()</signal>
     <signal>manageInviteClicked()</signal>
-</signals>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SIGNALS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/krfb/krfb/krfbifaceimpl.h b/krfb/krfb/krfbifaceimpl.h
index 21f3a022..3f498a38 100644
--- a/krfb/krfb/krfbifaceimpl.h
+++ b/krfb/krfb/krfbifaceimpl.h
@@ -8,6 +8,7 @@
 class KRfbIfaceImpl : public TQObject, public virtual krfbIface
 {
 	Q_OBJECT
+  TQ_OBJECT
 private:
 	RFBController *controller;
 public:
diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui
index eae26507..a9338792 100644
--- a/krfb/krfb/manageinvitations.ui
+++ b/krfb/krfb/manageinvitations.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ManageInvitationsDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ManageInvitationsDialog</cstring>
     </property>
@@ -38,7 +38,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -55,7 +55,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -104,7 +104,7 @@
                 <string>Displays the open invitations. Use the buttons on the right to delete them or create a new invitation.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>newPersonalInvitationButton</cstring>
             </property>
@@ -118,7 +118,7 @@
                 <string>Click this button to create a new personal invitation.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>newEmailInvitationButton</cstring>
             </property>
@@ -132,7 +132,7 @@
                 <string>Click this button to send a new invitation via email.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>deleteAllButton</cstring>
             </property>
@@ -149,7 +149,7 @@
                 <string>Deletes all open invitations.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>deleteOneButton</cstring>
             </property>
@@ -166,7 +166,7 @@
                 <string>Delete the selected invitation. The invited person will not be able to connect using this invitation anymore.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="6" column="1" rowspan="2" colspan="1">
+        <widget class="TQPushButton" row="6" column="1" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>closeButton</cstring>
             </property>
@@ -205,11 +205,11 @@
     <include location="global" impldecl="in declaration">klistview.h</include>
     <include location="local" impldecl="in implementation">manageinvitations.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>listSizeChanged( int i )</slot>
     <slot>listSelectionChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc
index a5664bcb..1f61e392 100644
--- a/krfb/krfb/personalinvitedialog.cc
+++ b/krfb/krfb/personalinvitedialog.cc
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true, i18n( "Personal Invitation" ),
+PersonalInviteDialog::PersonalInviteDialog( TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true, i18n( "Personal Invitation" ),
                    Close, Close, true )
 {
   m_inviteWidget = new PersonalInviteWidget( this, "PersonalInviteWidget" );
@@ -40,7 +40,7 @@ PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name )
 void PersonalInviteDialog::setHost( const TQString &host, uint port )
 {
   m_inviteWidget->hostLabel->setText( TQString( "%1:%2" )
-      .arg( host ).arg( port ) );
+      .tqarg( host ).tqarg( port ) );
 }
 
 void PersonalInviteDialog::setPassword( const TQString &passwd )
diff --git a/krfb/krfb/personalinvitedialog.h b/krfb/krfb/personalinvitedialog.h
index 6f28a33d..89be019c 100644
--- a/krfb/krfb/personalinvitedialog.h
+++ b/krfb/krfb/personalinvitedialog.h
@@ -29,7 +29,7 @@ class PersonalInviteWidget;
 class PersonalInviteDialog : public KDialogBase
 {
   public:
-    PersonalInviteDialog( TQWidget *parent, const char *name );
+    PersonalInviteDialog( TQWidget *tqparent, const char *name );
     virtual ~PersonalInviteDialog() {}
 
     void setHost( const TQString &host, uint port );
diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui
index 9ac68eb7..04e970b5 100644
--- a/krfb/krfb/personalinvitewidget.ui
+++ b/krfb/krfb/personalinvitewidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>PersonalInviteWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -55,14 +55,14 @@ Give the information below to the person that you want to invite (&lt;a href="wh
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>34</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="6" colspan="1">
             <property name="name">
                 <cstring>pixmapLabel</cstring>
             </property>
@@ -74,13 +74,13 @@ Give the information below to the person that you want to invite (&lt;a href="wh
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
@@ -106,7 +106,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -132,7 +132,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
                 <string>cookie.tjansen.de:0</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="1">
+        <widget class="TQLabel" row="3" column="1">
             <property name="name">
                 <cstring>kActiveLabel6</cstring>
             </property>
@@ -148,7 +148,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
                 <string>&lt;b&gt;Password:&lt;/b&gt;</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="1">
+        <widget class="TQLabel" row="4" column="1">
             <property name="name">
                 <cstring>kActiveLabel7</cstring>
             </property>
@@ -202,7 +202,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
                 <string>17:12</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="1">
+        <widget class="TQLabel" row="2" column="1">
             <property name="name">
                 <cstring>kActiveLabel5</cstring>
             </property>
@@ -236,6 +236,6 @@ Give the information below to the person that you want to invite (&lt;a href="wh
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 51516683..82ad4ad9 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -88,7 +88,7 @@ static const char* cur=
 "      xxx          "
 "                   ";
 
-static const char* mask=
+static const char* tqmask=
 "xx                 "
 "xxx                "
 "xxxx               "
@@ -279,7 +279,7 @@ Display *PointerEvent::dpy;
 int PointerEvent::buttonMask = 0;
 
 PointerEvent::PointerEvent(int b, int _x, int _y) :
-	button_mask(b),
+	button_tqmask(b),
 	x(_x),
 	y(_y) {
 	if (!initialized) {
@@ -297,13 +297,13 @@ void PointerEvent::exec() {
 		screen = 0;
 	XTestFakeMotionEvent(dpy, screen, x, y, CurrentTime);
 	for(int i = 0; i < 5; i++)
-		if ((buttonMask&(1<<i))!=(button_mask&(1<<i)))
+		if ((buttonMask&(1<<i))!=(button_tqmask&(1<<i)))
 			XTestFakeButtonEvent(dpy,
 					     i+1,
-					     (button_mask&(1<<i))?True:False,
+					     (button_tqmask&(1<<i))?True:False,
 					     CurrentTime);
 
-	buttonMask = button_mask;
+	buttonMask = button_tqmask;
 }
 
 
@@ -320,8 +320,8 @@ void ClipboardEvent::exec() {
 	controller->lastClipboardDirection = RFBController::LAST_SYNC_TO_SERVER;
 	controller->lastClipboardText = text;
 
-	controller->clipboard->setText(text, QClipboard::Clipboard);
-	controller->clipboard->setText(text, QClipboard::Selection);
+	controller->clipboard->setText(text, TQClipboard::Clipboard);
+	controller->clipboard->setText(text, TQClipboard::Selection);
 }
 
 
@@ -361,7 +361,7 @@ RFBController::RFBController(Configuration *c) :
 	connect(&initIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAsyncEvents()));
 	connect(&idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleSlot()));
 
-	clipboard = TQApplication::clipboard();
+	clipboard = TQApplication::tqclipboard();
 	connect(clipboard, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
 	connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
 
@@ -373,7 +373,7 @@ RFBController::RFBController(Configuration *c) :
 	if (gethostname(hostname, 255))
 		hostname[0] = 0;
 	hostname[255] = 0;
-	desktopName = i18n("%1@%2 (shared desktop)").arg(KUser().loginName()).arg(hostname);
+	desktopName = i18n("%1@%2 (shared desktop)").tqarg(KUser().loginName()).tqarg(hostname);
 }
 
 RFBController::~RFBController()
@@ -450,7 +450,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 	server->desktopName = desktopName.latin1();
 
 	if (!myCursor)
-		myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) mask);
+		myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) tqmask);
 	server->cursor = myCursor;
 
 	passwordChanged();
@@ -508,7 +508,7 @@ void RFBController::acceptConnection(bool aRemoteControl)
 {
 	KNotifyClient::event("UserAcceptsConnection",
 			     i18n("User accepts connection from %1")
-			     .arg(remoteIp));
+			     .tqarg(remoteIp));
 
 	if (state != RFB_CONNECTING)
 		return;
@@ -521,7 +521,7 @@ void RFBController::refuseConnection()
 {
 	KNotifyClient::event("UserRefusesConnection",
 			     i18n("User refuses connection from %1")
-			     .arg(remoteIp));
+			     .tqarg(remoteIp));
 
 	if (state != RFB_CONNECTING)
 		return;
@@ -569,7 +569,7 @@ void RFBController::connectionClosed()
 {
 	KNotifyClient::event("ConnectionClosed",
 			     i18n("Closed connection: %1.")
-			     .arg(remoteIp));
+			     .tqarg(remoteIp));
 
 	idleTimer.stop();
 	initIdleTimer.stop();
@@ -698,12 +698,12 @@ bool RFBController::handleCheckPassword(rfbClientPtr cl,
 		if (configuration->invitations().size() > 0) {
 			sendKNotifyEvent("InvalidPasswordInvitations",
 					i18n("Failed login attempt from %1: wrong password")
-					.arg(remoteIp));
+					.tqarg(remoteIp));
 }
 		else
 			sendKNotifyEvent("InvalidPassword",
 					i18n("Failed login attempt from %1: wrong password")
-					.arg(remoteIp));
+					.tqarg(remoteIp));
 		return FALSE;
 	}
 
@@ -739,7 +739,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 	if (state != RFB_WAITING) {
 		sendKNotifyEvent("TooManyConnections",
 					i18n("Connection refused from %1, already connected.")
-					.arg(host));
+					.tqarg(host));
 		return RFB_CLIENT_REFUSE;
 	}
 	remoteIp = host;
@@ -749,7 +749,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 	    (configuration->invitations().size() == 0)) {
 		sendKNotifyEvent("NewConnectionAutoAccepted",
 					i18n("Accepted uninvited connection from %1")
-					.arg(remoteIp));
+					.tqarg(remoteIp));
 
 		connectionAccepted(configuration->allowDesktopControl());
 		return RFB_CLIENT_ACCEPT;
@@ -757,11 +757,11 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 
 	sendKNotifyEvent("NewConnectionOnHold",
 				i18n("Received connection from %1, on hold (waiting for confirmation)")
-				.arg(remoteIp));
+				.tqarg(remoteIp));
 
 	dialog.setRemoteHost(remoteIp);
 	dialog.setAllowRemoteControl( true );
-	dialog.setFixedSize(dialog.sizeHint());
+	dialog.setFixedSize(dialog.tqsizeHint());
 	dialog.show();
 	return RFB_CLIENT_ON_HOLD;
 }
@@ -814,7 +814,7 @@ void RFBController::clipboardChanged() {
 	if (clipboard->ownsClipboard())
 		return;
 
-	TQString text = clipboard->text(QClipboard::Clipboard);
+	TQString text = clipboard->text(TQClipboard::Clipboard);
 
 	// avoid ping-pong between client&server
 	if ((lastClipboardDirection == LAST_SYNC_TO_SERVER) &&
@@ -835,7 +835,7 @@ void RFBController::selectionChanged() {
 	if (clipboard->ownsSelection())
 		return;
 
-	TQString text = clipboard->text(QClipboard::Selection);
+	TQString text = clipboard->text(TQClipboard::Selection);
 	// avoid ping-pong between client&server
 	if ((lastClipboardDirection == LAST_SYNC_TO_SERVER) &&
 	    (lastClipboardText == text))
diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index 6ef49a6d..d0d8af36 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -39,7 +39,7 @@
 
 
 class TQCloseEvent;
-class QClipboard;
+class TQClipboard;
 class RFBController;
 
 typedef enum {
@@ -77,7 +77,7 @@ public:
 };
 
 class PointerEvent : public VNCEvent {
-	int button_mask, x, y;
+	int button_tqmask, x, y;
 
 	static bool initialized;
 	static Display *dpy;
@@ -122,6 +122,7 @@ public:
  */
 class RFBController : public TQObject  {
 	Q_OBJECT
+	TQ_OBJECT
 
 	friend class SessionEstablishedEvent;
 	friend class ClipboardEvent;
@@ -137,7 +138,7 @@ public:
 	void connectionClosed();
 	bool handleCheckPassword(rfbClientPtr, const char *, int);
 	void handleKeyEvent(bool down, KeySym keySym);
-	void handlePointerEvent(int button_mask, int x, int y);
+	void handlePointerEvent(int button_tqmask, int x, int y);
 	enum rfbNewClientAction handleNewClient(rfbClientPtr cl);
 	void clipboardToServer(const TQString &text);
 	void handleClientGone();
@@ -176,7 +177,7 @@ private:
 		LAST_SYNC_TO_CLIENT
 	} lastClipboardDirection;
 	TQString lastClipboardText;
-	QClipboard *clipboard;
+	TQClipboard *clipboard;
 
 	Configuration *configuration;
 	XUpdateScanner *scanner;
@@ -210,6 +211,7 @@ private slots:
  */
 class XTestDisabler : public TQObject {
 	Q_OBJECT
+	TQ_OBJECT
 public:
 	XTestDisabler();
 	bool disable;
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index f7d2c64a..c9215d46 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -25,8 +25,8 @@
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 
-KPassivePopup2::KPassivePopup2(TQWidget *parent) :
-   KPassivePopup(parent){
+KPassivePopup2::KPassivePopup2(TQWidget *tqparent) :
+   KPassivePopup(tqparent){
 }
 
 void KPassivePopup2::hideEvent( TQHideEvent *e )
@@ -37,9 +37,9 @@ void KPassivePopup2::hideEvent( TQHideEvent *e )
 
 KPassivePopup2 *KPassivePopup2::message( const TQString &caption, const TQString &text,
 				         const TQPixmap &icon,
-				         TQWidget *parent)
+				         TQWidget *tqparent)
 {
-    KPassivePopup2 *pop = new KPassivePopup2( parent);
+    KPassivePopup2 *pop = new KPassivePopup2( tqparent);
     pop->setView( caption, text, icon );
     pop->show();
 
@@ -60,8 +60,8 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	setPixmap(trayIconClosed);
 	TQToolTip::add(this, i18n("Desktop Sharing - connecting"));
 
-	manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString::null,
-					      0, this, TQT_SIGNAL(showManageInvitations()),
+	manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString(),
+					      0, TQT_TQOBJECT(this), TQT_SIGNAL(showManageInvitations()),
 					      &actionCollection);
 	manageInvitationsAction->plug(contextMenu());
 
@@ -75,7 +75,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 
 	contextMenu()->insertSeparator();
 
-	aboutAction = KStdAction::aboutApp(this, TQT_SLOT(showAbout()), &actionCollection);
+	aboutAction = KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(showAbout()), &actionCollection);
 	aboutAction->plug(contextMenu());
 
 	show();
@@ -101,7 +101,7 @@ void TrayIcon::showConnectedMessage(TQString host) {
 				i18n("The remote user has been authenticated and is now connected."),
 				trayIconOpen,
 				this);
-	TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").arg(host));
+	TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").tqarg(host));
 }
 
 void TrayIcon::showDisconnectedMessage() {
@@ -124,10 +124,10 @@ void TrayIcon::setDesktopControlSetting(bool b) {
 
 void TrayIcon::mousePressEvent(TQMouseEvent *e)
 {
-        if (!rect().contains(e->pos()))
+        if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()))
                 return;
 
-	if (e->button() == LeftButton) {
+	if (e->button() == Qt::LeftButton) {
 	        contextMenuAboutToShow(contextMenu());
 		contextMenu()->popup(e->globalPos());
 	}
diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h
index ea4e7132..21e7aac2 100644
--- a/krfb/krfb/trayicon.h
+++ b/krfb/krfb/trayicon.h
@@ -30,11 +30,12 @@ class KDialog;
 
 class KPassivePopup2 : public KPassivePopup {
    	Q_OBJECT
+  TQ_OBJECT
 public: 
-        KPassivePopup2(TQWidget *parent);
+        KPassivePopup2(TQWidget *tqparent);
         static KPassivePopup2 *message( const TQString &caption, const TQString &text,
 					const TQPixmap &icon,
-					TQWidget *parent);
+					TQWidget *tqparent);
 
 signals:
 	void hidden();
@@ -53,6 +54,7 @@ protected:
 
 class TrayIcon : public KSystemTray {
    	Q_OBJECT
+  TQ_OBJECT
 public: 
 	TrayIcon(KDialog*, Configuration*);
 	~TrayIcon();