Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f96f74ffa7040e64ae3352e08c810c383c8a0ba2.

5 files changed, 12 insertions, 12 deletions

diff --git a/plugins/upnp/soap.cpp b/plugins/upnp/soap.cpp
index c44ab1e..f80d5af 100644
--- a/plugins/upnp/soap.cpp
+++ b/plugins/upnp/soap.cpp
@@ -29,7 +29,7 @@ namespace kt
 				"<SOAP-ENV:Body>"
 				"<m:%1 xmlns:m=\"%2\"/>"
 				"</SOAP-ENV:Body></SOAP-ENV:Envelope>"
-				"\r\n").arg(action).arg(service);
+				"\r\n").tqarg(action).tqarg(service);
 		
 		return comm;
 	}
@@ -39,7 +39,7 @@ namespace kt
 		TQString comm = TQString("<?xml version=\"1.0\"?>\r\n"
 				"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
 				"<SOAP-ENV:Body>"
-				"<m:%1 xmlns:m=\"%2\">").arg(action).arg(service);
+				"<m:%1 xmlns:m=\"%2\">").tqarg(action).tqarg(service);
 		
 		for (TQValueList<Arg>::const_iterator i = args.begin();i != args.end();i++)
 		{
@@ -47,7 +47,7 @@ namespace kt
 			comm += "<" + a.element + ">" + a.value + "</" + a.element + ">";
 		}
 		
-		comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").arg(action);
+		comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").tqarg(action);
 		return comm;
 	}
 }
diff --git a/plugins/upnp/upnpdescriptionparser.cpp b/plugins/upnp/upnpdescriptionparser.cpp
index 1e73362..bd933a4 100644
--- a/plugins/upnp/upnpdescriptionparser.cpp
+++ b/plugins/upnp/upnpdescriptionparser.cpp
@@ -32,7 +32,7 @@ namespace kt
 	
 	class XMLContentHandler : public TQXmlDefaultHandler
 	{
-		enum Status
+		enum tqStatus
 		{
 		    TOPLEVEL,ROOT,DEVICE,SERVICE,FIELD,OTHER
 		};
@@ -40,7 +40,7 @@ namespace kt
 		TQString tmp;
 		UPnPRouter* router;
 		UPnPService curr_service;
-		TQValueStack<Status> status_stack;
+		TQValueStack<tqStatus> status_stack;
 	public:
 		XMLContentHandler(UPnPRouter* router);
 		virtual ~XMLContentHandler();
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp
index 1a4e0a0..facf207 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/plugins/upnp/upnpmcastsocket.cpp
@@ -35,7 +35,7 @@ extern "C" {
 #include <util/log.h>
 #include <torrent/globals.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include "upnpmcastsocket.h"
 
 using namespace KNetwork;
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index 05d47a4..e5593ea 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -113,7 +113,7 @@ namespace kt
 	UPnPRouter::UPnPRouter(const TQString & server,const KURL & location,bool verbose) : server(server),location(location),verbose(verbose)
 	{
 		// make the tmp_file unique, current time * a random number should be enough
-		tmp_file = TQString("/tmp/ktorrent_upnp_description-%1.xml").arg(bt::GetCurrentTime() * rand());
+		tmp_file = TQString("/tmp/ktorrent_upnp_description-%1.xml").tqarg(bt::GetCurrentTime() * rand());
 	}
 	
 	
@@ -227,7 +227,7 @@ namespace kt
 		
 		a.element = "NewPortMappingDescription";
 		static Uint32 cnt = 0;
-		a.value = TQString("KTorrent UPNP %1").arg(cnt++);	// TODO: change this
+		a.value = TQString("KTorrent UPNP %1").tqarg(cnt++);	// TODO: change this
 		args.append(a);
 		
 		a.element = "NewLeaseDuration";
@@ -335,7 +335,7 @@ namespace kt
 				"Content-length: $CONTENT_LENGTH\r\n"
 				"Content-Type: text/xml\r\n"
 				"SOAPAction: \"%4\"\r\n"
-				"\r\n").arg(controlurl).arg(location.host()).arg(location.port()).arg(soapact);
+				"\r\n").tqarg(controlurl).tqarg(location.host()).tqarg(location.port()).tqarg(soapact);
 
 		
 		HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose);
diff --git a/plugins/upnp/upnpwidget.ui b/plugins/upnp/upnpwidget.ui
index d06576a..50e1e1a 100644
--- a/plugins/upnp/upnpwidget.ui
+++ b/plugins/upnp/upnpwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -77,7 +77,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>70</width>
                             <height>20</height>