1 files changed, 36 insertions, 36 deletions

diff --git a/src/upnp/upnprouter.h b/src/upnp/upnprouter.h
index f685620..8ae321e 100644
--- a/src/upnp/upnprouter.h
+++ b/src/upnp/upnprouter.h
@@ -20,12 +20,12 @@
 #ifndef KTUPNPROUTER_H
 #define KTUPNPROUTER_H
 
-#include <qtimer.h>
+#include <ntqtimer.h>
 #include <kio/job.h>
-#include <qvaluelist.h>
+#include <ntqvaluelist.h>
 #include "exitoperation.h"
 #include <kurl.h>
-#include <qstringlist.h>
+#include <ntqstringlist.h>
 #include <kstreamsocket.h>
 #include "portlist.h"
 #include "forwardportlist.h"
@@ -71,8 +71,8 @@ namespace bt
 		void operationFinished(kt::ExitOperation* op);
 		
 	private:
-		QTimer timer;
-		QValueList<kt::ExitOperation*> exit_ops;
+		TQTimer timer;
+		TQValueList<kt::ExitOperation*> exit_ops;
 	};
 	
 	void SynchronousWait(Uint32 millis);
@@ -103,11 +103,11 @@ namespace kt
 	*/
 	struct UPnPService	
 	{ 
-		QString serviceid;
-		QString servicetype;
-		QString controlurl;
-		QString eventsuburl;
-		QString scpdurl;
+		TQString serviceid;
+		TQString servicetype;
+		TQString controlurl;
+		TQString eventsuburl;
+		TQString scpdurl;
 		
 		UPnPService();
 		UPnPService(const UPnPService & s);
@@ -117,7 +117,7 @@ namespace kt
 		 * @param name Name of the property (matches to variable names)
 		 * @param value Value of the property
 		 */
-		void setProperty(const QString & name,const QString & value);
+		void setProperty(const TQString & name,const TQString & value);
 		
 		/**
 		 * Set all strings to empty.
@@ -140,18 +140,18 @@ namespace kt
 	 */
 	struct UPnPDeviceDescription
 	{
-		QString friendlyName;
-		QString manufacturer;
-		QString modelDescription;
-		QString modelName;
-		QString modelNumber;
+		TQString friendlyName;
+		TQString manufacturer;
+		TQString modelDescription;
+		TQString modelName;
+		TQString modelNumber;
 		
 		/**
 		 * Set a property of the description
 		 * @param name Name of the property (matches to variable names)
 		 * @param value Value of the property
 		 */
-		void setProperty(const QString & name,const QString & value);
+		void setProperty(const TQString & name,const TQString & value);
 	};
 	
 	/**
@@ -160,7 +160,7 @@ namespace kt
 	 * Class representing a UPnP enabled router. This class is also used to communicate
 	 * with the router.
 	*/
-	class UPnPRouter : public QObject
+	class UPnPRouter : public TQObject
 	{
 		Q_OBJECT
 				
@@ -181,14 +181,14 @@ namespace kt
 		};
 
 	private:	
-		QString server;
-		QString tmp_file;
+		TQString server;
+		TQString tmp_file;
 		KURL location;
 		UPnPDeviceDescription desc;
-		QValueList<UPnPService> services;
-		QValueList<Forwarding> fwds;
-		QValueList<ForwardingRequest> fwdreqs;
-		QValueList<bt::HTTPRequest*> active_reqs;
+		TQValueList<UPnPService> services;
+		TQValueList<Forwarding> fwds;
+		TQValueList<ForwardingRequest> fwdreqs;
+		TQValueList<bt::HTTPRequest*> active_reqs;
         net::ForwardPortList* forwardedPortList;
 
 	public:
@@ -198,11 +198,11 @@ namespace kt
 		 * @param location The location of it's xml description file
 		 * @param verbose Print lots of debug info
 		 */
-		UPnPRouter(const QString & server,const KURL & location,bool verbose = false);	
+		UPnPRouter(const TQString & server,const KURL & location,bool verbose = false);	
 		virtual ~UPnPRouter();
 		
 		/// Get the name  of the server
-		QString getServer() const {return server;}
+		TQString getServer() const {return server;}
 		
 		/// Get the location of it's xml description
 		KURL getLocation() const {return location;}
@@ -256,14 +256,14 @@ namespace kt
 		
 		void debugPrintData();
 		
-		QValueList<ForwardingRequest>::iterator beginReqMappings() {return fwdreqs.begin();}
-		QValueList<ForwardingRequest>::iterator endReqMappings() {return fwdreqs.end();}
-		QValueList<Forwarding>::iterator beginPortMappings() {return fwds.begin();}
-		QValueList<Forwarding>::iterator endPortMappings() {return fwds.end();}
+		TQValueList<ForwardingRequest>::iterator beginReqMappings() {return fwdreqs.begin();}
+		TQValueList<ForwardingRequest>::iterator endReqMappings() {return fwdreqs.end();}
+		TQValueList<Forwarding>::iterator beginPortMappings() {return fwds.begin();}
+		TQValueList<Forwarding>::iterator endPortMappings() {return fwds.end();}
 		net::ForwardPortList* forwardedPorts() {return forwardedPortList;}
 	private slots:
-		void onReplyOK(bt::HTTPRequest* r,const QString &,bool);
-		void onReplyError(bt::HTTPRequest* r,const QString &,bool);
+		void onReplyOK(bt::HTTPRequest* r,const TQString &,bool);
+		void onReplyError(bt::HTTPRequest* r,const TQString &,bool);
 		void onError(bt::HTTPRequest* r,bool);
 		void downloadFinished(KIO::Job* j);
 		
@@ -282,13 +282,13 @@ namespace kt
 		 */
 		void xmlFileDownloaded(UPnPRouter* r,bool success);
 
-		void replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString &,bool);
-		void replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString &,bool);
+		void replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString &,bool);
+		void replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString &,bool);
 		
 	private:
-		QValueList<UPnPService>::iterator findPortForwardingService();		
+		TQValueList<UPnPService>::iterator findPortForwardingService();		
 
-		bt::HTTPRequest* sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl,bool fwd, bool at_exit = false );
+		bt::HTTPRequest* sendSoapQuery(const TQString & query,const TQString & soapact,const TQString & controlurl,bool fwd, bool at_exit = false );
 		bool verbose;
 		
 		void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port());