Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 116 insertions, 116 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp
index 2a5967f8..f987ae65 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/client.cpp
@@ -123,17 +123,17 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient")
 	m_connector = 0L;
 
 	m_pingTimer = new TQTimer( this );
-	TQObject::connect( m_pingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( sendPing() ) );
+	TQObject::connect( m_pingTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( sendPing() ) );
 
-	TQObject::connect( d->loginTask, TQT_SIGNAL( haveSessionID( uint ) ), TQT_SLOT( lt_gotSessionID( uint ) ) );
-	TQObject::connect( d->loginTask, TQT_SIGNAL( buddyListReady() ), TQT_SLOT( processPictureQueue() ) );
-	TQObject::connect( d->loginTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ),
-				TQT_SLOT( slotLoginResponse( int, const TQString& ) ) );
-	TQObject::connect( d->loginTask, TQT_SIGNAL( haveCookies() ), TQT_SLOT( slotGotCookies() ) );
-	TQObject::connect( d->listTask, TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ),
-					TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) );
-	TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
-					TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
+	TQObject::connect( d->loginTask, TQ_SIGNAL( haveSessionID( uint ) ), TQ_SLOT( lt_gotSessionID( uint ) ) );
+	TQObject::connect( d->loginTask, TQ_SIGNAL( buddyListReady() ), TQ_SLOT( processPictureQueue() ) );
+	TQObject::connect( d->loginTask, TQ_SIGNAL( loginResponse( int, const TQString& ) ),
+				TQ_SLOT( slotLoginResponse( int, const TQString& ) ) );
+	TQObject::connect( d->loginTask, TQ_SIGNAL( haveCookies() ), TQ_SLOT( slotGotCookies() ) );
+	TQObject::connect( d->listTask, TQ_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ),
+					TQ_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) );
+	TQObject::connect( d->listTask, TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
+					TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
 }
 
 Client::~Client()
@@ -156,10 +156,10 @@ void Client::connect( const TQString &host, const uint port, const TQString &use
 	m_connector = new KNetworkConnector;
 	m_connector->setOptHostPort( host, port );
 	d->stream = new ClientStream( m_connector, this );
-	TQObject::connect( d->stream, TQT_SIGNAL( connected() ), this, TQT_SLOT( cs_connected() ) );
-	TQObject::connect( d->stream, TQT_SIGNAL( error(int) ), this, TQT_SLOT( streamError(int) ) );
-	TQObject::connect( d->stream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) );
-	TQObject::connect( d->stream, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( streamDisconnected() ) );
+	TQObject::connect( d->stream, TQ_SIGNAL( connected() ), this, TQ_SLOT( cs_connected() ) );
+	TQObject::connect( d->stream, TQ_SIGNAL( error(int) ), this, TQ_SLOT( streamError(int) ) );
+	TQObject::connect( d->stream, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( streamReadyRead() ) );
+	TQObject::connect( d->stream, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( streamDisconnected() ) );
 
 	d->stream->connectToServer( host, false );
 }
@@ -193,7 +193,7 @@ void Client::close()
 		deleteTasks();
 	d->loginTask->reset();
 	if( d->stream ) {
-		TQObject::disconnect( d->stream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) );
+		TQObject::disconnect( d->stream, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( streamReadyRead() ) );
 		d->stream->deleteLater();
 	}
 	d->stream = 0L;
@@ -353,11 +353,11 @@ void Client::sendFile( unsigned int transferId, const TQString &to, const TQStri
 {
 	SendFileTask *sft = new SendFileTask( d->root );
 
-	TQObject::connect( sft, TQT_SIGNAL(complete(unsigned int)), TQT_SIGNAL(fileTransferComplete(unsigned int)) );
-	TQObject::connect( sft, TQT_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQT_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) );
-	TQObject::connect( sft, TQT_SIGNAL(error(unsigned int, int, const TQString &)), TQT_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) );
+	TQObject::connect( sft, TQ_SIGNAL(complete(unsigned int)), TQ_SIGNAL(fileTransferComplete(unsigned int)) );
+	TQObject::connect( sft, TQ_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQ_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) );
+	TQObject::connect( sft, TQ_SIGNAL(error(unsigned int, int, const TQString &)), TQ_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) );
 
