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

10 files changed, 24 insertions, 24 deletions

diff --git a/utests/biginttest.cpp b/utests/biginttest.cpp
index fc8f105..36a896a 100644
--- a/utests/biginttest.cpp
+++ b/utests/biginttest.cpp
@@ -43,7 +43,7 @@ namespace utest
 		b.toBuffer(buf,10);
 		for (Uint32 i = 0;i < 10;i++)
 		{
-			Out() << QString("0x%1 ").arg(buf[i],0,16);
+			Out() << TQString("0x%1 ").tqarg(buf[i],0,16);
 		}
 		Out() << endl;
 	}
@@ -67,7 +67,7 @@ namespace utest
 		a.toBuffer(foobar,5);
 		for (Uint32 i = 0;i < 5;i++)
 		{
-			Out() << QString("0x%1 ").arg(foobar[i],0,16);
+			Out() << TQString("0x%1 ").tqarg(foobar[i],0,16);
 		}
 		Out() << endl;
 		Out() << "Third test" << endl;
diff --git a/utests/dhtmsgparsetest.cpp b/utests/dhtmsgparsetest.cpp
index 44e0338..38a0deb 100644
--- a/utests/dhtmsgparsetest.cpp
+++ b/utests/dhtmsgparsetest.cpp
@@ -38,9 +38,9 @@ namespace utest
 	DHTMsgParseTest::~DHTMsgParseTest()
 	{}
 
