TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


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

8 files changed, 41 insertions, 38 deletions

diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am
index df5ed04..081d129 100644
--- a/conduits/malconduit/Makefile.am
+++ b/conduits/malconduit/Makefile.am
@@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg
 kde_module_LTLIBRARIES = conduit_mal.la
 
 conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc 
-conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui
 conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI)
 
diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc
index 2d3344f..10f1352 100644
--- a/conduits/malconduit/mal-conduit.cc
+++ b/conduits/malconduit/mal-conduit.cc
@@ -217,7 +217,7 @@ bool MALConduit::skip()
 				syncMessage = i18n("No proxy server is set.");
 				break;
 			}
-			syncMessage = i18n("Using proxy server: %1").arg(proxyServer);
+			syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer);
 
 #ifdef DEBUG
 			DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<<
@@ -259,7 +259,7 @@ bool MALConduit::skip()
 				syncMessage = i18n("No SOCKS proxy is set.");
 				break;
 			}
-			syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer);
+			syncMessage = i18n("Using SOCKS proxy: %1").tqarg(proxyServer);
 #ifdef DEBUG
 			DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\",  Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl;
 #endif
diff --git a/conduits/malconduit/mal-conduit.h b/conduits/malconduit/mal-conduit.h
index 3f5c14a..46e5551 100644
--- a/conduits/malconduit/mal-conduit.h
+++ b/conduits/malconduit/mal-conduit.h
@@ -38,6 +38,7 @@
 class MALConduit : public ConduitAction
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	MALConduit(
 		KPilotLink *o,
diff --git a/conduits/malconduit/mal-factory.cc b/conduits/malconduit/mal-factory.cc
index 3e363d2..3206822 100644
--- a/conduits/malconduit/mal-factory.cc
+++ b/conduits/malconduit/mal-factory.cc
@@ -115,7 +115,7 @@ MALConduitFactory::~MALConduitFactory()
 		else 
 		{
 			WARNINGKPILOT
-				<< "Couldn't cast parent to widget."
+				<< "Couldn't cast tqparent to widget."
 				<< endl;
 			return 0L;
 		}
@@ -132,7 +132,7 @@ MALConduitFactory::~MALConduitFactory()
 		else
 		{
 			WARNINGKPILOT
-				<< "Couldn't cast parent to KPilotLink"
+				<< "Couldn't cast tqparent to KPilotLink"
 				<< endl;
 			return 0L;
 		}
diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h
index a153163..7db6bb6 100644
--- a/conduits/malconduit/mal-factory.h
+++ b/conduits/malconduit/mal-factory.h
@@ -40,6 +40,7 @@ class KAboutData;
 class MALConduitFactory : public KLibFactory
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	MALConduitFactory(TQObject * = 0L,const char * = 0L);
@@ -48,9 +49,9 @@ public:
 	static KAboutData *about() { return fAbout; } ;
 
 protected:
-	virtual TQObject* createObject( TQObject* parent = 0,
+	virtual TQObject* createObject( TQObject* tqparent = 0,
 		const char* name = 0,
-		const char* classname = "TQObject",
+		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 		const TQStringList &args = TQStringList() );
 private:
 	KInstance *fInstance;
diff --git a/conduits/malconduit/mal-setup.cc b/conduits/malconduit/mal-setup.cc
index 1d1f89f..61441f0 100644
--- a/conduits/malconduit/mal-setup.cc
+++ b/conduits/malconduit/mal-setup.cc
@@ -150,7 +150,7 @@ MALWidgetSetup::~MALWidgetSetup()
 		fConfigWidget->proxyCustomPort->setValue(proxyPortNr);
 	}
 	fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser());
-	fConfigWidget->proxyPassword->setText(TQString::null);
+	fConfigWidget->proxyPassword->setText(TQString());
 	fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword());
 
 #ifdef DEBUG
diff --git a/conduits/malconduit/mal-setup.h b/conduits/malconduit/mal-setup.h
index 6a63374..6114c28 100644
--- a/conduits/malconduit/mal-setup.h
+++ b/conduits/malconduit/mal-setup.h
@@ -40,6 +40,7 @@ class MALWidget;
 class MALWidgetSetup : public ConduitConfigBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	MALWidgetSetup(TQWidget *,const char *);
 	virtual ~MALWidgetSetup();