-	TQObject::connect( this, TQT_SIGNAL(fileTransferCanceled( unsigned int )), sft, TQT_SLOT(canceled( unsigned int )) );
+	TQObject::connect( this, TQ_SIGNAL(fileTransferCanceled( unsigned int )), sft, TQ_SLOT(canceled( unsigned int )) );
 
 	sft->setTarget( to );
 	sft->setMessage( msg );
@@ -370,10 +370,10 @@ void Client::receiveFile( unsigned int transferId, const TQString &userId, KURL
 {
 	ReceiveFileTask *rft = new ReceiveFileTask( d->root );
 
-	TQObject::connect( rft, TQT_SIGNAL(complete(unsigned int)), TQT_SIGNAL(fileTransferComplete(unsigned int)) );
-	TQObject::connect( rft, TQT_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQT_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) );
-	TQObject::connect( rft, TQT_SIGNAL(error(unsigned int, int, const TQString &)), TQT_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) );
-	TQObject::connect( this, TQT_SIGNAL(fileTransferCanceled( unsigned int )), rft, TQT_SLOT(canceled( unsigned int )) );
+	TQObject::connect( rft, TQ_SIGNAL(complete(unsigned int)), TQ_SIGNAL(fileTransferComplete(unsigned int)) );
+	TQObject::connect( rft, TQ_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQ_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) );
+	TQObject::connect( rft, TQ_SIGNAL(error(unsigned int, int, const TQString &)), TQ_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) );
+	TQObject::connect( this, TQ_SIGNAL(fileTransferCanceled( unsigned int )), rft, TQ_SLOT(canceled( unsigned int )) );
 
 	rft->setRemoteUrl( remoteURL );
 	rft->setLocalUrl( localURL );
@@ -457,8 +457,8 @@ void Client::addBuddy( const TQString &userId, const TQString &group, const TQSt
 {
 	ModifyBuddyTask *mbt = new ModifyBuddyTask( d->root );
 
-	TQObject::connect(mbt, TQT_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool )),
-			 TQT_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool)));
+	TQObject::connect(mbt, TQ_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool )),
+			 TQ_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool)));
 
 	mbt->setType( ModifyBuddyTask::AddBuddy );
 	mbt->setTarget( userId );
@@ -471,8 +471,8 @@ void Client::removeBuddy( const TQString &userId, const TQString &group )
 {
 	ModifyBuddyTask *mbt = new ModifyBuddyTask( d->root );
 
-	TQObject::connect(mbt, TQT_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool )),
-			 TQT_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool)));
+	TQObject::connect(mbt, TQ_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool )),
+			 TQ_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool)));
 
 	mbt->setType( ModifyBuddyTask::RemoveBuddy );
 	mbt->setTarget( userId );
@@ -484,8 +484,8 @@ void Client::moveBuddy( const TQString &userId, const TQString &oldGroup, const
 {
 	ModifyBuddyTask *mbt = new ModifyBuddyTask( d->root );
 
-	TQObject::connect(mbt, TQT_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool )),
-			 TQT_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool)));
+	TQObject::connect(mbt, TQ_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool )),
+			 TQ_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool)));
 
 	mbt->setType( ModifyBuddyTask::MoveBuddy );
 	mbt->setTarget( userId );
@@ -511,7 +511,7 @@ void Client::processPictureQueue()
 
 	if( !d->pictureRequestQueue.isEmpty() )
 	{
-		TQTimer::singleShot( 1000, this, TQT_SLOT(processPictureQueue()) );
+		TQTimer::singleShot( 1000, this, TQ_SLOT(processPictureQueue()) );
 	}
 }
 
@@ -533,8 +533,8 @@ void Client::downloadPicture(  const TQString &userId, KURL url, int checksum )
 	if( !d->iconLoader )
 	{
 		d->iconLoader = new YahooBuddyIconLoader( this );
-		TQObject::connect( d->iconLoader, TQT_SIGNAL(fetchedBuddyIcon(const TQString&, const TQByteArray &, int )),
-				TQT_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &,  int ) ) );
+		TQObject::connect( d->iconLoader, TQ_SIGNAL(fetchedBuddyIcon(const TQString&, const TQByteArray &, int )),
+				TQ_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &,  int ) ) );
 	}
 
 	d->iconLoader->fetchBuddyIcon( TQString(userId), KURL(url), checksum );
@@ -658,8 +658,8 @@ void Client::saveYABEntry( YABEntry &entry )
 	ModifyYABTask *myt = new ModifyYABTask( d->root );
 	myt->setAction( ModifyYABTask::EditEntry );
 	myt->setEntry( entry );
