summaryrefslogtreecommitdiffstats
path: root/conduits/popmail
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-01 00:37:32 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-01 00:37:32 +0000
commitf6f9c296c3f9d39a8c3d0ee64a542a47f450be28 (patch)
treed38fce8091ce66977004a5cb115768c7810aee30 /conduits/popmail
parente340db64991a06761aa6395ffe760b53e4c1dfbc (diff)
downloadkpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.tar.gz
kpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.zip
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
Diffstat (limited to 'conduits/popmail')
-rw-r--r--conduits/popmail/Makefile.am2
-rw-r--r--conduits/popmail/setup-dialog.ui18
-rw-r--r--conduits/popmail/setupDialog.h1
3 files changed, 11 insertions, 10 deletions
diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am
index 5b6becd..365cd1b 100644
--- a/conduits/popmail/Makefile.am
+++ b/conduits/popmail/Makefile.am
@@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la
conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
popmail-factory.cc setupDialog.cc \
popmail-conduit.cc
-conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lDCOP
conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO)
# this option you can leave out. Just, if you use "make dist", you need it
diff --git a/conduits/popmail/setup-dialog.ui b/conduits/popmail/setup-dialog.ui
index d9cf74e..e82f4ad 100644
--- a/conduits/popmail/setup-dialog.ui
+++ b/conduits/popmail/setup-dialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>PopMailWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>PopMailWidget</cstring>
</property>
@@ -22,11 +22,11 @@
<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>fTabWidget</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -54,7 +54,7 @@
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -65,7 +65,7 @@
<string>&lt;qt&gt;Select the method KPilot will use to send the mail from your Handheld to the recipients here. Depending on the method you choose, the other fields in the dialog may be enabled or disabled. Currently, the only &lt;i&gt;working&lt;/i&gt; method is through KMail.&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -87,7 +87,7 @@
<string>&lt;qt&gt;Enter the email address you want to send messages as here.&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -95,7 +95,7 @@
<string>Signature file:</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, located in your home folder) here, or select it clicking the file picker button. The signature file tqcontains the text that is added to the end of your outgoing mail messages.&lt;/qt&gt;</string>
+ <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.&lt;/qt&gt;</string>
</property>
</widget>
<widget class="KURLRequester" row="2" column="1">
@@ -103,10 +103,10 @@
<cstring>fSignature</cstring>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, located in your home folder) here, or select it clicking the file picker button. The signature file tqcontains the text that is added to the end of your outgoing mail messages.&lt;/qt&gt;</string>
+ <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Do Not Send Mail</string>
diff --git a/conduits/popmail/setupDialog.h b/conduits/popmail/setupDialog.h
index 76bf9af..cc9d831 100644
--- a/conduits/popmail/setupDialog.h
+++ b/conduits/popmail/setupDialog.h
@@ -40,6 +40,7 @@ class PopMailWidget; // From setup-dialog.ui
class PopMailWidgetConfig : public ConduitConfigBase
{
Q_OBJECT
+ TQ_OBJECT
public:
PopMailWidgetConfig(TQWidget *, const char *);
virtual void load();