Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index b7121c30..d010b723 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -50,8 +50,8 @@ MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Con
 	m_contact=c;
 	ready=true;
 
-	TQObject::connect( this, TQT_SIGNAL( socketClosed() ), this, TQT_SLOT( slotSocketClosed() ) );
-	TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), this, TQT_SLOT(slotReadBlock( const TQByteArray & ) ) );
+	TQObject::connect( this, TQ_SIGNAL( socketClosed() ), this, TQ_SLOT( slotSocketClosed() ) );
+	TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), this, TQ_SLOT(slotReadBlock( const TQByteArray & ) ) );
 }
 
 MSNFileTransferSocket::~MSNFileTransferSocket()
@@ -112,7 +112,7 @@ void MSNFileTransferSocket::parseCommand(const TQString & cmd, uint id, const TQ
 	{
 		m_downsize=0;
 		ready=true;
-		TQTimer::singleShot( 0, this, TQT_SLOT(slotSendFile()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotSendFile()) );
 	}
 	else if( cmd == "CCL" )
 	{
@@ -136,7 +136,7 @@ void MSNFileTransferSocket::bytesReceived(const TQByteArray & head)
 	if(head[0]!='\0')
 	{
 		kdDebug(14140) << "MSNFileTransferSocket::bytesReceived: transfer aborted" <<endl;
-		TQTimer::singleShot(0,this,TQT_SLOT(disconnect()));
+		TQTimer::singleShot(0,this,TQ_SLOT(disconnect()));
 	}
 	unsigned int sz=(int)((unsigned char)head.data()[2])*256+(int)((unsigned char)head.data()[1]);
 //	kdDebug(14140) << "MSNFileTransferSocket::bytesReceived: " << sz <<endl;
@@ -175,7 +175,7 @@ void MSNFileTransferSocket::slotReadBlock(const TQByteArray &block)
 		//the transfer seems to be finished.  
 		sendCommand( "BYE" ,"16777989",false);
 		//  if we are not already disconected in 30 seconds, do it.
-		TQTimer::singleShot( 30000 , this, TQT_SLOT(disconnect() ) );
+		TQTimer::singleShot( 30000 , this, TQ_SLOT(disconnect() ) );
 
 	}
 }
@@ -185,8 +185,8 @@ void MSNFileTransferSocket::setKopeteTransfer(Kopete::Transfer *kt)
 	m_kopeteTransfer=kt;
 	if(kt)
 	{
-		TQObject::connect(kt , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort()));
-		TQObject::connect(kt,  TQT_SIGNAL(destroyed()) , this , TQT_SLOT(slotKopeteTransferDestroyed()));
+		TQObject::connect(kt , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort()));
+		TQObject::connect(kt,  TQ_SIGNAL(destroyed()) , this , TQ_SLOT(slotKopeteTransferDestroyed()));
 	}
 }
 
@@ -194,13 +194,13 @@ void MSNFileTransferSocket::listen(int port)
 {
 	m_server = new TDEServerSocket();
 
-	TQObject::connect( m_server, TQT_SIGNAL(readyAccept()), this,  TQT_SLOT(slotAcceptConnection()));
+	TQObject::connect( m_server, TQ_SIGNAL(readyAccept()), this,  TQ_SLOT(slotAcceptConnection()));
 	m_server->setAddress(TQString::number(port));
 
 	kdDebug(14140) << "MSNFileTransferSocket::listen: about to listen"<<endl;
 	bool listenResult = m_server->listen(1);
 	kdDebug(14140) << "MSNFileTransferSocket::listen: result: "<<  listenResult <<endl;
-	TQTimer::singleShot( 60000, this, TQT_SLOT(slotTimer()) );
+	TQTimer::singleShot( 60000, this, TQ_SLOT(slotTimer()) );
 	kdDebug(14140) << "MSNFileTransferSocket::listen done" <<endl;
 }
 
@@ -249,7 +249,7 @@ void MSNFileTransferSocket::abort()
 	}
 	//the timer wait one second, the time to send the CCL or the binary header
 	//retarding the disconnection keep away from a crash. (in TDEIO::Job::emitResult when `delete this`)
-	TQTimer::singleShot( 1000, this, TQT_SLOT(disconnect()) );
+	TQTimer::singleShot( 1000, this, TQ_SLOT(disconnect()) );
 	ready=false;
 }
 
@@ -286,7 +286,7 @@ void MSNFileTransferSocket::slotSendFile()
 	{
 		//the transfer seems to be finished.  
 		//  if we are not already disconected in 30 seconds, do it.
-		TQTimer::singleShot( 30000 , this, TQT_SLOT(disconnect() ) );
+		TQTimer::singleShot( 30000 , this, TQ_SLOT(disconnect() ) );
 		return;
 	}
 
@@ -317,7 +317,7 @@ void MSNFileTransferSocket::slotSendFile()
 	}
 	ready=false;
 
-	TQTimer::singleShot( 10, this, TQT_SLOT(slotSendFile()) );
+	TQTimer::singleShot( 10, this, TQ_SLOT(slotSendFile()) );
 }
 
 void MSNFileTransferSocket::slotReadyWrite()
@@ -328,7 +328,7 @@ void MSNFileTransferSocket::slotReadyWrite()
 
 TQString MSNFileTransferSocket::invitationHead()
 {
-	TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) );  //the user has 10 mins to accept or refuse or initiate the transfer
+	TQTimer::singleShot( 10 * 60000, this, TQ_SLOT(slotTimer()) );  //the user has 10 mins to accept or refuse or initiate the transfer
 
 	return TQString( MSNInvitation::invitationHead()+
 					"Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n"
@@ -353,8 +353,8 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg)
 
 		Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString(), TQString::number( cookie() ) );
 
-		TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQT_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) );
-		TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) );
+		TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQ_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) );
+		TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQ_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) );
 
 	}
 	else if( msg.contains("Invitation-Command: ACCEPT") )
@@ -442,7 +442,7 @@ void MSNFileTransferSocket::slotFileTransferAccepted(Kopete::Transfer *trans, co
 			"Request-Data: IP-Address:\r\n"  ).utf8();
 		manager->service()->sendCommand( "MSG" , "N", true, message );
 
-		TQTimer::singleShot( 3 * 60000, this, TQT_SLOT(slotTimer()) ); //if after 3 minutes the transfer has not begin, delete this
+		TQTimer::singleShot( 3 * 60000, this, TQ_SLOT(slotTimer()) ); //if after 3 minutes the transfer has not begin, delete this
 	}
 	else
 	{