TQt4 port ktorrent

This enables compilation under both Qt3 and Qt4


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

4 files changed, 19 insertions, 18 deletions

diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp
index c2629ef..c585f73 100644
--- a/apps/ktupnptest/main.cpp
+++ b/apps/ktupnptest/main.cpp
@@ -66,12 +66,12 @@ int main(int argc,char** argv)
 	/*
 	if (argc >= 2)
 	{
-		kt::UPnPRouter router(QString::null,"http://foobar.com");
+		kt::UPnPRouter router(TQString(),"http://foobar.com");
 		kt::UPnPDescriptionParser dp;
 		
 		if (!dp.parse(argv[1],&router))
 		{
-			Out() << "Cannot parse " << QString(argv[1]) << endl;
+			Out() << "Cannot parse " << TQString(argv[1]) << endl;
 		}
 		else
 		{
@@ -83,7 +83,7 @@ int main(int argc,char** argv)
 	
 	Out() << "Doing second test" << endl;
 	UPnPMCastSocket mcast;
-	UPnPRouter* r = mcast.parseResponse(QCString(test_ps));
+	UPnPRouter* r = mcast.parseResponse(TQCString(test_ps));
 	if (r)
 	{
 		Out() << "Succesfully parsed test_ps" << endl;
diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui
index cb375f8..b3cce96 100644
--- a/apps/ktupnptest/mainwidget.ui
+++ b/apps/ktupnptest/mainwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MainWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MainWidget</cstring>
     </property>
@@ -16,14 +16,14 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTextBrowser">
+        <widget class="TQTextBrowser">
             <property name="name">
                 <cstring>output</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -39,7 +39,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>61</width>
                             <height>20</height>
@@ -68,7 +68,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp
index d50b314..1cb6d31 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/apps/ktupnptest/upnptestapp.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <qtextbrowser.h>
+#include <tqtextbrowser.h>
 #include <util/error.h>
 #include "upnptestapp.h"
 #include "mainwidget.h"
@@ -29,15 +29,15 @@
 using namespace bt;
 using namespace kt;
 
-UPnPTestApp::UPnPTestApp(QWidget *parent, const char *name)
-		: KMainWindow(parent, name)
+UPnPTestApp::UPnPTestApp(TQWidget *tqparent, const char *name)
+		: KMainWindow(tqparent, name)
 {
 	sock = new UPnPMCastSocket(true);
-	connect(sock,SIGNAL(discovered( UPnPRouter* )),this,SLOT(discovered( UPnPRouter* )));
+	connect(sock,TQT_SIGNAL(discovered( UPnPRouter* )),this,TQT_SLOT(discovered( UPnPRouter* )));
 	mwnd = new MainWidget(this);
 	setCentralWidget(mwnd);
-	connect(mwnd->test_btn,SIGNAL(clicked()),this,SLOT(onTestBtn()));
-	connect(mwnd->close_btn,SIGNAL(clicked()),this,SLOT(onCloseBtn()));
+	connect(mwnd->test_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onTestBtn()));
+	connect(mwnd->close_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCloseBtn()));
 	bt::Log & lg = bt::Globals::instance().getLog(0);
 	lg.addMonitor(this);
 	Out() << "UPnPTestApp started up !" << endl;
@@ -78,7 +78,7 @@ bool UPnPTestApp::queryExit()
 	return true;
 }
 
-void UPnPTestApp::message(const QString& line, unsigned int arg)
+void UPnPTestApp::message(const TQString& line, unsigned int arg)
 {
 	mwnd->output->append(line);
 }
diff --git a/apps/ktupnptest/upnptestapp.h b/apps/ktupnptest/upnptestapp.h
index 6554687..c98facf 100644
--- a/apps/ktupnptest/upnptestapp.h
+++ b/apps/ktupnptest/upnptestapp.h
@@ -38,11 +38,12 @@ using kt::UPnPRouter;
 class UPnPTestApp : public KMainWindow, public kt::LogMonitorInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	UPnPTestApp(QWidget *parent = 0, const char *name = 0);
+	UPnPTestApp(TQWidget *tqparent = 0, const char *name = 0);
 	virtual ~UPnPTestApp();
 	
-	virtual void message(const QString& line, unsigned int arg);
+	virtual void message(const TQString& line, unsigned int arg);
 	bool queryExit();
 	
 private slots: