diff options
Diffstat (limited to 'kopete/protocols/oscar/liboscar')
19 files changed, 123 insertions, 123 deletions
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 1f7ff117..d8712416 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -43,7 +43,7 @@ void AimLoginTask::onGo() //send Snac 17,06 sendAuthStringRequest(); //when we have the authKey, login - connect( this, TQT_SIGNAL( haveAuthKey() ), this, TQT_SLOT( sendLoginRequest() ) ); + connect( this, TQ_SIGNAL( haveAuthKey() ), this, TQ_SLOT( sendLoginRequest() ) ); } bool AimLoginTask::forMe( Transfer* transfer ) const diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 10fec375..5f487058 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -165,10 +165,10 @@ Client::Client( TQObject* parent ) d->awayMsgRequestTimer = new TQTimer(); d->codecProvider = &defaultCodecProvider; - connect( this, TQT_SIGNAL( redirectionFinished( WORD ) ), - this, TQT_SLOT( checkRedirectionQueue( WORD ) ) ); - connect( d->awayMsgRequestTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( nextICQAwayMessageRequest() ) ); + connect( this, TQ_SIGNAL( redirectionFinished( WORD ) ), + this, TQ_SLOT( checkRedirectionQueue( WORD ) ) ); + connect( d->awayMsgRequestTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( nextICQAwayMessageRequest() ) ); } Client::~Client() @@ -194,10 +194,10 @@ void Client::connectToServer( Connection *c, const TQString& server, bool auth ) if ( auth == true ) { m_loginTask = new StageOneLoginTask( c->rootTask() ); - connect( m_loginTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + connect( m_loginTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); } - connect( c, TQT_SIGNAL( socketError( int, const TQString& ) ), this, TQT_SLOT( determineDisconnection( int, const TQString& ) ) ); + connect( c, TQ_SIGNAL( socketError( int, const TQString& ) ), this, TQ_SLOT( determineDisconnection( int, const TQString& ) ) ); c->connectToServer(server, auth); } @@ -343,7 +343,7 @@ void Client::lt_loginFinished() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage two done. setting up services" << endl; initializeStaticTasks(); ServiceSetupTask* ssTask = new ServiceSetupTask( d->connections.defaultConnection()->rootTask() ); - connect( ssTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( serviceSetupFinished() ) ); + connect( ssTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( serviceSetupFinished() ) ); ssTask->go( true ); //fire and forget m_loginTaskTwo->deleteLater(); m_loginTaskTwo = 0; @@ -351,7 +351,7 @@ void Client::lt_loginFinished() else if ( d->stage == ClientPrivate::StageOne ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage one login done" << endl; - disconnect( m_loginTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + disconnect( m_loginTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); if ( m_loginTask->statusCode() == 0 ) //we can start stage two { @@ -362,7 +362,7 @@ void Client::lt_loginFinished() d->port = m_loginTask->bosPort().toUInt(); d->cookie = m_loginTask->loginCookie(); close(); - TQTimer::singleShot( 100, this, TQT_SLOT(startStageTwo() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT(startStageTwo() ) ); } else { @@ -385,11 +385,11 @@ void Client::startStageTwo() //create the new login task m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() ); m_loginTaskTwo->setCookie( d->cookie ); - TQObject::connect( m_loginTaskTwo, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + TQObject::connect( m_loginTaskTwo, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); //connect - TQObject::connect( c, TQT_SIGNAL( connected() ), this, TQT_SLOT( streamConnected() ) ); + TQObject::connect( c, TQ_SIGNAL( connected() ), this, TQ_SLOT( streamConnected() ) ); connectToServer( c, d->host, false ) ; } @@ -412,8 +412,8 @@ void Client::serviceSetupFinished() } OfflineMessagesTask *offlineMsgTask = new OfflineMessagesTask( c->rootTask() ); - connect( offlineMsgTask, TQT_SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ), - this, TQT_SIGNAL( messageReceived(const Oscar::Message& ) ) ); + connect( offlineMsgTask, TQ_SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ), + this, TQ_SIGNAL( messageReceived(const Oscar::Message& ) ) ); offlineMsgTask->go( true ); } @@ -628,34 +628,34 @@ void Client::initializeStaticTasks() d->typingNotifyTask = new TypingNotifyTask( c->rootTask() ); d->ssiModifyTask = new SSIModifyTask( c->rootTask(), true ); - connect( d->onlineNotifier, TQT_SIGNAL( userIsOnline( const TQString&, const UserDetails& ) ), - this, TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ) ); - connect( d->onlineNotifier, TQT_SIGNAL( userIsOffline( const TQString&, const UserDetails& ) ), - this, TQT_SLOT( offlineUser( const TQString&, const UserDetails & ) ) ); + connect( d->onlineNotifier, TQ_SIGNAL( userIsOnline( const TQString&, const UserDetails& ) ), + this, TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ) ); + connect( d->onlineNotifier, TQ_SIGNAL( userIsOffline( const TQString&, const UserDetails& ) ), + this, TQ_SLOT( offlineUser( const TQString&, const UserDetails & ) ) ); - connect( d->ownStatusTask, TQT_SIGNAL( gotInfo() ), this, TQT_SLOT( haveOwnUserInfo() ) ); - connect( d->ownStatusTask, TQT_SIGNAL( buddyIconUploadRequested() ), this, - TQT_SIGNAL( iconNeedsUploading() ) ); + connect( d->ownStatusTask, TQ_SIGNAL( gotInfo() ), this, TQ_SLOT( haveOwnUserInfo() ) ); + connect( d->ownStatusTask, TQ_SIGNAL( buddyIconUploadRequested() ), this, + TQ_SIGNAL( iconNeedsUploading() ) ); - connect( d->messageReceiverTask, TQT_SIGNAL( receivedMessage( const Oscar::Message& ) ), - this, TQT_SLOT( receivedMessage( const Oscar::Message& ) ) ); + connect( d->messageReceiverTask, TQ_SIGNAL( receivedMessage( const Oscar::Message& ) ), + this, TQ_SLOT( receivedMessage( const Oscar::Message& ) ) ); - connect( d->ssiAuthTask, TQT_SIGNAL( authRequested( const TQString&, const TQString& ) ), - this, TQT_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ) ); - connect( d->ssiAuthTask, TQT_SIGNAL( authReplied( const TQString&, const TQString&, bool ) ), - this, TQT_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ) ); + connect( d->ssiAuthTask, TQ_SIGNAL( authRequested( const TQString&, const TQString& ) ), + this, TQ_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ) ); + connect( d->ssiAuthTask, TQ_SIGNAL( authReplied( const TQString&, const TQString&, bool ) ), + this, TQ_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ) ); - connect( d->icqInfoTask, TQT_SIGNAL( receivedInfoFor( const TQString&, unsigned int ) ), - this, TQT_SLOT( receivedIcqInfo( const TQString&, unsigned int ) ) ); + connect( d->icqInfoTask, TQ_SIGNAL( receivedInfoFor( const TQString&, unsigned int ) ), + this, TQ_SLOT( receivedIcqInfo( const TQString&, unsigned int ) ) ); - connect( d->userInfoTask, TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), - this, TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ) ); - connect( d->userInfoTask, TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), - this, TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ) ); - connect( d->typingNotifyTask, TQT_SIGNAL( typingStarted( const TQString& ) ), - this, TQT_SIGNAL( userStartedTyping( const TQString& ) ) ); - connect( d->typingNotifyTask, TQT_SIGNAL( typingFinished( const TQString& ) ), - this, TQT_SIGNAL( userStoppedTyping( const TQString& ) ) ); + connect( d->userInfoTask, TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), + this, TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ) ); + connect( d->userInfoTask, TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), + this, TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ) ); + connect( d->typingNotifyTask, TQ_SIGNAL( typingStarted( const TQString& ) ), + this, TQ_SIGNAL( userStartedTyping( const TQString& ) ) ); + connect( d->typingNotifyTask, TQ_SIGNAL( typingFinished( const TQString& ) ), + this, TQ_SIGNAL( userStoppedTyping( const TQString& ) ) ); } void Client::removeGroup( const TQString& groupName ) @@ -808,8 +808,8 @@ void Client::sendWarning( const TQString& contact, bool anonymous ) WarningTask* warnTask = new WarningTask( c->rootTask() ); warnTask->setContact( contact ); warnTask->setAnonymous( anonymous ); - TQObject::connect( warnTask, TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), - this, TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); + TQObject::connect( warnTask, TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); warnTask->go( true ); } @@ -974,9 +974,9 @@ void Client::whitePagesSearch( const ICQWPSearchInfo& info ) if ( !c ) return; UserSearchTask* ust = new UserSearchTask( c->rootTask() ); - connect( ust, TQT_SIGNAL( foundUser( const ICQSearchResult& ) ), - this, TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); - connect( ust, TQT_SIGNAL( searchFinished( int ) ), this, TQT_SIGNAL( endOfSearch( int ) ) ); + connect( ust, TQ_SIGNAL( foundUser( const ICQSearchResult& ) ), + this, TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); + connect( ust, TQ_SIGNAL( searchFinished( int ) ), this, TQ_SIGNAL( endOfSearch( int ) ) ); ust->go( true ); //onGo does nothing in this task. This is just here so autodelete works ust->searchWhitePages( info ); } @@ -987,9 +987,9 @@ void Client::uinSearch( const TQString& uin ) if ( !c ) return; UserSearchTask* ust = new UserSearchTask( c->rootTask() ); - connect( ust, TQT_SIGNAL( foundUser( const ICQSearchResult& ) ), - this, TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); - connect( ust, TQT_SIGNAL( searchFinished( int ) ), this, TQT_SIGNAL( endOfSearch( int ) ) ); + connect( ust, TQ_SIGNAL( foundUser( const ICQSearchResult& ) ), + this, TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); + connect( ust, TQ_SIGNAL( searchFinished( int ) ), this, TQ_SIGNAL( endOfSearch( int ) ) ); ust->go( true ); //onGo does nothing in this task. This is just here so autodelete works ust->searchUserByUIN( uin ); } @@ -1079,8 +1079,8 @@ void Client::requestBuddyIcon( const TQString& user, const TQByteArray& hash, BY return; BuddyIconTask* bit = new BuddyIconTask( c->rootTask() ); - connect( bit, TQT_SIGNAL( haveIcon( const TQString&, TQByteArray ) ), - this, TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ) ); + connect( bit, TQ_SIGNAL( haveIcon( const TQString&, TQByteArray ) ), + this, TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ) ); bit->requestIconFor( user ); bit->setHashType( hashType ); bit->setHash( hash ); @@ -1118,8 +1118,8 @@ void Client::requestServerRedirect( WORD family, WORD exchange, srt->setChatRoom( room ); } - connect( srt, TQT_SIGNAL( haveServer( const TQString&, const TQByteArray&, WORD ) ), - this, TQT_SLOT( haveServerForRedirect( const TQString&, const TQByteArray&, WORD ) ) ); + connect( srt, TQ_SIGNAL( haveServer( const TQString&, const TQByteArray&, WORD ) ), + this, TQ_SLOT( haveServerForRedirect( const TQString&, const TQByteArray&, WORD ) ) ); srt->setService( family ); srt->go( true ); } @@ -1147,11 +1147,11 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo //create the new login task m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() ); m_loginTaskTwo->setCookie( cookie ); - TQObject::connect( m_loginTaskTwo, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverRedirectFinished() ) ); + TQObject::connect( m_loginTaskTwo, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverRedirectFinished() ) ); //connect connectToServer( c, d->host, false ); - TQObject::connect( c, TQT_SIGNAL( connected() ), this, TQT_SLOT( streamConnected() ) ); + TQObject::connect( c, TQ_SIGNAL( connected() ), this, TQ_SLOT( streamConnected() ) ); if ( srt ) d->connections.addChatInfoForConnection( c, srt->chatExchange(), srt->chatRoomName() ); @@ -1177,8 +1177,8 @@ void Client::serverRedirectFinished() if ( d->currentRedirect == 0x000D ) { - connect( this, TQT_SIGNAL( chatNavigationConnected() ), - this, TQT_SLOT( requestChatNavLimits() ) ); + connect( this, TQ_SIGNAL( chatNavigationConnected() ), + this, TQ_SLOT( requestChatNavLimits() ) ); emit chatNavigationConnected(); } @@ -1199,12 +1199,12 @@ void Client::serverRedirectFinished() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting up chat connection" << endl; ChatServiceTask* cst = new ChatServiceTask( c->rootTask(), exchange, roomName ); - connect( cst, TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - connect( cst, TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - connect( cst, TQT_SIGNAL( newChatMessage( const Oscar::Message& ) ), - this, TQT_SIGNAL( messageReceived( const Oscar::Message& ) ) ); + connect( cst, TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + connect( cst, TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + connect( cst, TQ_SIGNAL( newChatMessage( const Oscar::Message& ) ), + this, TQ_SIGNAL( messageReceived( const Oscar::Message& ) ) ); } emit chatRoomConnected( exchange, roomName ); } @@ -1235,8 +1235,8 @@ void Client::requestChatNavLimits() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting chat nav service limits" << endl; ChatNavServiceTask* cnst = new ChatNavServiceTask( c->rootTask() ); cnst->setRequestType( ChatNavServiceTask::Limits ); - TQObject::connect( cnst, TQT_SIGNAL( haveChatExchanges( const TQValueList<int>& ) ), - this, TQT_SLOT( setChatExchangeList( const TQValueList<int>& ) ) ); + TQObject::connect( cnst, TQ_SIGNAL( haveChatExchanges( const TQValueList<int>& ) ), + this, TQ_SLOT( setChatExchangeList( const TQValueList<int>& ) ) ); cnst->go( true ); //autodelete } @@ -1283,8 +1283,8 @@ void Client::joinChatRoom( const TQString& roomName, int exchange ) kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "joining the chat room '" << roomName << "' on exchange " << exchange << endl; ChatNavServiceTask* cnst = new ChatNavServiceTask( c->rootTask() ); - connect( cnst, TQT_SIGNAL( connectChat( WORD, TQByteArray, WORD, const TQString& ) ), - this, TQT_SLOT( setupChatConnection( WORD, TQByteArray, WORD, const TQString& ) ) ); + connect( cnst, TQ_SIGNAL( connectChat( WORD, TQByteArray, WORD, const TQString& ) ), + this, TQ_SLOT( setupChatConnection( WORD, TQByteArray, WORD, const TQString& ) ) ); cnst->createRoom( exchange, roomName ); } diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp index 1cdebe01..fbfa65d9 100644 --- a/kopete/protocols/oscar/liboscar/connection.cpp +++ b/kopete/protocols/oscar/liboscar/connection.cpp @@ -77,14 +77,14 @@ Connection::~Connection() void Connection::setClient( Client* c ) { d->client = c; - connect( c, TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loggedIn() ) ); + connect( c, TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( loggedIn() ) ); } void Connection::connectToServer( const TQString& host, bool auth ) { - connect( d->clientStream, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( streamSocketError( int ) ) ); - connect( d->clientStream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) ); - connect( d->clientStream, TQT_SIGNAL( connected() ), this, TQT_SIGNAL( connected() ) ); + connect( d->clientStream, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( streamSocketError( int ) ) ); + connect( d->clientStream, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( streamReadyRead() ) ); + connect( d->clientStream, TQ_SIGNAL( connected() ), this, TQ_SIGNAL( connected() ) ); d->clientStream->connectToServer( host, auth ); } diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp index 91bb2434..2206d1a0 100644 --- a/kopete/protocols/oscar/liboscar/logintask.cpp +++ b/kopete/protocols/oscar/liboscar/logintask.cpp @@ -63,7 +63,7 @@ bool StageOneLoginTask::take( Transfer* transfer ) m_closeTask = new CloseConnectionTask( client()->rootTask() ); //connect finished signal - connect( m_closeTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeTaskFinished() ) ); + connect( m_closeTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeTaskFinished() ) ); m_icqTask->go( true ); } else @@ -80,7 +80,7 @@ bool StageOneLoginTask::take( Transfer* transfer ) send( ft ); m_aimTask = new AimLoginTask( client()->rootTask() ); - connect( m_aimTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( aimTaskFinished() ) ); + connect( m_aimTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( aimTaskFinished() ) ); m_aimTask->go( true ); } return true; @@ -145,8 +145,8 @@ StageTwoLoginTask::StageTwoLoginTask( Task* parent ) m_versionTask = new ServerVersionsTask( rootTask ); m_rateTask = new RateInfoTask( rootTask ); - TQObject::connect( m_versionTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( versionTaskFinished() ) ); - TQObject::connect( m_rateTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( rateTaskFinished() ) ); + TQObject::connect( m_versionTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( versionTaskFinished() ) ); + TQObject::connect( m_rateTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( rateTaskFinished() ) ); } StageTwoLoginTask::~StageTwoLoginTask() diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index 22f55500..03fd80bc 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -38,11 +38,11 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ ) mSocket->enableRead( true ); // connect signals and slots - TQObject::connect( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( gotError ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( closed () ), this, TQ_SLOT ( slotConnectionClosed () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( readyRead () ), this, TQ_SLOT ( slotReadyRead () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotBytesWritten ( int ) ) ); } bool KNetworkByteStream::connect( TQString host, TQString service ) diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 793608d6..59bfcc11 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -112,13 +112,13 @@ ClientStream::ClientStream(Connector *conn, TQObject *parent) d = new Private; d->mode = ClientMode; d->conn = conn; - connect( d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()) ); - connect( d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()) ); - connect( &d->client, TQT_SIGNAL( outgoingData( const TQByteArray& ) ), TQT_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); - connect( &d->client, TQT_SIGNAL( incomingData() ), TQT_SLOT ( cp_incomingData() ) ); + connect( d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()) ); + connect( d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()) ); + connect( &d->client, TQ_SIGNAL( outgoingData( const TQByteArray& ) ), TQ_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); + connect( &d->client, TQ_SIGNAL( incomingData() ), TQ_SLOT ( cp_incomingData() ) ); d->noop_time = 0; - connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop())); + connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop())); } ClientStream::~ClientStream() @@ -329,11 +329,11 @@ void ClientStream::cp_incomingData() void ClientStream::cr_connected() { d->bs = d->conn->stream(); - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished())); - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); - connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); d->state = Active; if ( d->noop_time ) @@ -408,7 +408,7 @@ void ClientStream::processNext() { if( !d->in.isEmpty() ) { - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } } diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 7bbe38e5..10d54957 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -33,8 +33,8 @@ KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ ) mByteStream = new KNetworkByteStream( this ); - connect( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - connect( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); + connect( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + connect( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); mPort = 0; } diff --git a/kopete/protocols/oscar/liboscar/rateclass.cpp b/kopete/protocols/oscar/liboscar/rateclass.cpp index 9f0a7601..66958a8a 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.cpp +++ b/kopete/protocols/oscar/liboscar/rateclass.cpp @@ -194,7 +194,7 @@ void RateClass::setupTimer() } else { - TQTimer::singleShot( ttns, this, TQT_SLOT( slotSend() ) ); //or send later + TQTimer::singleShot( ttns, this, TQ_SLOT( slotSend() ) ); //or send later } } } diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp index 75a30f63..65f37648 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp @@ -60,7 +60,7 @@ void RateClassManager::reset() void RateClassManager::registerClass( RateClass* rc ) { - TQObject::connect( rc, TQT_SIGNAL( dataReady( Transfer* ) ), this, TQT_SLOT( transferReady( Transfer* ) ) ); + TQObject::connect( rc, TQ_SIGNAL( dataReady( Transfer* ) ), this, TQ_SLOT( transferReady( Transfer* ) ) ); d->classList.append( rc ); } diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.cpp b/kopete/protocols/oscar/liboscar/rateinfotask.cpp index b918fe48..8ece4bd2 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/rateinfotask.cpp @@ -32,7 +32,7 @@ using namespace Oscar; RateInfoTask::RateInfoTask( Task* parent ) : Task( parent ) { - connect( this, TQT_SIGNAL( gotRateLimits() ), this, TQT_SLOT( sendRateInfoAck() ) ); + connect( this, TQ_SIGNAL( gotRateLimits() ), this, TQ_SLOT( sendRateInfoAck() ) ); } diff --git a/kopete/protocols/oscar/liboscar/safedelete.cpp b/kopete/protocols/oscar/liboscar/safedelete.cpp index 9de147f0..2b466e68 100644 --- a/kopete/protocols/oscar/liboscar/safedelete.cpp +++ b/kopete/protocols/oscar/liboscar/safedelete.cpp @@ -110,7 +110,7 @@ SafeDeleteLater::SafeDeleteLater() { list.setAutoDelete(true); self = this; - TQTimer::singleShot(0, this, TQT_SLOT(explode())); + TQTimer::singleShot(0, this, TQ_SLOT(explode())); } SafeDeleteLater::~SafeDeleteLater() diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp index af4dd08c..20aac363 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp @@ -47,14 +47,14 @@ ServiceSetupTask::ServiceSetupTask( Task* parent ) m_ssiListTask = new SSIListTask( parent ); m_ssiActivateTask = new SSIActivateTask( parent ); - TQObject::connect( m_ssiListTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_ssiParamTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_prmTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_icbmTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_blmLimitsTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_profileTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_locRightsTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_ssiActivateTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); + TQObject::connect( m_ssiListTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_ssiParamTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_prmTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_icbmTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_blmLimitsTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_profileTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_locRightsTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_ssiActivateTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); } diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.cpp b/kopete/protocols/oscar/liboscar/ssilisttask.cpp index 55236339..963682b3 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.cpp +++ b/kopete/protocols/oscar/liboscar/ssilisttask.cpp @@ -26,9 +26,9 @@ SSIListTask::SSIListTask( Task* parent ) : Task( parent ) { m_ssiManager = client()->ssiManager(); - TQObject::connect( this, TQT_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newContact( const Oscar::SSI& ) ) ); - TQObject::connect( this, TQT_SIGNAL( newGroup( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newGroup( const Oscar::SSI& ) ) ); - TQObject::connect( this, TQT_SIGNAL( newItem( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newItem( const Oscar::SSI& ) ) ); + TQObject::connect( this, TQ_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQ_SLOT( newContact( const Oscar::SSI& ) ) ); + TQObject::connect( this, TQ_SIGNAL( newGroup( const Oscar::SSI& ) ), m_ssiManager, TQ_SLOT( newGroup( const Oscar::SSI& ) ) ); + TQObject::connect( this, TQ_SIGNAL( newItem( const Oscar::SSI& ) ), m_ssiManager, TQ_SLOT( newItem( const Oscar::SSI& ) ) ); } diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index d7634210..c27f6434 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -46,7 +46,7 @@ Task::Task(Task *parent) { init(); d->client = parent->client(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Connection* parent, bool) @@ -54,7 +54,7 @@ Task::Task(Connection* parent, bool) { init(); d->client = parent; - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::~Task() @@ -173,7 +173,7 @@ void Task::onDisconnect() d->statusString = tr("Disconnected"); // delay this so that tasks that react don't block the shutdown - TQTimer::singleShot(0, this, TQT_SLOT(done())); + TQTimer::singleShot(0, this, TQ_SLOT(done())); } } diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp index 77563c05..070e69cc 100644 --- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp +++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp @@ -10,12 +10,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc myConnector->setOptHostPort( "login.oscar.aol.com", 5190 ); myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); // notify and start sending - //connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) ); + //connect( myTestObject, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotWarning(int) ) ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp index d1025059..4cba0a56 100644 --- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp @@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + //connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient = new Client(); myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" ); myConnection->setClient( myClient ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp index 410b6021..a8e667a3 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp @@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + //connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient = new Client(); myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" ); myConnection->setClient( myClient ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } @@ -36,7 +36,7 @@ void LoginTest::slotDoTest() myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); - TQTimer::singleShot( 10000, this, TQT_SLOT(runAddGroupTest() ) ); + TQTimer::singleShot( 10000, this, TQ_SLOT(runAddGroupTest() ) ); connected = true; } @@ -59,7 +59,7 @@ void LoginTest::runAddGroupTest() tqDebug( "running ssi group add test" ); TQString group = TQString::fromLatin1( "dummygroup" ); myClient->addGroup( group ); - TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( runDelGroupTest() ) ); } void LoginTest::runDelGroupTest() diff --git a/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp index d634f5b9..0c917fd2 100644 --- a/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp @@ -51,7 +51,7 @@ void KUnitTest::registerTests() KUnitTest::KUnitTest() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkRun()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkRun()) ); m_tests.setAutoDelete( TRUE ); // m_qtests.setAutoDelete( TRUE ); @@ -153,8 +153,8 @@ int KUnitTest::runTests() //void KUnitTest::addTester( TQTester *test ) //{ // m_qtests.insert( test, test ); -// connect( test, TQT_SIGNAL(destroyed(TQObject*)), -// TQT_SLOT(qtesterDone(TQObject* )) ); +// connect( test, TQ_SIGNAL(destroyed(TQObject*)), +// TQ_SLOT(qtesterDone(TQObject* )) ); //} void KUnitTest::qtesterDone( TQObject *obj ) diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp index 8d75b79d..2c9fd0a9 100644 --- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp @@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + //connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient = new Client(); myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" ); myConnection->setClient( myClient ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } @@ -36,8 +36,8 @@ void LoginTest::slotDoTest() myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); - //TQObject::connect( myClient, TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( runUserInfoTest())); - //TQTimer::singleShot( 6000, this, TQT_SLOT(runUserInfoTest() ) ); + //TQObject::connect( myClient, TQ_SIGNAL( userIsOnline( const TQString& ) ), this, TQ_SLOT( runUserInfoTest())); + //TQTimer::singleShot( 6000, this, TQ_SLOT(runUserInfoTest() ) ); connected = true; } |