Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

apps/ktorrent/main.cpp

@@ -116,7 +116,7 @@ int main(int argc, char **argv)
 	// ignore SIGPIPE's
 	signal(SIGPIPE,SIG_IGN);
 	signal(SIGXFSZ,SIG_IGN);
-	tqInstallMsgHandler( StupidWarningMessagesFromTQt );
+	qInstallMsgHandler( StupidWarningMessagesFromTQt );
 	TDEAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description,
 					 TDEAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0);
 	about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" );

apps/ktorrent/newui/button.cpp

@@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
             h = TQMAX(h, sz.height());
     }
 
-    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+    return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
             expandedTo(TQApplication::globalStrut()));
 }
 

apps/ktorrent/newui/docksplitter.cpp

@@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock)
     for (uint i = 0; i < m_docks.count(); ++i)
         for (uint j = 0; j < m_docks[i].count(); ++j)
             if (dock == m_docks[i][j])
-                return tqMakePair(i, j);
-    return tqMakePair(0u, 0u);
+                return qMakePair(i, j);
+    return qMakePair(0u, 0u);
 }
 
 }

libktorrent/net/speed.cpp

@@ -37,7 +37,7 @@ namespace net
 	
 	void Speed::onData(Uint32 b,bt::TimeStamp ts)
 	{
-		dlrate.append(tqMakePair(b,ts));
+		dlrate.append(qMakePair(b,ts));
 		bytes += b;
 	}
 

libktorrent/torrent/speedestimater.cpp

@@ -36,7 +36,7 @@ namespace bt
 		
 		void data(Uint32 bytes)
 		{
-			dlrate.append(tqMakePair(bytes,GetCurrentTime()));
+			dlrate.append(qMakePair(bytes,GetCurrentTime()));
 		}
 		
 		void update()