diff --git a/conduits/malconduit/mal-setup_dialog.ui b/conduits/malconduit/mal-setup_dialog.ui
index 645335b..2bc4c5e 100644
--- a/conduits/malconduit/mal-setup_dialog.ui
+++ b/conduits/malconduit/mal-setup_dialog.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>MALWidget</class>
 <author>Reinhold Kainhofer</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MalWidget</cstring>
     </property>
@@ -23,14 +23,14 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
             <property name="enabled">
                 <bool>true</bool>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -41,7 +41,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="0">
+                    <widget class="TQButtonGroup" row="0" column="0">
                         <property name="name">
                             <cstring>syncTime</cstring>
                         </property>
@@ -61,7 +61,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QRadioButton" row="0" column="0">
+                            <widget class="TQRadioButton" row="0" column="0">
                                 <property name="name">
                                     <cstring>RadioButton1</cstring>
                                 </property>
@@ -78,7 +78,7 @@
                                     <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="0">
+                            <widget class="TQRadioButton" row="1" column="0">
                                 <property name="name">
                                     <cstring>RadioButton1_2</cstring>
                                 </property>
@@ -92,7 +92,7 @@
                                     <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one hour after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="0">
+                            <widget class="TQRadioButton" row="2" column="0">
                                 <property name="name">
                                     <cstring>RadioButton1_3</cstring>
                                 </property>
@@ -103,7 +103,7 @@
                                     <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one day after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="3" column="0">
+                            <widget class="TQRadioButton" row="3" column="0">
                                 <property name="name">
                                     <cstring>RadioButton1_4</cstring>
                                 </property>
@@ -114,7 +114,7 @@
                                     <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one week after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="4" column="0">
+                            <widget class="TQRadioButton" row="4" column="0">
                                 <property name="name">
                                     <cstring>RadioButton1_5</cstring>
                                 </property>
@@ -146,7 +146,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -157,7 +157,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>proxyType</cstring>
                         </property>
@@ -177,7 +177,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>RadioButton8</cstring>
                                 </property>
@@ -191,7 +191,7 @@
                                     <string>&lt;qt&gt;Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>RadioButton8_2</cstring>
                                 </property>
@@ -202,7 +202,7 @@
                                     <string>&lt;qt&gt;Select this option if you want KPilot to use a HTTP proxy.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>RadioButton8_2_2</cstring>
                                 </property>
@@ -215,7 +215,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>proxyServerInformation</cstring>
                         </property>
@@ -252,7 +252,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>proxyCustomPortCheck</cstring>
                                 </property>
@@ -263,7 +263,7 @@
                                     <string>Check this box to use a non-standard proxy port.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel1</cstring>
                                 </property>
@@ -316,7 +316,7 @@
                                     <string>&lt;qt&gt;If your proxy requires authentication, enter your password here.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>proxyUserName</cstring>
                                 </property>
@@ -324,7 +324,7 @@
                                     <string>&lt;qt&gt;If your proxy requires authentication, enter your username here.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="5" column="0">
+                            <widget class="TQLabel" row="5" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2_2</cstring>
                                 </property>
@@ -335,7 +335,7 @@
                                     <cstring>proxyPassword</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="4" column="0">
+                            <widget class="TQLabel" row="4" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -363,7 +363,7 @@
                                     <enum>Horizontal</enum>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>proxyExclude</cstring>
                                 </property>
@@ -371,7 +371,7 @@
                                     <string>&lt;qt&gt;Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: &lt;br&gt;&lt;i&gt;localhost,127.0.0.1,.lan&lt;/i&gt;&lt;qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -406,7 +406,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -423,7 +423,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>GroupBox1_2</cstring>
                         </property>
@@ -443,7 +443,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>TextLabel1_2</cstring>
                                 </property>
@@ -454,7 +454,7 @@
                                     <cstring>malServerName</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>malCustomPortCheck</cstring>
                                 </property>
@@ -501,12 +501,12 @@
                                     <cstring>malServerName</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>malUserName</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="4" column="0">
+                            <widget class="TQLabel" row="4" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2_2_2</cstring>
                                 </property>
@@ -517,7 +517,7 @@
                                     <cstring>malPassword</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>textLabel</cstring>
                                 </property>
@@ -566,7 +566,7 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel1_3</cstring>
                         </property>