Rename old tq methods that no longer need a unique name

9 files changed, 18 insertions, 18 deletions

diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index d04449b..915e28f 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -248,7 +248,7 @@ namespace kt
 	void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info)
 	{
 		hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO);
-		hdr.setValue("Date",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC),false));
+		hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC),false));
 		hdr.setValue("Content-Type",content_type);
 		hdr.setValue("Connection","keep-alive");
 		if (with_session_info && session.sessionId && session.logged_in)
@@ -328,7 +328,7 @@ namespace kt
 			if (path.endsWith("login.html"))
 			{
 				// clear cookie in case of login page
-				TQDateTime dt = TQDateTime::tqcurrentDateTime().addDays(-1);
+				TQDateTime dt = TQDateTime::currentDateTime().addDays(-1);
 				TQString cookie = TQString("KT_SESSID=666; expires=%1 +0000").tqarg(DateTimeToString(dt,true));
 				rhdr.setValue("Set-Cookie",cookie);
 			}
@@ -351,7 +351,7 @@ namespace kt
 					setDefaultResponseHeaders(rhdr,"text/html",true);
 					rhdr.setValue("Cache-Control","max-age=0");
 					rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false));
-					rhdr.setValue("Expires",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC).addSecs(3600),false));
+					rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false));
 					hdlr->sendResponse(rhdr);
 					return;
 				}
@@ -361,7 +361,7 @@ namespace kt
 			HttpResponseHeader rhdr(200);
 			setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true);
 			rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false));
-			rhdr.setValue("Expires",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC).addSecs(3600),false));
+			rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false));
 			rhdr.setValue("Cache-Control","private");
 			if (!hdlr->sendFile(rhdr,path))
 			{
diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp
index 87c8acd..9b5ac85 100644
--- a/plugins/webinterface/php_handler.cpp
+++ b/plugins/webinterface/php_handler.cpp
@@ -76,7 +76,7 @@ namespace kt
 		ts.setEncoding( TQTextStream::UnicodeUTF8 );
 		ts.writeRawBytes(php_s.data(),off); // first write the opening tag from the script
 		php_i->globalInfo(ts);
-		php_i->downloadtqStatus(ts);
+		php_i->downloadStatus(ts);
 		
 		TQMap<TQString,TQString>::const_iterator it;
 			
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index 9e2a577..e98a309 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -72,12 +72,12 @@ namespace kt
 	}
 	
 	/*Generate php code
-	* function downloadtqStatus()
+	* function downloadStatus()
 	* {
 	*	return array( ... );
 	* }
 	*/
-	void PhpCodeGenerator::downloadtqStatus(TQTextStream & out)
+	void PhpCodeGenerator::downloadStatus(TQTextStream & out)
 	{
 		TorrentStats stats;
 		//Priority file_priority;
@@ -156,7 +156,7 @@ namespace kt
 	}
 	
 	/*Generate php code
-	* function globaltqStatus()
+	* function globalStatus()
 	* {
 	*	return array( ... );
 	* }
diff --git a/plugins/webinterface/php_interface.h b/plugins/webinterface/php_interface.h
index 4995ae6..acfd8c7 100644
--- a/plugins/webinterface/php_interface.h
+++ b/plugins/webinterface/php_interface.h
@@ -40,7 +40,7 @@ namespace kt
 			PhpCodeGenerator(CoreInterface *c);
 			virtual ~PhpCodeGenerator(){}
 			
-			void downloadtqStatus(TQTextStream & out);
+			void downloadStatus(TQTextStream & out);
 			void globalInfo(TQTextStream & out);
 		private:
 			CoreInterface *core;
diff --git a/plugins/webinterface/webinterfacepref.ui b/plugins/webinterface/webinterfacepref.ui
index dca1d84..a36f7f8 100644
--- a/plugins/webinterface/webinterfacepref.ui
+++ b/plugins/webinterface/webinterfacepref.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>500</width>
             <height>350</height>
@@ -92,7 +92,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>54</width>
                                     <height>21</height>
diff --git a/plugins/webinterface/www/default/details.php b/plugins/webinterface/www/default/details.php
index 92c8d48..a19d57e 100644
--- a/plugins/webinterface/www/default/details.php
+++ b/plugins/webinterface/www/default/details.php
@@ -1,5 +1,5 @@
 <?php
-$stats=downloadtqStatus();
+$stats=downloadStatus();
 $num_torrent=$_REQUEST['torrent'];
 
 function cut_name_if_long($string)
@@ -61,7 +61,7 @@ $display_name=cut_name_if_long($stats[$num_torrent]['torrent_name']);
 		<tr>
 			<th>Actions</th>
 			<th>File</th>
-			<th>tqStatus</th>
+			<th>Status</th>
 			<th>Size</th>
 			<th>Complete</th>
 		</tr>
diff --git a/plugins/webinterface/www/default/interface.php b/plugins/webinterface/www/default/interface.php
index f34e651..6432798 100644
--- a/plugins/webinterface/www/default/interface.php
+++ b/plugins/webinterface/www/default/interface.php
@@ -1,6 +1,6 @@
 <?php
 $globalinfo=globalInfo();
-$stats=downloadtqStatus();
+$stats=downloadStatus();
 
 function get_torrent_status_name($status_id)
 {
@@ -18,7 +18,7 @@ function get_torrent_status_name($status_id)
 	10 => 'Checking Data'
 	);
 	if (array_key_exists($status_id, $table)) return $table[$status_id];
-	else return 'Not supported tqStatus';
+	else return 'Not supported Status';
 }
 
 function generate_button_code($img, $alt, $href='')
@@ -104,7 +104,7 @@ function generate_button_code($img, $alt, $href='')
 		<tr>
 			<th>Actions</th>
 			<th>File</th>
-			<th>tqStatus</th>
+			<th>Status</th>
 			<th>Downloaded</th>
 			<th>Size</th>
 			<th>Uploaded</th>
diff --git a/plugins/webinterface/www/mobile/interface.php b/plugins/webinterface/www/mobile/interface.php
index 3f5e88b..57582de 100644
--- a/plugins/webinterface/www/mobile/interface.php
+++ b/plugins/webinterface/www/mobile/interface.php
@@ -18,7 +18,7 @@
 <table  width="100%">
   <tbody>
     	<?php
-		$stats=downloadtqStatus();
+		$stats=downloadStatus();
 		$a = 0;
 		foreach ($stats as $torrent) {
 			echo "<tr>";
diff --git a/plugins/webinterface/www/mobile/torrent.php b/plugins/webinterface/www/mobile/torrent.php
index b041d3f..a1e451d 100644
--- a/plugins/webinterface/www/mobile/torrent.php
+++ b/plugins/webinterface/www/mobile/torrent.php
@@ -8,7 +8,7 @@
     <tr>
       <td align="center"><IMG src="ktorrentwebinterfacelogo.png" width="340" height="150" align="top" border="0"></td>
       <?php
-      	$stats=downloadtqStatus();
+      	$stats=downloadStatus();
       	$t=$stats[$_REQUEST['id']];
       	echo "<td><strong>ktorrent-><a href=\"interface.php\">transfers</a></strong>->{$t['torrent_name']}</td>";
       	echo "<td><a href=\"torrent.php?id={$_REQUEST['id']}\" >refresh</a></td>";