-	TQObject::connect( myt, TQT_SIGNAL(gotEntry( YABEntry * )), this, TQT_SIGNAL( gotYABEntry( YABEntry * ) ) );
-	TQObject::connect( myt, TQT_SIGNAL(error( YABEntry *, const TQString &)), this, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )));
+	TQObject::connect( myt, TQ_SIGNAL(gotEntry( YABEntry * )), this, TQ_SIGNAL( gotYABEntry( YABEntry * ) ) );
+	TQObject::connect( myt, TQ_SIGNAL(error( YABEntry *, const TQString &)), this, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )));
 	myt->go(true);
 }
 
@@ -668,8 +668,8 @@ void Client::addYABEntry(  YABEntry &entry )
 	ModifyYABTask *myt = new ModifyYABTask( d->root );
 	myt->setAction( ModifyYABTask::AddEntry );
 	myt->setEntry( entry );
-	TQObject::connect( myt, TQT_SIGNAL(gotEntry( YABEntry * )), this, TQT_SIGNAL( gotYABEntry( YABEntry * ) ) );
-	TQObject::connect( myt, TQT_SIGNAL(error( YABEntry *, const TQString &)), this, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )));
+	TQObject::connect( myt, TQ_SIGNAL(gotEntry( YABEntry * )), this, TQ_SIGNAL( gotYABEntry( YABEntry * ) ) );
+	TQObject::connect( myt, TQ_SIGNAL(error( YABEntry *, const TQString &)), this, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )));
 	myt->go(true);
 }
 
@@ -839,104 +839,104 @@ void Client::initTasks()
 		return;
 
 	d->statusTask = new StatusNotifierTask( d->root );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ),
-				TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
-				TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ),
-				TQT_SLOT( slotLoginResponse( int, const TQString& ) ) );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ),
-				TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ) );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationAccepted( const TQString& ) ),
-				TQT_SIGNAL( authorizationAccepted( const TQString& ) ) );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ),
-				TQT_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ) );
+	TQObject::connect( d->statusTask, TQ_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ),
+				TQ_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) );
+	TQObject::connect( d->statusTask, TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
+				TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
+	TQObject::connect( d->statusTask, TQ_SIGNAL( loginResponse( int, const TQString& ) ),
+				TQ_SLOT( slotLoginResponse( int, const TQString& ) ) );
+	TQObject::connect( d->statusTask, TQ_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ),
+				TQ_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ) );
+	TQObject::connect( d->statusTask, TQ_SIGNAL( authorizationAccepted( const TQString& ) ),
+				TQ_SIGNAL( authorizationAccepted( const TQString& ) ) );
+	TQObject::connect( d->statusTask, TQ_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ),
+				TQ_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ) );
 
 	d->mailTask = new MailNotifierTask( d->root );
-	TQObject::connect( d->mailTask, TQT_SIGNAL( mailNotify(const TQString&, const TQString&, int) ),
-				TQT_SIGNAL( mailNotify(const TQString&, const TQString&, int) ) );
+	TQObject::connect( d->mailTask, TQ_SIGNAL( mailNotify(const TQString&, const TQString&, int) ),
+				TQ_SIGNAL( mailNotify(const TQString&, const TQString&, int) ) );
 
 	d->messageReceiverTask = new MessageReceiverTask( d->root );
-	TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ),
-				TQT_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ) );
-	TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( systemMessage(const TQString&) ),
-				TQT_SIGNAL( systemMessage(const TQString&) ) );
-	TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotTypingNotify(const TQString &, int) ),
-				TQT_SIGNAL( typingNotify(const TQString &, int) ) );
-	TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotBuzz( const TQString &, long ) ),
-				TQT_SIGNAL( gotBuzz( const TQString &, long ) ) );
-	TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotWebcamInvite(const TQString &) ),
-				TQT_SIGNAL( gotWebcamInvite(const TQString &) ) );
+	TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ),
+				TQ_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ) );
+	TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( systemMessage(const TQString&) ),
+				TQ_SIGNAL( systemMessage(const TQString&) ) );
+	TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotTypingNotify(const TQString &, int) ),
+				TQ_SIGNAL( typingNotify(const TQString &, int) ) );
+	TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotBuzz( const TQString &, long ) ),
+				TQ_SIGNAL( gotBuzz( const TQString &, long ) ) );
+	TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotWebcamInvite(const TQString &) ),
+				TQ_SIGNAL( gotWebcamInvite(const TQString &) ) );
 
 	d->pictureNotifierTask = new PictureNotifierTask( d->root );
