From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 22 Jun 2011 00:30:31 +0000
Subject: 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
---
 krfb/kcm_krfb/configurationwidget.ui | 56 ++++++++++++++++++------------------
 krfb/kcm_krfb/kcm_krfb.cpp           |  2 +-
 krfb/kcm_krfb/kcm_krfb.h             |  1 +
 3 files changed, 30 insertions(+), 29 deletions(-)

(limited to 'krfb/kcm_krfb')

diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui
index 66198269..c49101fa 100644
--- a/krfb/kcm_krfb/configurationwidget.ui
+++ b/krfb/kcm_krfb/configurationwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ConfigurationWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigurationWidget</cstring>
     </property>
@@ -25,11 +25,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>TabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -46,14 +46,14 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
                         <property name="title">
                             <string>Invitations</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignAuto</set>
                         </property>
                         <vbox>
@@ -66,7 +66,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>invitationNumLabel</cstring>
                                 </property>
@@ -74,7 +74,7 @@
                                     <string>You have no open invitations.</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>manageInvitations</cstring>
                                 </property>
@@ -95,7 +95,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>ButtonGroup7</cstring>
                         </property>
@@ -120,7 +120,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>allowUninvitedCB</cstring>
                                 </property>
@@ -134,7 +134,7 @@
                                     <string>Select this option to allow connecting without inviting. This is useful if you want to access your desktop remotely.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>enableSLPCB</cstring>
                                 </property>
@@ -148,7 +148,7 @@
                                     <string>If you allow uninvited connections and enable this option, Desktop Sharing will announce the service and your identity on the local network, so people can find you and your computer.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>confirmConnectionsCB</cstring>
                                 </property>
@@ -159,7 +159,7 @@
                                     <string>If enabled, a dialog will appear when somebody attempts to connect, asking you whether you want to accept the connection.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>allowDesktopControlCB</cstring>
                                 </property>
@@ -170,7 +170,7 @@
                                     <string>Enable this option to allow uninvited user to control your desktop (using mouse and keyboard).</string>
                                 </property>
                             </widget>
-                            <widget class="QFrame">
+                            <widget class="TQFrame">
                                 <property name="name">
                                     <cstring>Frame4</cstring>
                                 </property>
@@ -188,7 +188,7 @@
                                 <property name="frameShadow">
                                     <enum>Plain</enum>
                                 </property>
-                                <property name="layoutMargin" stdset="0">
+                                <property name="tqlayoutMargin" stdset="0">
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -200,7 +200,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>TextLabel1</cstring>
                                         </property>
@@ -219,7 +219,7 @@
                                             <cstring>passwordInput</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>passwordInput</cstring>
                                         </property>
@@ -247,7 +247,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>50</height>
@@ -256,7 +256,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -273,7 +273,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox4</cstring>
                         </property>
@@ -290,7 +290,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>disableBackgroundCB</cstring>
                                 </property>
@@ -316,7 +316,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -325,7 +325,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -342,7 +342,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox3</cstring>
                         </property>
@@ -359,7 +359,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>autoPortCB</cstring>
                                 </property>
@@ -373,7 +373,7 @@
                                     <string>Check this option to assign the network port automatically. This is recommended unless your network setup requires you to use a fixed port, for example because of a firewall.</string>
                                 </property>
                             </widget>
-                            <widget class="QFrame">
+                            <widget class="TQFrame">
                                 <property name="name">
                                     <cstring>portInputFrame</cstring>
                                 </property>
@@ -396,7 +396,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>TextLabel1_2</cstring>
                                         </property>
@@ -442,7 +442,7 @@ Most VNC clients use a display number instead of the actual port. This display n
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -495,7 +495,7 @@ Most VNC clients use a display number instead of the actual port. This display n
     <tabstop>passwordInput</tabstop>
     <tabstop>portInput</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 50595505..688b674b 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -97,7 +97,7 @@ void KcmKRfb::setInvitationNum(int num) {
 	if (num == 0)
 		m_confWidget->invitationNumLabel->setText(i18n("You have no open invitation."));
 	else
-		m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").arg(num));
+		m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").tqarg(num));
 }
 
 void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
diff --git a/krfb/kcm_krfb/kcm_krfb.h b/krfb/kcm_krfb/kcm_krfb.h
index 9fa81fc9..81be997f 100644
--- a/krfb/kcm_krfb/kcm_krfb.h
+++ b/krfb/kcm_krfb/kcm_krfb.h
@@ -27,6 +27,7 @@
 
 class KcmKRfb : public KCModule {
 	Q_OBJECT
+  TQ_OBJECT
 private:
 	Configuration m_configuration;
 	ConfigurationWidget *m_confWidget;
-- 
cgit v1.2.1