-	bool DHTMsgParseTest::doTest(const QString & data,int method)
+	bool DHTMsgParseTest::doTest(const TQString & data,int method)
 	{
-		QByteArray bdata(data.length());
+		TQByteArray bdata(data.length());
 		
 		for (int i = 0;i < data.length();i++)
 		{
@@ -74,14 +74,14 @@ namespace utest
 	bool DHTMsgParseTest::doTest()
 	{	
 
-		QString test_str[] = {
+		TQString test_str[] = {
 			"d1:rd2:id20:####################5:token20:####################6:valuesl6:######6:######6:######6:######6:######6:######6:######6:######ee1:t1:#1:y1:re",
 			
 			"d1:ad2:id20:####################9:info_hash20:####################e1:q9:get_peers1:t1:#1:y1:qe",
 			
 			"d1:rd2:id20:####################5:nodes208:################################################################################################################################################################################################################5:token20:####################e1:t1:#1:y1:re",
 			
-			QString::null
+			TQString()
 		};
 		
 		int types[] = {dht::GET_PEERS,dht::NONE,dht::GET_PEERS};
diff --git a/utests/dhtmsgparsetest.h b/utests/dhtmsgparsetest.h
index c88ec72..8e2c774 100644
--- a/utests/dhtmsgparsetest.h
+++ b/utests/dhtmsgparsetest.h
@@ -36,7 +36,7 @@ namespace utest
 
 		virtual bool doTest();
 	private:
-		bool doTest(const QString & data,int method);
+		bool doTest(const TQString & data,int method);
 	};
 
 }
diff --git a/utests/rc4test.cpp b/utests/rc4test.cpp
index ef5e7c4..add45ff 100644
--- a/utests/rc4test.cpp
+++ b/utests/rc4test.cpp
@@ -59,15 +59,15 @@ namespace utest
 		if (memcmp(dec,test,tlen) == 0)
 		{
 			Out() << "Test succesfull" << endl;
-			Out() << QString(test) << endl;
-			Out() << QString((char*)dec) << endl;
+			Out() << TQString(test) << endl;
+			Out() << TQString((char*)dec) << endl;
 			return true;
 		}
 		else
 		{
 			Out() << "Test not succesfull" << endl;
-			Out() << QString(test) << endl;
-			Out() << QString((char*)dec) << endl;
+			Out() << TQString(test) << endl;
+			Out() << TQString((char*)dec) << endl;
 			return false;
 		}
 	}
diff --git a/utests/testrunner.cpp b/utests/testrunner.cpp
index d518c17..3e0c2aa 100644
--- a/utests/testrunner.cpp
+++ b/utests/testrunner.cpp
@@ -45,7 +45,7 @@ namespace utest
 	{
 		int succes = 0;
 		int failure = 0;
-		QPtrList<UnitTest>::iterator i = tests.begin();
+		TQPtrList<UnitTest>::iterator i = tests.begin();
 		while (i != tests.end())
 		{
 			Out() << "======================" << endl;
diff --git a/utests/testrunner.h b/utests/testrunner.h
index c4e7623..edc56b4 100644
--- a/utests/testrunner.h
+++ b/utests/testrunner.h
@@ -20,7 +20,7 @@
 #ifndef UTESTTESTRUNNER_H
 #define UTESTTESTRUNNER_H
 
-#include <qptrlist.h>
+#include <tqptrlist.h>
 #include "unittest.h"
 
 namespace utest
@@ -31,7 +31,7 @@ namespace utest
 	*/
 	class TestRunner
 	{
-		QPtrList<UnitTest> tests;
+		TQPtrList<UnitTest> tests;
 	public:
 		TestRunner();
 		virtual ~TestRunner();
diff --git a/utests/unittest.cpp b/utests/unittest.cpp
index 458ff8b..2aaa2d6 100644
--- a/utests/unittest.cpp
+++ b/utests/unittest.cpp
@@ -22,7 +22,7 @@
 namespace utest
 {
 
-	UnitTest::UnitTest(const QString & name) : name(name)
+	UnitTest::UnitTest(const TQString & name) : name(name)
 	{}
 
 
diff --git a/utests/unittest.h b/utests/unittest.h
index 6fd46d8..02889a5 100644
--- a/utests/unittest.h
+++ b/utests/unittest.h
@@ -20,7 +20,7 @@
 #ifndef UTESTUNITTEST_H
 #define UTESTUNITTEST_H
 
-#include <qstring.h>
+#include <tqstring.h>
 
 namespace utest
 {
@@ -32,12 +32,12 @@ namespace utest
 	*/
 	class UnitTest
 	{
-		QString name;
+		TQString name;
 	public:
-		UnitTest(const QString & name);
+		UnitTest(const TQString & name);
 		virtual ~UnitTest();
 		
-		QString getName() const {return name;}
+		TQString getName() const {return name;}
 
 		virtual bool doTest() = 0;
 	};
diff --git a/utests/upnpparsedescriptiontest.cpp b/utests/upnpparsedescriptiontest.cpp
index bbccfdd..787378f 100644
--- a/utests/upnpparsedescriptiontest.cpp
+++ b/utests/upnpparsedescriptiontest.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <qfile.h>
+#include <tqfile.h>
 #include <plugins/upnp/upnprouter.h>
 #include <plugins/upnp/upnpdescriptionparser.h>
 #include <util/fileops.h>
@@ -360,8 +360,8 @@ namespace utest
 
 	bool UPnPParseDescriptionTest::doParse(const char* data,bool forward_test)
 	{
-		QString fn = "/tmp/UPnPParseDescriptionTest";
-		QFile fptr(fn);
+		TQString fn = "/tmp/UPnPParseDescriptionTest";
+		TQFile fptr(fn);
 		if (!fptr.open(IO_WriteOnly))
 		{
 			Out() << "Cannot open " << fn << " : " << fptr.errorString() << endl;
@@ -370,7 +370,7 @@ namespace utest
 		fptr.writeBlock(data,strlen(data));
 		fptr.close();
 		
-		kt::UPnPRouter router(QString::null,"http://foobar.com");
+		kt::UPnPRouter router(TQString(),"http://foobar.com");
 		kt::UPnPDescriptionParser dp;
 		
 		if (!dp.parse(fn,&router))
diff --git a/utests/upnpparseresponsetest.cpp b/utests/upnpparseresponsetest.cpp
index 0198ec7..97102cf 100644
--- a/utests/upnpparseresponsetest.cpp
+++ b/utests/upnpparseresponsetest.cpp
@@ -53,7 +53,7 @@ namespace utest
 				"USN: uuid:75802409-bccb-40e7-8e6c-fa095ecce13e::urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n\r\n";
 		
 		UPnPMCastSocket mcast;
-		UPnPRouter* r = mcast.parseResponse(QCString(test_ps));
+		UPnPRouter* r = mcast.parseResponse(TQCString(test_ps));
 		if (r)
 		{
 			delete r;