-	TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureStatusNotify( const TQString &, int ) ),
-				TQT_SIGNAL( pictureStatusNotify( const TQString &, int ) ) );
-	TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureChecksumNotify( const TQString &, int ) ),
-				TQT_SIGNAL( pictureChecksumNotify( const TQString &, int ) ) );
-	TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ),
-				TQT_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ) );
-	TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureRequest( const TQString & ) ),
-				TQT_SIGNAL( pictureRequest( const TQString & ) ) );
-	TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureUploaded( const TQString &, int ) ),
-				TQT_SIGNAL( pictureUploaded( const TQString &, int ) ) );
+	TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureStatusNotify( const TQString &, int ) ),
+				TQ_SIGNAL( pictureStatusNotify( const TQString &, int ) ) );
+	TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureChecksumNotify( const TQString &, int ) ),
+				TQ_SIGNAL( pictureChecksumNotify( const TQString &, int ) ) );
+	TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ),
+				TQ_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ) );
+	TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureRequest( const TQString & ) ),
+				TQ_SIGNAL( pictureRequest( const TQString & ) ) );
+	TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureUploaded( const TQString &, int ) ),
+				TQ_SIGNAL( pictureUploaded( const TQString &, int ) ) );
 
 	d->webcamTask = new WebcamTask( d->root );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ),
