Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

1 files changed, 17 insertions, 17 deletions

diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index 60046d17..44d3ffd4 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -131,7 +131,7 @@ void Webcam::sendBYEMessage()
 	sendMessage(BYE,content);
 	
 	//If ever the opposite client was dead or something, we'll ack anyway, so everything get cleaned
-	TQTimer::singleShot(60*1000 , this, TQT_SLOT(acknowledged()));
+	TQTimer::singleShot(60*1000 , this, TQ_SLOT(acknowledged()));
 }
 
 
@@ -342,8 +342,8 @@ void Webcam::processMessage(const Message& message)
 		}
 		//m_listener->setResolutionEnabled(true);
 				// Create the callback that will try to accept incoming connections.
-		TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotAccept()));
-		TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int)));
+		TQObject::connect(m_listener, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotAccept()));
+		TQObject::connect(m_listener, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotListenError(int)));
 				// Listen for incoming connections.
 		bool isListening = m_listener->listen();
 		kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl;		
@@ -383,8 +383,8 @@ void Webcam::processMessage(const Message& message)
 				kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port1 << endl;
 				TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port1, this );
 				m_allSockets.append(sock);
-				TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) );
-				TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+				TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) );
+				TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 				sock->connect(ip, port1);
 				kdDebug(14140) << k_funcinfo << "okok " << sock << " - " << sock->peerAddress().toString() << " ; " << sock->localAddress().toString()  << endl;
 			}
@@ -393,8 +393,8 @@ void Webcam::processMessage(const Message& message)
 				kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port2 << endl;
 				TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port2, this );
 				m_allSockets.append(sock);
-				TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) );
-				TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+				TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) );
+				TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 				sock->connect(ip, port2);
 			}
 			if(!port3.isNull())
@@ -402,8 +402,8 @@ void Webcam::processMessage(const Message& message)
 				kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port3 << endl;
 				TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port3, this );
 				m_allSockets.append(sock);
-				TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) );
-				TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+				TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) );
+				TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 				sock->connect(ip, port3);
 			}
 		}
@@ -568,11 +568,11 @@ void Webcam::slotSocketConnected()
 	m_webcamSocket->enableWrite(false);
 
 	// Create the callback that will try to read bytes from the accepted socket.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(readyRead()),   this, TQT_SLOT(slotSocketRead()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(readyRead()),   this, TQ_SLOT(slotSocketRead()));
 	// Create the callback that will try to handle the socket close event.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(closed()),      this, TQT_SLOT(slotSocketClosed()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(closed()),      this, TQ_SLOT(slotSocketClosed()));
 	// Create the callback that will try to handle the socket error event.
-//	TQObject::connect(m_webcamSocket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+//	TQObject::connect(m_webcamSocket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 
 	m_webcamStates[m_webcamSocket]=wsConnected;
 	TQCString to_send=m_peerAuth.utf8();
@@ -608,11 +608,11 @@ void Webcam::slotAccept()
 	m_webcamSocket->enableWrite(false);
 
 	// Create the callback that will try to read bytes from the accepted socket.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(readyRead()),   this, TQT_SLOT(slotSocketRead()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(readyRead()),   this, TQ_SLOT(slotSocketRead()));
 	// Create the callback that will try to handle the socket close event.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(closed()),      this, TQT_SLOT(slotSocketClosed()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(closed()),      this, TQ_SLOT(slotSocketClosed()));
 	// Create the callback that will try to handle the socket error event.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 	
 	m_allSockets.append(m_webcamSocket);
 	m_webcamStates[m_webcamSocket]=wsNegotiating;
@@ -668,7 +668,7 @@ void Webcam::slotSocketRead()
 					kdDebug(14140) << k_funcinfo <<  "new timer" << m_timerId << endl;
 				}
 				m_widget=new MSNWebcamDialog(m_recipient);
-				connect(m_widget, TQT_SIGNAL( closingWebcamDialog() ) , this , TQT_SLOT(sendBYEMessage()));
+				connect(m_widget, TQ_SIGNAL( closingWebcamDialog() ) , this , TQ_SLOT(sendBYEMessage()));
 
 			}
 			else
@@ -718,7 +718,7 @@ void Webcam::slotSocketRead()
 					kdDebug(14140) << k_funcinfo <<  "new timer" << m_timerId << endl;
 				}
 				m_widget=new MSNWebcamDialog(m_recipient);
-				connect(m_widget, TQT_SIGNAL( closingWebcamDialog() ) , this , TQT_SLOT(sendBYEMessage()));
+				connect(m_widget, TQ_SIGNAL( closingWebcamDialog() ) , this , TQ_SLOT(sendBYEMessage()));
 				
 				}
 				m_webcamStates[m_webcamSocket]=wsTransfer;