From f6f9c296c3f9d39a8c3d0ee64a542a47f450be28 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 1 Jul 2011 00:37:32 +0000
Subject: 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
---
 conduits/recordconduit/Makefile.am   |  2 +-
 conduits/recordconduit/factory.cc    |  2 +-
 conduits/recordconduit/setup_base.ui | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'conduits/recordconduit')

diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am
index 9fd691e..e00693a 100644
--- a/conduits/recordconduit/Makefile.am
+++ b/conduits/recordconduit/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la
 
 
 conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc
-conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui
 conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
 
 kde_kcfg_DATA = settings.kcfg
diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc
index 8337733..76b790e 100644
--- a/conduits/recordconduit/factory.cc
+++ b/conduits/recordconduit/factory.cc
@@ -48,7 +48,7 @@
 class ConduitConfig : public ConduitConfigBase
 {
 public:
-	ConduitConfig(TQWidget *parent=0L, const char *n=0L);
+	ConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
 	virtual void commit();
 	virtual void load();
 protected:
diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui
index 8bd9790..389219b 100644
--- a/conduits/recordconduit/setup_base.ui
+++ b/conduits/recordconduit/setup_base.ui
@@ -3,7 +3,7 @@
 <comment>A tabWidget for configuring
 the Record-conduit settings.</comment>
 <author>Adriaan de Groot</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -46,7 +46,7 @@ the Record-conduit settings.</comment>
         <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>
@@ -60,7 +60,7 @@ the Record-conduit settings.</comment>
             </property>
             <property name="tqlayoutMargin" stdset="0">
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget2</cstring>
                 </property>
@@ -77,7 +77,7 @@ the Record-conduit settings.</comment>
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLineEdit" row="0" column="1">
+                    <widget class="TQLineEdit" row="0" column="1">
                         <property name="name">
                             <cstring>fLogMessage</cstring>
                         </property>
@@ -88,7 +88,7 @@ the Record-conduit settings.</comment>
                             <string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -99,7 +99,7 @@ the Record-conduit settings.</comment>
                             <cstring>fLogMessage</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
@@ -110,7 +110,7 @@ the Record-conduit settings.</comment>
                             <cstring>fDatabases</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="1" column="1">
+                    <widget class="TQLineEdit" row="1" column="1">
                         <property name="name">
                             <cstring>fDatabases</cstring>
                         </property>
@@ -135,7 +135,7 @@ the Record-conduit settings.</comment>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QCheckBox" row="2" column="1">
+                    <widget class="TQCheckBox" row="2" column="1">
                         <property name="name">
                             <cstring>fFailImmediately</cstring>
                         </property>
-- 
cgit v1.2.1