-				TQT_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamNotAvailable( const TQString & ) ),
-				TQT_SIGNAL( webcamNotAvailable( const TQString & ) ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamClosed( const TQString &, int ) ),
-				TQT_SIGNAL( webcamClosed( const TQString &, int ) ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamPaused(const TQString&) ),
-				TQT_SIGNAL( webcamPaused(const TQString&) ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( readyForTransmission() ),
-				TQT_SIGNAL( webcamReadyForTransmission() ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( stopTransmission() ),
-				TQT_SIGNAL( webcamStopTransmission() ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( viewerJoined( const TQString &) ),
-				TQT_SIGNAL( webcamViewerJoined( const TQString &) ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( viewerLeft( const TQString &) ),
-				TQT_SIGNAL( webcamViewerLeft( const TQString &) ) );
-	TQObject::connect( d->webcamTask, TQT_SIGNAL( viewerRequest( const TQString &) ),
-				TQT_SIGNAL( webcamViewerRequest( const TQString &) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ),
+				TQ_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamNotAvailable( const TQString & ) ),
+				TQ_SIGNAL( webcamNotAvailable( const TQString & ) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamClosed( const TQString &, int ) ),
+				TQ_SIGNAL( webcamClosed( const TQString &, int ) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamPaused(const TQString&) ),
+				TQ_SIGNAL( webcamPaused(const TQString&) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( readyForTransmission() ),
+				TQ_SIGNAL( webcamReadyForTransmission() ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( stopTransmission() ),
+				TQ_SIGNAL( webcamStopTransmission() ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( viewerJoined( const TQString &) ),
+				TQ_SIGNAL( webcamViewerJoined( const TQString &) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( viewerLeft( const TQString &) ),
+				TQ_SIGNAL( webcamViewerLeft( const TQString &) ) );
+	TQObject::connect( d->webcamTask, TQ_SIGNAL( viewerRequest( const TQString &) ),
+				TQ_SIGNAL( webcamViewerRequest( const TQString &) ) );
 
 	d->conferenceTask = new ConferenceTask( d->root );
-	TQObject::connect( d->conferenceTask, TQT_SIGNAL( gotInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ),
-				TQT_SIGNAL( gotConferenceInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ) );
-	TQObject::connect( d->conferenceTask, TQT_SIGNAL( gotMessage( const TQString &, const TQString &, const TQString & ) ),
-				TQT_SIGNAL( gotConferenceMessage( const TQString &, const TQString &, const TQString & ) ) );
-	TQObject::connect( d->conferenceTask, TQT_SIGNAL( userJoined( const TQString &, const TQString & ) ),
-				TQT_SIGNAL( confUserJoined( const TQString &, const TQString & ) ) );
-	TQObject::connect( d->conferenceTask, TQT_SIGNAL( userLeft( const TQString &, const TQString & ) ),
-				TQT_SIGNAL( confUserLeft( const TQString &, const TQString & ) ) );
-	TQObject::connect( d->conferenceTask, TQT_SIGNAL( userDeclined( const TQString &, const TQString &, const TQString & ) ),
-				TQT_SIGNAL( confUserDeclined( const TQString &, const TQString &, const TQString & ) ) );
+	TQObject::connect( d->conferenceTask, TQ_SIGNAL( gotInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ),
+				TQ_SIGNAL( gotConferenceInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ) );
+	TQObject::connect( d->conferenceTask, TQ_SIGNAL( gotMessage( const TQString &, const TQString &, const TQString & ) ),
+				TQ_SIGNAL( gotConferenceMessage( const TQString &, const TQString &, const TQString & ) ) );
+	TQObject::connect( d->conferenceTask, TQ_SIGNAL( userJoined( const TQString &, const TQString & ) ),
+				TQ_SIGNAL( confUserJoined( const TQString &, const TQString & ) ) );
+	TQObject::connect( d->conferenceTask, TQ_SIGNAL( userLeft( const TQString &, const TQString & ) ),
+				TQ_SIGNAL( confUserLeft( const TQString &, const TQString & ) ) );
+	TQObject::connect( d->conferenceTask, TQ_SIGNAL( userDeclined( const TQString &, const TQString &, const TQString & ) ),
+				TQ_SIGNAL( confUserDeclined( const TQString &, const TQString &, const TQString & ) ) );
 
 	d->yabTask = new YABTask( d->root );
-	TQObject::connect( d->yabTask, TQT_SIGNAL( gotEntry( YABEntry * ) ),
-				TQT_SIGNAL( gotYABEntry( YABEntry * ) ) );
-	TQObject::connect( d->yabTask, TQT_SIGNAL( gotRevision( long, bool ) ),
-				TQT_SIGNAL( gotYABRevision( long, bool ) ) );
+	TQObject::connect( d->yabTask, TQ_SIGNAL( gotEntry( YABEntry * ) ),
+				TQ_SIGNAL( gotYABEntry( YABEntry * ) ) );
+	TQObject::connect( d->yabTask, TQ_SIGNAL( gotRevision( long, bool ) ),
+				TQ_SIGNAL( gotYABRevision( long, bool ) ) );
 
 	d->fileTransferTask = new FileTransferNotifierTask( d->root );
-	TQObject::connect( d->fileTransferTask, TQT_SIGNAL(incomingFileTransfer( const TQString &, const TQString &,
+	TQObject::connect( d->fileTransferTask, TQ_SIGNAL(incomingFileTransfer( const TQString &, const TQString &,
 					long, const TQString &, const TQString &, unsigned long, const TQPixmap & )),
-				TQT_SIGNAL(incomingFileTransfer( const TQString &, const TQString &,
+				TQ_SIGNAL(incomingFileTransfer( const TQString &, const TQString &,
 					long, const TQString &, const TQString &, unsigned long, const TQPixmap & )) );
 
 	d->yahooChatTask = new YahooChatTask( d->root );
-	TQObject::connect( d->yahooChatTask, TQT_SIGNAL(gotYahooChatCategories( const TQDomDocument & )),
-				TQT_SIGNAL(gotYahooChatCategories( const TQDomDocument & )) );
-	TQObject::connect( d->yahooChatTask, TQT_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )),
-				TQT_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) );
-	TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ),
-				TQT_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ) );
-	TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool  ) ),
-				TQT_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool  ) ) );
-	TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatBuddyHasLeft(TQString,TQString) ),
-				TQT_SIGNAL(chatBuddyHasLeft(TQString,TQString) ) );
-	TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ),
-				TQT_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ) );
+	TQObject::connect( d->yahooChatTask, TQ_SIGNAL(gotYahooChatCategories( const TQDomDocument & )),
+				TQ_SIGNAL(gotYahooChatCategories( const TQDomDocument & )) );
+	TQObject::connect( d->yahooChatTask, TQ_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )),
+				TQ_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) );
+	TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ),
+				TQ_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ) );
+	TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool  ) ),
+				TQ_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool  ) ) );
+	TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatBuddyHasLeft(TQString,TQString) ),
+				TQ_SIGNAL(chatBuddyHasLeft(TQString,TQString) ) );
+	TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ),
+				TQ_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ) );
 }
 
 void Client::deleteTasks()