diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 00:37:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 00:37:32 +0000 |
| commit | f6f9c296c3f9d39a8c3d0ee64a542a47f450be28 (patch) | |
| tree | d38fce8091ce66977004a5cb115768c7810aee30 /conduits/null | |
| parent | e340db64991a06761aa6395ffe760b53e4c1dfbc (diff) | |
| download | kpilot-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/null')
| -rw-r--r-- | conduits/null/Makefile.am | 2 | ||||
| -rw-r--r-- | conduits/null/null-conduit.cc | 2 | ||||
| -rw-r--r-- | conduits/null/null-factory.cc | 2 | ||||
| -rw-r--r-- | conduits/null/setup_base.ui | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am index 783e881..bdcc43f 100644 --- a/conduits/null/Makefile.am +++ b/conduits/null/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_null.la conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc -conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = nullconduit.kcfg diff --git a/conduits/null/null-conduit.cc b/conduits/null/null-conduit.cc index d0c07c5..29d2499 100644 --- a/conduits/null/null-conduit.cc +++ b/conduits/null/null-conduit.cc @@ -35,7 +35,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // #include <time.h> diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc index c2d381d..6b80615 100644 --- a/conduits/null/null-factory.cc +++ b/conduits/null/null-factory.cc @@ -47,7 +47,7 @@ class NullConduitConfig : public ConduitConfigBase { public: - NullConduitConfig(TQWidget *parent=0L, const char *n=0L); + NullConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui index 2bcb518..ed7d234 100644 --- a/conduits/null/setup_base.ui +++ b/conduits/null/setup_base.ui @@ -3,7 +3,7 @@ <comment>A tabWidget for configuring the Null-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 Null-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 Null-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 Null-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 Null-conduit settings.</comment> <string><qt>Enter the message to add to the Sync Log on your Pilot here.</qt></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> |