From 40393e30bb743346b6b40bf130da35419c12ebdc Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 17:34:53 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f) --- kopete/protocols/gadu/gaduaccount.cpp | 76 ++-- kopete/protocols/gadu/gaduaddcontactpage.cpp | 2 +- kopete/protocols/gadu/gaduaway.cpp | 2 +- kopete/protocols/gadu/gaducommands.cpp | 12 +- kopete/protocols/gadu/gaducontact.cpp | 14 +- kopete/protocols/gadu/gadudcc.cpp | 2 +- kopete/protocols/gadu/gadudccserver.cpp | 4 +- kopete/protocols/gadu/gadudcctransaction.cpp | 14 +- kopete/protocols/gadu/gadueditaccount.cpp | 10 +- kopete/protocols/gadu/gadueditcontact.cpp | 4 +- kopete/protocols/gadu/gadupubdir.cpp | 36 +- kopete/protocols/gadu/gaduregisteraccount.cpp | 28 +- kopete/protocols/gadu/gadusession.cpp | 4 +- kopete/protocols/groupwise/gwaccount.cpp | 124 +++---- kopete/protocols/groupwise/gwbytestream.cpp | 10 +- kopete/protocols/groupwise/gwconnector.cpp | 4 +- kopete/protocols/groupwise/gwcontact.cpp | 6 +- kopete/protocols/groupwise/gwmessagemanager.cpp | 30 +- .../groupwise/libgroupwise/chatroommanager.cpp | 6 +- kopete/protocols/groupwise/libgroupwise/client.cpp | 86 ++--- .../groupwise/libgroupwise/gwclientstream.cpp | 26 +- .../groupwise/libgroupwise/privacymanager.cpp | 12 +- .../groupwise/libgroupwise/qcatlshandler.cpp | 12 +- .../groupwise/libgroupwise/safedelete.cpp | 2 +- .../groupwise/libgroupwise/securestream.cpp | 40 +- kopete/protocols/groupwise/libgroupwise/task.cpp | 6 +- .../libgroupwise/tasks/conferencetask.cpp | 4 +- .../tasks/createcontactinstancetask.cpp | 2 +- .../libgroupwise/tasks/createcontacttask.cpp | 8 +- .../libgroupwise/tasks/joinconferencetask.cpp | 4 +- .../libgroupwise/tasks/movecontacttask.cpp | 2 +- .../libgroupwise/tasks/needfoldertask.cpp | 6 +- .../libgroupwise/tasks/searchchattask.cpp | 8 +- .../libgroupwise/tasks/searchusertask.cpp | 6 +- .../libgroupwise/tests/clientstream_test.cpp | 10 +- .../groupwise/libgroupwise/userdetailsmanager.cpp | 4 +- .../protocols/groupwise/ui/gwchatpropsdialog.cpp | 24 +- .../protocols/groupwise/ui/gwchatsearchdialog.cpp | 10 +- .../protocols/groupwise/ui/gwcontactproperties.cpp | 6 +- .../protocols/groupwise/ui/gweditaccountwidget.cpp | 6 +- kopete/protocols/groupwise/ui/gwprivacydialog.cpp | 26 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 4 +- kopete/protocols/groupwise/ui/gwsearch.cpp | 10 +- kopete/protocols/irc/ircaccount.cpp | 52 +-- kopete/protocols/irc/ircaddcontactpage.cpp | 8 +- kopete/protocols/irc/ircchannelcontact.cpp | 38 +- kopete/protocols/irc/irccontact.cpp | 28 +- kopete/protocols/irc/irccontactmanager.cpp | 38 +- kopete/protocols/irc/ircprotocol.cpp | 120 +++--- kopete/protocols/irc/ircservercontact.cpp | 40 +- kopete/protocols/irc/ircsignalhandler.cpp | 68 ++-- kopete/protocols/irc/ircsignalhandler.h | 8 +- kopete/protocols/irc/irctransferhandler.cpp | 32 +- kopete/protocols/irc/ircusercontact.cpp | 40 +- kopete/protocols/irc/kcodecaction.cpp | 4 +- kopete/protocols/irc/libkirc/kircengine.cpp | 18 +- .../protocols/irc/libkirc/kircengine_commands.cpp | 26 +- kopete/protocols/irc/libkirc/kircengine_ctcp.cpp | 24 +- .../irc/libkirc/kircengine_numericreplies.cpp | 122 +++--- .../irc/libkirc/kircmessageredirector.cpp | 2 +- .../protocols/irc/libkirc/kircmessageredirector.h | 4 +- kopete/protocols/irc/libkirc/kirctransfer.cpp | 48 +-- .../protocols/irc/libkirc/kirctransferserver.cpp | 28 +- kopete/protocols/irc/libkirc/ksslsocket.cpp | 14 +- kopete/protocols/irc/ui/channellist.cpp | 22 +- kopete/protocols/irc/ui/channellistdialog.cpp | 6 +- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 22 +- kopete/protocols/jabber/jabberaccount.cpp | 90 ++--- kopete/protocols/jabber/jabberbasecontact.cpp | 2 +- kopete/protocols/jabber/jabberbookmarks.cpp | 6 +- kopete/protocols/jabber/jabberbytestream.cpp | 10 +- .../protocols/jabber/jabbercapabilitiesmanager.cpp | 2 +- kopete/protocols/jabber/jabberchatsession.cpp | 12 +- kopete/protocols/jabber/jabberclient.cpp | 96 ++--- kopete/protocols/jabber/jabberconnector.cpp | 6 +- kopete/protocols/jabber/jabbercontact.cpp | 56 +-- kopete/protocols/jabber/jabbercontactpool.cpp | 4 +- kopete/protocols/jabber/jabberfiletransfer.cpp | 22 +- kopete/protocols/jabber/jabberformtranslator.cpp | 2 +- kopete/protocols/jabber/jabbergroupchatmanager.cpp | 4 +- kopete/protocols/jabber/jabbergroupcontact.cpp | 12 +- .../protocols/jabber/jabbergroupmembercontact.cpp | 2 +- kopete/protocols/jabber/jabberresource.cpp | 8 +- kopete/protocols/jabber/jabberresourcepool.cpp | 4 +- kopete/protocols/jabber/jabbertransport.cpp | 12 +- kopete/protocols/jabber/jingle/DESIGN | 2 +- .../jabber/jingle/jinglesessionmanager.cpp | 2 +- .../protocols/jabber/jingle/jinglevoicecaller.cpp | 4 +- .../protocols/jabber/jingle/jinglevoicesession.cpp | 2 +- .../jabber/jingle/jinglevoicesessiondialog.cpp | 30 +- .../jabber/libiris/cutestuff/network/bsocket.cpp | 22 +- .../libiris/cutestuff/network/httpconnect.cpp | 12 +- .../jabber/libiris/cutestuff/network/httppoll.cpp | 14 +- .../jabber/libiris/cutestuff/network/ndns.cpp | 2 +- .../jabber/libiris/cutestuff/network/servsock.cpp | 2 +- .../jabber/libiris/cutestuff/network/socks.cpp | 24 +- .../libiris/cutestuff/network/srvresolver.cpp | 10 +- .../jabber/libiris/cutestuff/util/safedelete.cpp | 2 +- .../jabber/libiris/cutestuff/util/showtextdlg.cpp | 2 +- .../jabber/libiris/iris/jabber/filetransfer.cpp | 22 +- .../protocols/jabber/libiris/iris/jabber/s5b.cpp | 88 ++--- .../jabber/libiris/iris/jabber/xmpp_ibb.cpp | 10 +- .../jabber/libiris/iris/jabber/xmpp_jidlink.cpp | 16 +- .../jabber/libiris/iris/xmpp-core/connector.cpp | 26 +- .../jabber/libiris/iris/xmpp-core/securestream.cpp | 40 +- .../jabber/libiris/iris/xmpp-core/stream.cpp | 60 +-- .../jabber/libiris/iris/xmpp-core/tlshandler.cpp | 12 +- .../jabber/libiris/iris/xmpp-im/client.cpp | 40 +- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp | 4 +- kopete/protocols/jabber/tdeioslave/jabberdisco.cpp | 18 +- kopete/protocols/jabber/ui/dlgjabberbrowse.cpp | 6 +- .../jabber/ui/dlgjabberchangepassword.cpp | 4 +- kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp | 4 +- .../protocols/jabber/ui/dlgjabberchatroomslist.cpp | 2 +- kopete/protocols/jabber/ui/dlgjabberregister.cpp | 6 +- kopete/protocols/jabber/ui/dlgjabbersendraw.cpp | 8 +- kopete/protocols/jabber/ui/dlgjabberservices.cpp | 16 +- kopete/protocols/jabber/ui/dlgjabbervcard.cpp | 18 +- .../protocols/jabber/ui/jabberaddcontactpage.cpp | 4 +- kopete/protocols/jabber/ui/jabberchooseserver.cpp | 8 +- .../jabber/ui/jabbereditaccountwidget.cpp | 12 +- .../protocols/jabber/ui/jabberregisteraccount.cpp | 30 +- kopete/protocols/meanwhile/meanwhileaccount.cpp | 10 +- .../meanwhile/meanwhileaddcontactpage.cpp | 4 +- kopete/protocols/meanwhile/meanwhilecontact.cpp | 12 +- .../meanwhile/meanwhileeditaccountwidget.cpp | 4 +- kopete/protocols/meanwhile/meanwhilesession.cpp | 12 +- kopete/protocols/msn/dispatcher.cpp | 6 +- kopete/protocols/msn/incomingtransfer.cpp | 12 +- kopete/protocols/msn/msnaccount.cpp | 82 ++--- kopete/protocols/msn/msnchatsession.cpp | 84 ++--- kopete/protocols/msn/msncontact.cpp | 14 +- kopete/protocols/msn/msnfiletransfersocket.cpp | 32 +- kopete/protocols/msn/msnnotifysocket.cpp | 20 +- kopete/protocols/msn/msnsecureloginhandler.cpp | 4 +- kopete/protocols/msn/msnsocket.cpp | 26 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 28 +- kopete/protocols/msn/outgoingtransfer.cpp | 14 +- kopete/protocols/msn/transport.cpp | 14 +- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 10 +- kopete/protocols/msn/webcam.cpp | 34 +- kopete/protocols/msn/webcam/msnwebcamdialog.cpp | 8 +- kopete/protocols/oscar/aim/aimaccount.cpp | 46 +-- kopete/protocols/oscar/aim/aimcontact.cpp | 40 +- kopete/protocols/oscar/aim/aimjoinchat.cpp | 4 +- kopete/protocols/oscar/aim/aimuserinfo.cpp | 18 +- .../oscar/aim/ui/aimeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/icq/icqaccount.cpp | 26 +- kopete/protocols/oscar/icq/icqcontact.cpp | 72 ++-- kopete/protocols/oscar/icq/icqreadaway.cpp | 20 +- .../protocols/oscar/icq/ui/icqaddcontactpage.cpp | 4 +- .../oscar/icq/ui/icqeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp | 34 +- .../protocols/oscar/icq/ui/icquserinfowidget.cpp | 20 +- kopete/protocols/oscar/liboscar/aimlogintask.cpp | 2 +- kopete/protocols/oscar/liboscar/client.cpp | 124 +++---- kopete/protocols/oscar/liboscar/connection.cpp | 8 +- kopete/protocols/oscar/liboscar/logintask.cpp | 8 +- .../protocols/oscar/liboscar/oscarbytestream.cpp | 10 +- .../protocols/oscar/liboscar/oscarclientstream.cpp | 22 +- kopete/protocols/oscar/liboscar/oscarconnector.cpp | 4 +- kopete/protocols/oscar/liboscar/rateclass.cpp | 2 +- .../protocols/oscar/liboscar/rateclassmanager.cpp | 2 +- kopete/protocols/oscar/liboscar/rateinfotask.cpp | 2 +- kopete/protocols/oscar/liboscar/safedelete.cpp | 2 +- .../protocols/oscar/liboscar/servicesetuptask.cpp | 16 +- kopete/protocols/oscar/liboscar/ssilisttask.cpp | 6 +- kopete/protocols/oscar/liboscar/task.cpp | 6 +- .../oscar/liboscar/tests/clientstream_test.cpp | 6 +- .../protocols/oscar/liboscar/tests/logintest.cpp | 4 +- .../oscar/liboscar/tests/ssigrouptest.cpp | 8 +- .../protocols/oscar/liboscar/tests/tdeunittest.cpp | 6 +- .../oscar/liboscar/tests/userinfotest.cpp | 8 +- kopete/protocols/oscar/oscaraccount.cpp | 92 ++--- kopete/protocols/oscar/oscarcontact.cpp | 14 +- kopete/protocols/oscar/oscarmyselfcontact.cpp | 2 +- kopete/protocols/oscar/oscarversionupdater.cpp | 8 +- kopete/protocols/oscar/oscarvisibilitydialog.cpp | 16 +- .../protocols/sms/services/kopete_unix_serial.cpp | 2 +- kopete/protocols/sms/services/smsclient.cpp | 6 +- kopete/protocols/sms/services/smssend.cpp | 12 +- kopete/protocols/sms/services/smssendprovider.cpp | 6 +- kopete/protocols/sms/smsaccount.cpp | 12 +- kopete/protocols/sms/smscontact.cpp | 8 +- kopete/protocols/sms/smseditaccountwidget.cpp | 10 +- kopete/protocols/testbed/testbedaccount.cpp | 6 +- kopete/protocols/testbed/testbedcontact.cpp | 8 +- kopete/protocols/testbed/testbedfakeserver.cpp | 2 +- .../protocols/testbed/ui/testbedwebcamdialog.cpp | 4 +- .../protocols/winpopup/libwinpopup/libwinpopup.cpp | 16 +- kopete/protocols/winpopup/wpaccount.cpp | 6 +- kopete/protocols/winpopup/wpaddcontact.cpp | 4 +- kopete/protocols/winpopup/wpcontact.cpp | 10 +- kopete/protocols/winpopup/wpprotocol.cpp | 4 +- kopete/protocols/winpopup/wpuserinfo.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/client.cpp | 232 ++++++------ kopete/protocols/yahoo/libkyahoo/logintask.cpp | 16 +- kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp | 6 +- .../protocols/yahoo/libkyahoo/receivefiletask.cpp | 8 +- kopete/protocols/yahoo/libkyahoo/safedelete.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp | 6 +- .../protocols/yahoo/libkyahoo/sendpicturetask.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/task.cpp | 6 +- .../yahoo/libkyahoo/tests/clientstream_test.cpp | 6 +- .../protocols/yahoo/libkyahoo/tests/logintest.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/webcamtask.cpp | 26 +- kopete/protocols/yahoo/libkyahoo/yabtask.cpp | 4 +- .../yahoo/libkyahoo/yahoobuddyiconloader.cpp | 4 +- .../protocols/yahoo/libkyahoo/yahoobytestream.cpp | 10 +- kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp | 8 +- .../yahoo/libkyahoo/yahooclientstream.cpp | 22 +- .../protocols/yahoo/libkyahoo/yahooconnector.cpp | 4 +- kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp | 2 +- kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp | 2 +- kopete/protocols/yahoo/yahooaccount.cpp | 408 ++++++++++----------- kopete/protocols/yahoo/yahoochatsession.cpp | 22 +- .../yahoo/yahooconferencemessagemanager.cpp | 10 +- kopete/protocols/yahoo/yahoocontact.cpp | 60 +-- kopete/protocols/yahoo/yahooeditaccount.cpp | 6 +- kopete/protocols/yahoo/yahooverifyaccount.cpp | 4 +- kopete/protocols/yahoo/yahoowebcam.cpp | 6 +- 221 files changed, 2283 insertions(+), 2283 deletions(-) (limited to 'kopete/protocols') diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 2c952c6a..208e6421 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -183,15 +183,15 @@ void GaduAccount::initActions() { p->searchAction = new TDEAction( i18n( "&Search for Friends" ), "", 0, - this, TQT_SLOT( slotSearch() ), this, "actionSearch" ); + this, TQ_SLOT( slotSearch() ), this, "actionSearch" ); p->listputAction = new TDEAction( i18n( "Export Contacts to Server" ), "", 0, - this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" ); + this, TQ_SLOT( slotExportContactsList() ), this, "actionListput" ); p->listToFileAction = new TDEAction( i18n( "Export Contacts to File..." ), "", 0, - this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); + this, TQ_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); p->listFromFileAction = new TDEAction( i18n( "Import Contacts From File..." ), "", 0, - this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); + this, TQ_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); p->friendsModeAction = new TDEToggleAction( i18n( "Only for Friends" ), "", 0, - this, TQT_SLOT( slotFriendsMode() ), this, + this, TQ_SLOT( slotFriendsMode() ), this, "actionFriendsMode" ); static_cast(p->friendsModeAction)->setChecked( p->forFriends ); @@ -200,34 +200,34 @@ GaduAccount::initActions() void GaduAccount::initConnections() { - TQObject::connect( p->session_, TQT_SIGNAL( error( const TQString&, const TQString& ) ), - TQT_SLOT( error( const TQString&, const TQString& ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( messageReceived( KGaduMessage* ) ), - TQT_SLOT( messageReceived( KGaduMessage* ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( contactStatusChanged( KGaduNotify* ) ), - TQT_SLOT( contactStatusChanged( KGaduNotify* ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( connectionFailed( gg_failure_t )), - TQT_SLOT( connectionFailed( gg_failure_t ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( connectionSucceed( ) ), - TQT_SLOT( connectionSucceed( ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( disconnect( Kopete::Account::DisconnectReason ) ), - TQT_SLOT( slotSessionDisconnect( Kopete::Account::DisconnectReason ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( ackReceived( unsigned int ) ), - TQT_SLOT( ackReceived( unsigned int ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), - TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( userListExported() ), - TQT_SLOT( userListExportDone() ) ); - TQObject::connect( p->session_, TQT_SIGNAL( userListRecieved( const TQString& ) ), - TQT_SLOT( userlist( const TQString& ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( incomingCtcp( unsigned int ) ), - TQT_SLOT( slotIncomingDcc( unsigned int ) ) ); - - TQObject::connect( p->pingTimer_, TQT_SIGNAL( timeout() ), - TQT_SLOT( pingServer() ) ); - - TQObject::connect( p->exportTimer_, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotUserlistSynch() ) ); + TQObject::connect( p->session_, TQ_SIGNAL( error( const TQString&, const TQString& ) ), + TQ_SLOT( error( const TQString&, const TQString& ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( messageReceived( KGaduMessage* ) ), + TQ_SLOT( messageReceived( KGaduMessage* ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( contactStatusChanged( KGaduNotify* ) ), + TQ_SLOT( contactStatusChanged( KGaduNotify* ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( connectionFailed( gg_failure_t )), + TQ_SLOT( connectionFailed( gg_failure_t ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( connectionSucceed( ) ), + TQ_SLOT( connectionSucceed( ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( disconnect( Kopete::Account::DisconnectReason ) ), + TQ_SLOT( slotSessionDisconnect( Kopete::Account::DisconnectReason ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( ackReceived( unsigned int ) ), + TQ_SLOT( ackReceived( unsigned int ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), + TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( userListExported() ), + TQ_SLOT( userListExportDone() ) ); + TQObject::connect( p->session_, TQ_SIGNAL( userListRecieved( const TQString& ) ), + TQ_SLOT( userlist( const TQString& ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( incomingCtcp( unsigned int ) ), + TQ_SLOT( slotIncomingDcc( unsigned int ) ) ); + + TQObject::connect( p->pingTimer_, TQ_SIGNAL( timeout() ), + TQ_SLOT( pingServer() ) ); + + TQObject::connect( p->exportTimer_, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotUserlistSynch() ) ); } void @@ -287,22 +287,22 @@ GaduAccount::actionMenu() } p->actionMenu_->insert( new TDEAction( i18n( "Go O&nline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), - 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Set &Busy" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), - 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Set &Invisible" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), - 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Go &Offline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), - 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Set &Description..." ), "application-vnd.tde.info", - 0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); + 0, this, TQ_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); p->actionMenu_->insert( p->friendsModeAction ); diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 26bece4e..d42272ca 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -48,7 +48,7 @@ GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* parent, co account_ = owner; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); addUI_ = new GaduAddUI( this ); - connect( addUI_->addEdit_, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUinChanged( const TQString & ) ) ); + connect( addUI_->addEdit_, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUinChanged( const TQString & ) ) ); addUI_->addEdit_->setValidChars( "1234567890" ); addUI_->addEdit_->setText( "" ); addUI_->groups->setDisabled( TRUE ); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index 592c545e..d56fc124 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -58,7 +58,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) } ui_->textEdit_->setText( account->myself()->property( "awayMessage" ).value().toString() ); - connect( this, TQT_SIGNAL( applyClicked() ), TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), TQ_SLOT( slotApply() ) ); } int diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 0b4bc18b..18473c00 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -58,11 +58,11 @@ GaduCommand::checkSocket( int fd, int checkWhat ) { read_ = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); read_->setEnabled( false ); - TQObject::connect( read_, TQT_SIGNAL( activated(int) ), TQT_SLOT( forwarder() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated(int) ), TQ_SLOT( forwarder() ) ); write_ = new TQSocketNotifier( fd, TQSocketNotifier::Write, this ); write_->setEnabled( false ); - TQObject::connect( write_, TQT_SIGNAL( activated(int) ), TQT_SLOT( forwarder() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated(int) ), TQ_SLOT( forwarder() ) ); enableNotifiers( checkWhat ); } @@ -147,7 +147,7 @@ RegisterCommand::requestToken() return; } - connect( this, TQT_SIGNAL( socketReady() ), TQT_SLOT( watcher() ) ); + connect( this, TQ_SIGNAL( socketReady() ), TQ_SLOT( watcher() ) ); checkSocket( session_->fd, session_->check ); return; @@ -183,7 +183,7 @@ RegisterCommand::execute() return; } state = RegisterStateWaitingForNumber; - connect( this, TQT_SIGNAL( socketReady() ), TQT_SLOT( watcher() ) ); + connect( this, TQ_SIGNAL( socketReady() ), TQ_SLOT( watcher() ) ); checkSocket( session_->fd, session_->check ); } @@ -236,7 +236,7 @@ void RegisterCommand::watcher() } gg_token_free( session_ ); session_ = NULL; - disconnect( this, TQT_SLOT( watcher() ) ); + disconnect( this, TQ_SLOT( watcher() ) ); return; break; } @@ -282,7 +282,7 @@ void RegisterCommand::watcher() } gg_free_register( session_ ); session_ = NULL; - disconnect( this, TQT_SLOT( watcher() ) ); + disconnect( this, TQ_SLOT( watcher() ) ); deleteLater(); return; break; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index 5ae08d1f..5e7d8a1a 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -145,9 +145,9 @@ GaduContact::manager( Kopete::Contact::CanCreateFlags canCreate ) { if ( !msgManager_ && canCreate ) { msgManager_ = Kopete::ChatSessionManager::self()->create( account_->myself(), thisContact_, GaduProtocol::protocol() ); - connect( msgManager_, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession*) ), - this, TQT_SLOT( messageSend( Kopete::Message&, Kopete::ChatSession*) ) ); - connect( msgManager_, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotChatSessionDestroyed() ) ); + connect( msgManager_, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession*) ), + this, TQ_SLOT( messageSend( Kopete::Message&, Kopete::ChatSession*) ) ); + connect( msgManager_, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotChatSessionDestroyed() ) ); } kdDebug(14100) << "GaduContact::manager returning: " << msgManager_ << endl; @@ -163,8 +163,8 @@ GaduContact::slotChatSessionDestroyed() void GaduContact::initActions() { - actionSendMessage_ = KopeteStdAction::sendMessage( this, TQT_SLOT( execute() ), this, "actionMessage" ); - actionInfo_ = KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), this, "actionInfo" ); + actionSendMessage_ = KopeteStdAction::sendMessage( this, TQ_SLOT( execute() ), this, "actionMessage" ); + actionInfo_ = KopeteStdAction::contactInfo( this, TQ_SLOT( slotUserInfo() ), this, "actionInfo" ); } void @@ -195,13 +195,13 @@ GaduContact::customContextMenuActions() TQPtrList *fakeCollection = new TQPtrList(); //show profile TDEAction* actionShowProfile = new TDEAction( i18n("Show Profile") , "application-vnd.tde.info", 0, - this, TQT_SLOT( slotShowPublicProfile() ), + this, TQ_SLOT( slotShowPublicProfile() ), this, "actionShowPublicProfile" ); fakeCollection->append( actionShowProfile ); TDEAction* actionEditContact = new TDEAction( i18n("Edit...") , "edit", 0, - this, TQT_SLOT( slotEditContact() ), + this, TQ_SLOT( slotEditContact() ), this, "actionEditContact" ); fakeCollection->append( actionEditContact ); diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index bd861032..f198377a 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -134,7 +134,7 @@ GaduDCC::registerAccount( GaduAccount* account ) dccServer = new GaduDCCServer(); } - connect( dccServer, TQT_SIGNAL( incoming( gg_dcc*, bool& ) ), TQT_SLOT( slotIncoming( gg_dcc*, bool& ) ) ); + connect( dccServer, TQ_SIGNAL( incoming( gg_dcc*, bool& ) ), TQ_SLOT( slotIncoming( gg_dcc*, bool& ) ) ); initmutex.unlock(); diff --git a/kopete/protocols/gadu/gadudccserver.cpp b/kopete/protocols/gadu/gadudccserver.cpp index 8994c8b0..0e00245b 100644 --- a/kopete/protocols/gadu/gadudccserver.cpp +++ b/kopete/protocols/gadu/gadudccserver.cpp @@ -121,8 +121,8 @@ GaduDCCServer::createNotifiers( bool connect ) write_->setEnabled( false ); if ( connect ) { - TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); - TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); } } diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index d7ce3ae3..6367e5cb 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -143,10 +143,10 @@ GaduDCCTransaction::setupIncoming( gg_dcc* dccS ) peer = dccS->uin; - connect ( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString & ) ), - this, TQT_SLOT( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); - connect ( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), - this, TQT_SLOT( slotTransferRefused( const Kopete::FileTransferInfo & ) ) ); + connect ( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString & ) ), + this, TQ_SLOT( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); + connect ( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), + this, TQ_SLOT( slotTransferRefused( const Kopete::FileTransferInfo & ) ) ); incoming = true; createNotifiers( true ); @@ -195,8 +195,8 @@ GaduDCCTransaction::createNotifiers( bool connect ) write_->setEnabled( false ); if ( connect ) { - TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); - TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); } } @@ -279,7 +279,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c dccSock_->file_fd = localFile_.handle(); } - connect ( transfer, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) ); + connect ( transfer, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotTransferResult() ) ); // reenable notifiers enableNotifiers( dccSock_->check ); diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 30411c4b..ff4a5aca 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -81,14 +81,14 @@ GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, T useTls_->setCurrentItem( isSsl ? ( account_->useTls() ) : 2 ); ignoreCheck_->setChecked( account_->ignoreAnons() ); - connect( account(), TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), - TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + connect( account(), TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), + TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); connectLabel->setText( i18n( "personal information being fetched from server", "

Fetching from server

" ) ); seqNr = account_->getPersonalInformation(); } - connect( registerNew, TQT_SIGNAL( clicked( ) ), TQT_SLOT( registerNewAccount( ) ) ); + connect( registerNew, TQ_SIGNAL( clicked( ) ), TQ_SLOT( registerNewAccount( ) ) ); TQWidget::setTabOrder( loginEdit_, passwordWidget_->mRemembered ); TQWidget::setTabOrder( passwordWidget_->mRemembered, passwordWidget_->mPassword ); @@ -157,7 +157,7 @@ GaduEditAccount::slotSearchResult( const SearchResult& result, unsigned int seq enableUserInfo( true ); - disconnect( TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + disconnect( TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); } void @@ -179,7 +179,7 @@ GaduEditAccount::registerNewAccount() { registerNew->setDisabled( true ); regDialog = new GaduRegisterAccount( NULL , "Register account dialog" ); - connect( regDialog, TQT_SIGNAL( registeredNumber( unsigned int, TQString ) ), TQT_SLOT( newUin( unsigned int, TQString ) ) ); + connect( regDialog, TQ_SIGNAL( registeredNumber( unsigned int, TQString ) ), TQ_SLOT( newUin( unsigned int, TQString ) ) ); if ( regDialog->exec() != TQDialog::Accepted ) { loginEdit_->setText( "" ); return; diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index ea102227..c067397a 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -117,8 +117,8 @@ GaduEditContact::init() // fill values from cl into proper fields on widget show(); - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotApply() ) ); - connect( ui_->groups, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( listClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotApply() ) ); + connect( ui_->groups, TQ_SIGNAL( clicked( TQListViewItem * ) ), TQ_SLOT( listClicked( TQListViewItem * ) ) ); } void diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 00ba18ed..6072c63f 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -146,24 +146,24 @@ GaduPublicDir::slotListSelected( ) void GaduPublicDir::initConnections() { - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotSearch() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotNewSearch() ) ); - connect( this, TQT_SIGNAL( user3Clicked() ), TQT_SLOT( slotAddContact() ) ); - - connect( mAccount, TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), - TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); - - connect( mMainWidget->nameS, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->surname, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->nick, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->UIN, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->cityS, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->gender, TQT_SIGNAL( activated( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->ageFrom, TQT_SIGNAL( valueChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->ageTo, TQT_SIGNAL( valueChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->radioByData, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( inputChanged( bool ) ) ); - - connect( mMainWidget->listFound, TQT_SIGNAL( selectionChanged () ), TQT_SLOT( slotListSelected() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotSearch() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotNewSearch() ) ); + connect( this, TQ_SIGNAL( user3Clicked() ), TQ_SLOT( slotAddContact() ) ); + + connect( mAccount, TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), + TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + + connect( mMainWidget->nameS, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->surname, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->nick, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->UIN, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->cityS, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->gender, TQ_SIGNAL( activated( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->ageFrom, TQ_SIGNAL( valueChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->ageTo, TQ_SIGNAL( valueChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->radioByData, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( inputChanged( bool ) ) ); + + connect( mMainWidget->listFound, TQ_SIGNAL( selectionChanged () ), TQ_SLOT( slotListSelected() ) ); } diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 497f58b0..fb1506c2 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -50,18 +50,18 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", TDEIcon::Small ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) ); - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( doRegister() ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotClose() ) ); - connect( ui->valueEmailAddress, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( ui->valuePassword, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( ui->valuePasswordVerify, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( ui->valueVerificationSequence, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valueEmailAddress, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valuePassword, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valuePasswordVerify, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valueVerificationSequence, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) ); - connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); - connect( cRegister, TQT_SIGNAL( done( const TQString&, const TQString& ) ), TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); - connect( cRegister, TQT_SIGNAL( error( const TQString&, const TQString& ) ), TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) ); + connect( cRegister, TQ_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQ_SLOT( displayToken( TQPixmap, TQString ) ) ); + connect( cRegister, TQ_SIGNAL( done( const TQString&, const TQString& ) ), TQ_SLOT( registrationDone( const TQString&, const TQString& ) ) ); + connect( cRegister, TQ_SIGNAL( error( const TQString&, const TQString& ) ), TQ_SLOT( registrationError( const TQString&, const TQString& ) ) ); + connect( cRegister, TQ_SIGNAL( operationStatus( const TQString ) ), TQ_SLOT( updateStatus( const TQString ) ) ); updateStatus( i18n( "Retrieving token" ) ); cRegister->requestToken(); @@ -166,10 +166,10 @@ GaduRegisterAccount::registrationError( const TQString& title, const TQString& updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); - disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); - disconnect( this, TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); - disconnect( this, TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) ); + disconnect( this, TQ_SLOT( displayToken( TQPixmap, TQString ) ) ); + disconnect( this, TQ_SLOT( registrationDone( const TQString&, const TQString& ) ) ); + disconnect( this, TQ_SLOT( registrationError( const TQString&, const TQString& ) ) ); + disconnect( this, TQ_SLOT( updateStatus( const TQString ) ) ); ui->valueVerificationSequence->setDisabled( true ); ui->valueVerificationSequence->setText( "" ); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index f1660ffd..ec123fe7 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -120,8 +120,8 @@ GaduSession::createNotifiers( bool connect ) write_->setEnabled( false ); if ( connect ) { - TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( checkDescriptor() ) ); - TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( checkDescriptor() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( checkDescriptor() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( checkDescriptor() ) ); } } diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index e5d016de..14489141 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -74,17 +74,17 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& a myself()->setOnlineStatus( GroupWiseProtocol::protocol()->groupwiseOffline ); // Contact list management - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), - TQT_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), - TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), + TQ_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRemoved( Kopete::Group * ) ), + TQ_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); m_actionAutoReply = new TDEAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, - TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); + TQ_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); m_actionJoinChatRoom = new TDEAction ( i18n( "&Join Channel..." ), TQString(), 0, this, - TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); + TQ_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); m_actionManagePrivacy = new TDEAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, - TQT_SLOT( slotPrivacy() ), this, "actionPrivacy"); + TQ_SLOT( slotPrivacy() ), this, "actionPrivacy"); m_connector = 0; m_TQCATLS = 0; @@ -113,7 +113,7 @@ TDEActionMenu* GroupWiseAccount::actionMenu() /* Used for debugging */ /* theActionMenu->insert( new TDEAction ( "Test rtfize()", TQString(), 0, this, - TQT_SLOT( slotTestRTFize() ), this, + TQ_SLOT( slotTestRTFize() ), this, "actionTestRTFize") ); */ return m_actionMenu; @@ -178,8 +178,8 @@ GroupWiseChatSession * GroupWiseAccount::chatSession( Kopete::ContactPtrList oth m_chatSessions.append( chatSession ); // listen for the message manager telling us that the user //has left the conference so we remove it from our map - TQObject::connect( chatSession, TQT_SIGNAL( leavingConference( GroupWiseChatSession * ) ), - TQT_SLOT( slotLeavingConference( GroupWiseChatSession * ) ) ); + TQObject::connect( chatSession, TQ_SIGNAL( leavingConference( GroupWiseChatSession * ) ), + TQ_SLOT( slotLeavingConference( GroupWiseChatSession * ) ) ); break; } //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << @@ -268,80 +268,80 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) m_tlsHandler = new TQCATLSHandler( m_TQCATLS ); m_clientStream = new ClientStream( m_connector, m_tlsHandler, 0); - TQObject::connect( m_connector, TQT_SIGNAL( error() ), this, TQT_SLOT( slotConnError() ) ); - TQObject::connect( m_connector, TQT_SIGNAL( connected() ), this, TQT_SLOT( slotConnConnected() ) ); + TQObject::connect( m_connector, TQ_SIGNAL( error() ), this, TQ_SLOT( slotConnError() ) ); + TQObject::connect( m_connector, TQ_SIGNAL( connected() ), this, TQ_SLOT( slotConnConnected() ) ); - TQObject::connect (m_clientStream, TQT_SIGNAL (connectionClosed()), - this, TQT_SLOT (slotCSDisconnected())); - TQObject::connect (m_clientStream, TQT_SIGNAL (delayedCloseFinished()), - this, TQT_SLOT (slotCSDisconnected())); + TQObject::connect (m_clientStream, TQ_SIGNAL (connectionClosed()), + this, TQ_SLOT (slotCSDisconnected())); + TQObject::connect (m_clientStream, TQ_SIGNAL (delayedCloseFinished()), + this, TQ_SLOT (slotCSDisconnected())); // Notify us when the transport layer is connected - TQObject::connect( m_clientStream, TQT_SIGNAL( connected() ), TQT_SLOT( slotCSConnected() ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( connected() ), TQ_SLOT( slotCSConnected() ) ); // it's necessary to catch this signal and tell the TLS handler to proceed // even if we don't check cert validity - TQObject::connect( m_tlsHandler, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT( slotTLSHandshaken()) ); + TQObject::connect( m_tlsHandler, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT( slotTLSHandshaken()) ); // starts the client once the security layer is up, but see below - TQObject::connect( m_clientStream, TQT_SIGNAL( securityLayerActivated(int) ), TQT_SLOT( slotTLSReady(int) ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( securityLayerActivated(int) ), TQ_SLOT( slotTLSReady(int) ) ); // we could handle login etc in start(), in which case we would emit this signal after that - //TQObject::connect (jabberClientStream, TQT_SIGNAL (authenticated()), - // this, TQT_SLOT (slotCSAuthenticated ())); + //TQObject::connect (jabberClientStream, TQ_SIGNAL (authenticated()), + // this, TQ_SLOT (slotCSAuthenticated ())); // we could also get do the actual login in response to this.. - //TQObject::connect (m_clientStream, TQT_SIGNAL (needAuthParams(bool, bool, bool)), - // this, TQT_SLOT (slotCSNeedAuthParams (bool, bool, bool))); + //TQObject::connect (m_clientStream, TQ_SIGNAL (needAuthParams(bool, bool, bool)), + // this, TQ_SLOT (slotCSNeedAuthParams (bool, bool, bool))); // not implemented: warning - TQObject::connect( m_clientStream, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotCSWarning(int) ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotCSWarning(int) ) ); // not implemented: error - TQObject::connect( m_clientStream, TQT_SIGNAL( error(int) ), TQT_SLOT( slotCSError(int) ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( error(int) ), TQ_SLOT( slotCSError(int) ) ); m_client = new Client( 0, CMSGPRES_GW_6_5 ); // NB these are prefixed with TQObject:: to avoid any chance of a clash with our connect() methods. // we connected successfully - TQObject::connect( m_client, TQT_SIGNAL( loggedIn() ), TQT_SLOT( slotLoggedIn() ) ); + TQObject::connect( m_client, TQ_SIGNAL( loggedIn() ), TQ_SLOT( slotLoggedIn() ) ); // or connection failed - TQObject::connect( m_client, TQT_SIGNAL( loginFailed() ), TQT_SLOT( slotLoginFailed() ) ); + TQObject::connect( m_client, TQ_SIGNAL( loginFailed() ), TQ_SLOT( slotLoginFailed() ) ); // folder listed - TQObject::connect( m_client, TQT_SIGNAL( folderReceived( const FolderItem & ) ), TQT_SLOT( receiveFolder( const FolderItem & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( folderReceived( const FolderItem & ) ), TQ_SLOT( receiveFolder( const FolderItem & ) ) ); // contact listed - TQObject::connect( m_client, TQT_SIGNAL( contactReceived( const ContactItem & ) ), TQT_SLOT( receiveContact( const ContactItem & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactReceived( const ContactItem & ) ), TQ_SLOT( receiveContact( const ContactItem & ) ) ); // contact details listed - TQObject::connect( m_client, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQT_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQ_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) ); // contact status changed - TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); // incoming message - TQObject::connect( m_client, TQT_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); // auto reply to one of our messages because the recipient is away - TQObject::connect( m_client, TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQ_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); // conference events TQObject::connect( m_client, - TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), - TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQT_SIGNAL( conferenceCreationFailed( const int, const int ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( invitationReceived( const ConferenceEvent & ) ), TQT_SLOT( receiveInvitation( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceLeft( const ConferenceEvent & ) ), TQT_SLOT( receiveConferenceLeft( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ), TQT_SLOT( receiveConferenceJoinNotify( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ), TQT_SLOT( receiveInviteNotify( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQT_SLOT( receiveInviteDeclined( const ConferenceEvent & ) ) ); + TQ_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), + TQ_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQ_SIGNAL( conferenceCreationFailed( const int, const int ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( invitationReceived( const ConferenceEvent & ) ), TQ_SLOT( receiveInvitation( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceLeft( const ConferenceEvent & ) ), TQ_SLOT( receiveConferenceLeft( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ), TQ_SLOT( receiveConferenceJoinNotify( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ), TQ_SLOT( receiveInviteNotify( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQ_SLOT( receiveInviteDeclined( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceJoined( const GroupWise::ConferenceGuid &, const TQStringList &, const TQStringList & ) ), TQT_SLOT( receiveConferenceJoin( const GroupWise::ConferenceGuid &, const TQStringList & , const TQStringList & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceJoined( const GroupWise::ConferenceGuid &, const TQStringList &, const TQStringList & ) ), TQ_SLOT( receiveConferenceJoin( const GroupWise::ConferenceGuid &, const TQStringList & , const TQStringList & ) ) ); // typing events - TQObject::connect( m_client, TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ), - TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), - TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ), + TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), + TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); // misc - TQObject::connect( m_client, TQT_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails &) ), TQT_SLOT( receiveAccountDetails( const GroupWise::ContactDetails & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( connectedElsewhere() ), TQT_SLOT( slotConnectedElsewhere() ) ); + TQObject::connect( m_client, TQ_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails &) ), TQ_SLOT( receiveAccountDetails( const GroupWise::ContactDetails & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( connectedElsewhere() ), TQ_SLOT( slotConnectedElsewhere() ) ); // privacy - contacts can't connect directly to this signal because myself() is initialised before m_client - TQObject::connect( m_client->privacyManager(), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ) ); + TQObject::connect( m_client->privacyManager(), TQ_SIGNAL( privacyChanged( const TQString &, bool ) ), TQ_SIGNAL( privacyChanged( const TQString &, bool ) ) ); // GW7 - TQObject::connect( m_client, TQT_SIGNAL( broadcastReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( broadcastReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); struct utsname utsBuf; uname (&utsBuf); @@ -358,7 +358,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) myself()->setOnlineStatus( protocol()->groupwiseConnecting ); m_client->connectToServer( m_clientStream, dn, true ); - TQObject::connect( m_client, TQT_SIGNAL( messageSendingFailed() ), TQT_SLOT( slotMessageSendingFailed() ) ); + TQObject::connect( m_client, TQ_SIGNAL( messageSendingFailed() ), TQ_SLOT( slotMessageSendingFailed() ) ); } void GroupWiseAccount::slotMessageSendingFailed() @@ -940,7 +940,7 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); dit->item( contact.parentId, contact.id ); -// TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); +// TQObject::connect( dit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); return; } @@ -1165,7 +1165,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // get the contact's full name to use as the display name of the created contact CreateContactTask * cct = new CreateContactTask( client()->rootTask() ); cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel ); - TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) ); + TQObject::connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( receiveContactCreated() ) ); cct->go( true ); return true; } @@ -1228,7 +1228,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact ) { DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); dit->item( ::tqt_cast( (*it)->parent() )->id, (*it)->id ); - TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( dit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); } } @@ -1541,21 +1541,21 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { MoveContactTask * mit = new MoveContactTask( client()->rootTask() ); mit->moveContact( instance, destinationFolder->id ); - TQObject::connect( mit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( mit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); mit->go(); } else if ( *candidateGrp == Kopete::Group::topLevel() ) { MoveContactTask * mit = new MoveContactTask( client()->rootTask() ); mit->moveContact( instance, 0 ); - TQObject::connect( mit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( mit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); mit->go(); } else { MoveContactTask * mit = new MoveContactTask( client()->rootTask() ); - TQObject::connect( mit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), - TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( mit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), + TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); // discover the next free sequence number and add the group using that mit->moveContactToNewFolder( instance, nextFreeSequence++, ( *candidateGrp )->displayName() ); @@ -1609,7 +1609,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); dit->item( folder->id, (*candidateInst)->id ); - TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( dit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); instances.remove( candidateInst ); @@ -1636,7 +1636,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) UpdateContactTask * uct = new UpdateContactTask( client()->rootTask() ); uct->renameContact( contact->metaContact()->displayName(), instancesToChange ); - TQObject::connect ( uct, TQT_SIGNAL( finished() ), contact, TQT_SLOT( renamedOnServer() ) ); + TQObject::connect ( uct, TQ_SIGNAL( finished() ), contact, TQ_SLOT( renamedOnServer() ) ); uct->go( true ); } } diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index 62bd272a..03cb46be 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -39,11 +39,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 ) ) ); } diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp index c5a073e3..8839762d 100644 --- a/kopete/protocols/groupwise/gwconnector.cpp +++ b/kopete/protocols/groupwise/gwconnector.cpp @@ -34,8 +34,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/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 0c70b04c..fdea9eb2 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -56,8 +56,8 @@ GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn { m_dn = dn; } - connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), - TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); + connect( static_cast< GroupWiseAccount *>( account ), TQ_SIGNAL( privacyChanged( const TQString &, bool ) ), + TQ_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); } @@ -166,7 +166,7 @@ TQPtrList *GroupWiseContact::customContextMenuActions() TQString label = account()->isContactBlocked( m_dn ) ? i18n( "Unblock User" ) : i18n( "Block User" ); if( !m_actionBlock ) { - m_actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlock() ), + m_actionBlock = new TDEAction( label, "msn_blocked",0, this, TQ_SLOT( slotBlock() ), this, "actionBlock" ); } else diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index cf0c3225..de9151ed 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -53,22 +53,22 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete:: // make sure Kopete knows about this instance Kopete::ChatSessionManager::self()->registerChatSession ( this ); - connect ( this, TQT_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); - connect( this, TQT_SIGNAL( myselfTyping ( bool ) ), TQT_SLOT( slotSendTypingNotification ( bool ) ) ); - connect( account(), TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ), - TQT_SLOT( slotGotTypingNotification( const ConferenceEvent & ) ) ); - connect( account(), TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), - TQT_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) ); + connect ( this, TQ_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect( this, TQ_SIGNAL( myselfTyping ( bool ) ), TQ_SLOT( slotSendTypingNotification ( bool ) ) ); + connect( account(), TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ), + TQ_SLOT( slotGotTypingNotification( const ConferenceEvent & ) ) ); + connect( account(), TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), + TQ_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) ); // Set up the Invite menu m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); - connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ; + connect( m_actionInvite->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT(slotActionInviteAboutToShow() ) ) ; - m_secure = new TDEAction( i18n( "Security Status" ), "encrypted", TDEShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); + m_secure = new TDEAction( i18n( "Security Status" ), "encrypted", TDEShortcut(), this, TQ_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); m_secure->setToolTip( i18n( "Conversation is secure" ) ); - m_logging = new TDEAction( i18n( "Archiving Status" ), "logchat", TDEShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); + m_logging = new TDEAction( i18n( "Archiving Status" ), "logchat", TDEShortcut(), this, TQ_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); updateArchiving(); setXMLFile("gwchatui.rc"); @@ -154,8 +154,8 @@ void GroupWiseChatSession::createConference() invitees.append( static_cast< GroupWiseContact * >( contact )->dn() ); } // this is where we will set the GUID and send any pending messages - connect( account(), TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), TQT_SLOT( receiveGuid( const int, const GroupWise::ConferenceGuid & ) ) ); - connect( account(), TQT_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQT_SLOT( slotCreationFailed( const int, const int ) ) ); + connect( account(), TQ_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), TQ_SLOT( receiveGuid( const int, const GroupWise::ConferenceGuid & ) ) ); + connect( account(), TQ_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQ_SLOT( slotCreationFailed( const int, const int ) ) ); // create the conference account()->createConference( mmId(), invitees ); @@ -310,13 +310,13 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { TDEAction *a=new KopeteContactAction( it.current(), this, - TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); + TQ_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); m_actionInvite->insert( a ); m_inviteActions.append( a ) ; } } // Invite someone off-list - TDEAction *b=new TDEAction( i18n ("&Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); + TDEAction *b=new TDEAction( i18n ("&Other..."), 0, this, TQ_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); m_actionInvite->insert( b ); m_inviteActions.append( b ) ; } @@ -363,7 +363,7 @@ void GroupWiseChatSession::slotInviteOtherContact() m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" ); m_searchDlg->setMainWidget( m_search ); - connect( m_search, TQT_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( m_search, TQ_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQ_SLOT( enableButtonOK( bool ) ) ); m_searchDlg->enableButtonOK( false ); } m_searchDlg->show(); diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index 3ee9b947..bedf8d64 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -52,7 +52,7 @@ void ChatroomManager::getChatrooms( bool refresh ) m_replace = !refresh; SearchChatTask * sct = new SearchChatTask( m_client->rootTask() ); sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) ); - connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) ); + connect( sct, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatroomList() ) ); sct->go( true ); } @@ -80,7 +80,7 @@ void ChatroomManager::slotGotChatroomList() void ChatroomManager::updateCounts() { ChatCountsTask * cct = new ChatCountsTask( m_client->rootTask() ); - connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatCounts() ) ); + connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatCounts() ) ); cct->go( true ); } @@ -108,7 +108,7 @@ void ChatroomManager::requestProperties( const TQString & displayName ) { ChatPropertiesTask * cpt = new ChatPropertiesTask( m_client->rootTask() ); cpt->setChat( displayName ); - connect ( cpt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatProperties() ) ); + connect ( cpt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatProperties() ) ); cpt->go( true ); } } diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index 21c1b1d0..d9b5b385 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -86,7 +86,7 @@ Client::Client(TQObject *par, uint protocolVersion ) d->protocolVersion = protocolVersion; // Sends regular keepalives so the server knows we are still running d->keepAliveTimer = new TQTimer( this ); - connect( d->keepAliveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( sendKeepAlive() ) ); + connect( d->keepAliveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( sendKeepAlive() ) ); } Client::~Client() @@ -100,12 +100,12 @@ Client::~Client() void Client::connectToServer( ClientStream *s, const NovellDN &server, bool auth ) { d->stream = s; - //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); - //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); - connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); - connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); - //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); + //connect(d->stream, TQ_SIGNAL(connected()), TQ_SLOT(streamConnected())); + //connect(d->stream, TQ_SIGNAL(handshaken()), TQ_SLOT(streamHandshaken())); + connect(d->stream, TQ_SIGNAL(error(int)), TQ_SLOT(streamError(int))); + //connect(d->stream, TQ_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQ_SLOT(streamSSLCertificateReady(const TQSSLCert &))); + connect(d->stream, TQ_SIGNAL(readyRead()), TQ_SLOT(streamReadyRead())); + //connect(d->stream, TQ_SIGNAL(closeFinished()), TQ_SLOT(streamCloseFinished())); d->stream->connectToServer(server, auth); } @@ -136,27 +136,27 @@ void Client::start( const TQString &host, const uint port, const TQString &userI LoginTask * login = new LoginTask( d->root ); - connect( login, TQT_SIGNAL( gotMyself( const GroupWise::ContactDetails & ) ), - this, TQT_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails & ) ) ); + connect( login, TQ_SIGNAL( gotMyself( const GroupWise::ContactDetails & ) ), + this, TQ_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails & ) ) ); - connect( login, TQT_SIGNAL( gotFolder( const FolderItem & ) ), - this, TQT_SIGNAL( folderReceived( const FolderItem & ) ) ); + connect( login, TQ_SIGNAL( gotFolder( const FolderItem & ) ), + this, TQ_SIGNAL( folderReceived( const FolderItem & ) ) ); - connect( login, TQT_SIGNAL( gotContact( const ContactItem & ) ), - this, TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); + connect( login, TQ_SIGNAL( gotContact( const ContactItem & ) ), + this, TQ_SIGNAL( contactReceived( const ContactItem & ) ) ); - connect( login, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), - this, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ) ; + connect( login, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), + this, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ) ; - connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ), - privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) ); + connect( login, TQ_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ), + privacyManager(), TQ_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) ); - connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), - TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); + connect( login, TQ_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), + TQ_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); - connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) ); + connect( login, TQ_SIGNAL( gotKeepalivePeriod( int ) ), TQ_SLOT( lt_gotKeepalivePeriod( int ) ) ); - connect( login, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + connect( login, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); login->initialise(); login->go( true ); @@ -194,26 +194,26 @@ void Client::initialiseEventTasks() { // The StatusTask handles incoming status changes StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot? - connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( st, TQ_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); // The ConferenceTask handles incoming conference events, messages, joins, leaves, etc ConferenceTask * ct = new ConferenceTask( d->root ); - connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( typing( const ConferenceEvent & ) ), TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( notTyping( const ConferenceEvent & ) ), TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( joined( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( left( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceLeft( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( invited( const ConferenceEvent & ) ), TQT_SIGNAL( invitationReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( otherInvited( const ConferenceEvent & ) ), TQT_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( closed( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceClosed( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( autoReply( const ConferenceEvent & ) ), TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( broadcast( const ConferenceEvent & ) ), TQT_SIGNAL( broadcastReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( systemBroadcast( const ConferenceEvent & ) ), TQT_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( message( const ConferenceEvent & ) ), TQ_SLOT( ct_messageReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( typing( const ConferenceEvent & ) ), TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( notTyping( const ConferenceEvent & ) ), TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( joined( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( left( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceLeft( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( invited( const ConferenceEvent & ) ), TQ_SIGNAL( invitationReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( otherInvited( const ConferenceEvent & ) ), TQ_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( closed( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceClosed( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( autoReply( const ConferenceEvent & ) ), TQ_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( broadcast( const ConferenceEvent & ) ), TQ_SIGNAL( broadcastReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( systemBroadcast( const ConferenceEvent & ) ), TQ_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ) ); // The ConnectionTask handles incoming connection events ConnectionTask* cont = new ConnectionTask( d->root ); - connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) ); + connect( cont, TQ_SIGNAL( connectedElsewhere() ), TQ_SIGNAL( connectedElsewhere() ) ); } void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) @@ -221,7 +221,7 @@ void Client::setStatus( GroupWise::Status status, const TQString & reason, const debug( TQString("Setting status to %1").arg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); sst->status( status, reason, autoReply ); - connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) ); + connect( sst, TQ_SIGNAL( finished() ), this, TQ_SLOT( sst_statusChanged() ) ); sst->go( true ); // TODO: set status change in progress flag } @@ -230,7 +230,7 @@ void Client::requestStatus( const TQString & userDN ) { GetStatusTask * gst = new GetStatusTask( d->root ); gst->userDN( userDN ); - connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( gst, TQ_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); gst->go( true ); } @@ -238,7 +238,7 @@ void Client::sendMessage( const TQStringList & addresseeDNs, const OutgoingMessa { SendMessageTask * smt = new SendMessageTask( d->root ); smt->message( addresseeDNs, message ); - connect( smt, TQT_SIGNAL( finished() ), TQT_SLOT( smt_messageSent() ) ); + connect( smt, TQ_SIGNAL( finished() ), TQ_SLOT( smt_messageSent() ) ); smt->go( true ); } @@ -259,15 +259,15 @@ void Client::createConference( const int clientId, const TQStringList & particip { CreateConferenceTask * cct = new CreateConferenceTask( d->root ); cct->conference( clientId, participants ); - connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( cct_conferenceCreated() ) ); + connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( cct_conferenceCreated() ) ); cct->go( true ); } void Client::requestDetails( const TQStringList & userDNs ) { GetDetailsTask * gdt = new GetDetailsTask( d->root ); gdt->userDNs( userDNs ); - connect( gdt, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), - this, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ); + connect( gdt, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), + this, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ); gdt->go( true ); } @@ -275,7 +275,7 @@ void Client::joinConference( const GroupWise::ConferenceGuid & guid ) { JoinConferenceTask * jct = new JoinConferenceTask( d->root ); jct->join( guid ); - connect( jct, TQT_SIGNAL( finished() ), TQT_SLOT( jct_joinConfCompleted() ) ); + connect( jct, TQ_SIGNAL( finished() ), TQ_SLOT( jct_joinConfCompleted() ) ); jct->go( true ); } @@ -291,7 +291,7 @@ void Client::leaveConference( const GroupWise::ConferenceGuid & guid ) { LeaveConferenceTask * lct = new LeaveConferenceTask( d->root ); lct->leave( guid ); - //connect( lct, TQT_SIGNAL( finished() ), TQT_SLOT( lct_leftConference() ) ); + //connect( lct, TQ_SIGNAL( finished() ), TQ_SLOT( lct_leftConference() ) ); lct->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index 0c395159..5dce23a6 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -149,13 +149,13 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa d = new Private; d->mode = Client; 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())); d->tlsHandler = tlsHandler; // all the extra stuff happening in the larger ctor happens at connect time :) } @@ -446,17 +446,17 @@ 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, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); TQByteArray spare = d->bs->read(); d->ss = new SecureStream(d->bs); - connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead())); - connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int))); - connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken())); - connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed())); - connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int))); + connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead())); + connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int))); + connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken())); + connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed())); + connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int))); //d->client.startDialbackOut("andbit.net", "im.pyxa.org"); //d->client.startServerOut(d->server); @@ -585,7 +585,7 @@ void ClientStream::processNext() { if( !d->in.isEmpty() ) { //d->in_rrsig = true; - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } } diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp index 4960310a..7d81b7ea 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp @@ -97,7 +97,7 @@ void PrivacyManager::setDefaultAllow( bool allow ) { PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->defaultPolicy( !allow ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDefaultPolicyChanged() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDefaultPolicyChanged() ) ); pit->go( true ); } @@ -105,7 +105,7 @@ void PrivacyManager::setDefaultDeny( bool deny ) { PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->defaultPolicy( deny); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDefaultPolicyChanged() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDefaultPolicyChanged() ) ); pit->go( true ); } @@ -114,7 +114,7 @@ void PrivacyManager::addAllow( const TQString & dn ) // start off a CreatePrivacyItemTask PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->allow( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotAllowAdded() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotAllowAdded() ) ); pit->go( true ); } @@ -123,7 +123,7 @@ void PrivacyManager::addDeny( const TQString & dn ) // start off a CreatePrivacyItemTask PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->deny( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDenyAdded() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDenyAdded() ) ); pit->go( true ); } @@ -131,7 +131,7 @@ void PrivacyManager::removeAllow( const TQString & dn ) { PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->removeAllow( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotAllowRemoved() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotAllowRemoved() ) ); pit->go( true ); } @@ -140,7 +140,7 @@ void PrivacyManager::removeDeny( const TQString & dn ) // start off a CreatePrivacyItemTask PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->removeDeny( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDenyRemoved() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDenyRemoved() ) ); pit->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp index 372d7d9a..d5d7aaa6 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp @@ -35,11 +35,11 @@ TQCATLSHandler::TQCATLSHandler(TQCA::TLS *parent) { d = new Private; d->tls = parent; - connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(d->tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(d->tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(d->tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(d->tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(d->tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(d->tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(d->tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); d->state = 0; d->err = -1; } @@ -70,7 +70,7 @@ void TQCATLSHandler::startClient(const TQString &host) d->state = 0; d->err = -1; if(!d->tls->startClient(host)) - TQTimer::singleShot(0, this, TQT_SIGNAL(fail())); + TQTimer::singleShot(0, this, TQ_SIGNAL(fail())); } void TQCATLSHandler::write(const TQByteArray &a) diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp index 9de147f0..2b466e68 100644 --- a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp +++ b/kopete/protocols/groupwise/libgroupwise/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/groupwise/libgroupwise/securestream.cpp b/kopete/protocols/groupwise/libgroupwise/securestream.cpp index 656f7e43..10784d1c 100644 --- a/kopete/protocols/groupwise/libgroupwise/securestream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/securestream.cpp @@ -91,11 +91,11 @@ SecureLayer::SecureLayer(TQCA::TLS *t) type = TLS; p.tls = t; init(); - connect(p.tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(p.tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(p.tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(p.tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(p.tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(p.tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(p.tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(p.tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(p.tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(p.tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); } SecureLayer::SecureLayer(TQCA::SASL *s) @@ -103,9 +103,9 @@ SecureLayer::SecureLayer(TQCA::SASL *s) type = SASL; p.sasl = s; init(); - connect(p.sasl, TQT_SIGNAL(readyRead()), TQT_SLOT(sasl_readyRead())); - connect(p.sasl, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(sasl_readyReadOutgoing(int))); - connect(p.sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(p.sasl, TQ_SIGNAL(readyRead()), TQ_SLOT(sasl_readyRead())); + connect(p.sasl, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(sasl_readyReadOutgoing(int))); + connect(p.sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); } #ifdef USE_TLSHANDLER @@ -114,11 +114,11 @@ SecureLayer::SecureLayer(TLSHandler *t) type = TLSH; p.tlsHandler = t; init(); - connect(p.tlsHandler, TQT_SIGNAL(success()), TQT_SLOT(tlsHandler_success())); - connect(p.tlsHandler, TQT_SIGNAL(fail()), TQT_SLOT(tlsHandler_fail())); - connect(p.tlsHandler, TQT_SIGNAL(closed()), TQT_SLOT(tlsHandler_closed())); - connect(p.tlsHandler, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(tlsHandler_readyRead(const TQByteArray &))); - connect(p.tlsHandler, TQT_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQT_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); + connect(p.tlsHandler, TQ_SIGNAL(success()), TQ_SLOT(tlsHandler_success())); + connect(p.tlsHandler, TQ_SIGNAL(fail()), TQ_SLOT(tlsHandler_fail())); + connect(p.tlsHandler, TQ_SIGNAL(closed()), TQ_SLOT(tlsHandler_closed())); + connect(p.tlsHandler, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(tlsHandler_readyRead(const TQByteArray &))); + connect(p.tlsHandler, TQ_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQ_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); } #endif @@ -297,8 +297,8 @@ SecureStream::SecureStream(ByteStream *s) d = new Private; d->bs = s; - 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, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); d->layers.setAutoDelete(true); d->pending = 0; @@ -313,11 +313,11 @@ SecureStream::~SecureStream() void SecureStream::linkLayer(TQObject *s) { - connect(s, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(layer_tlsHandshaken())); - connect(s, TQT_SIGNAL(tlsClosed(const TQByteArray &)), TQT_SLOT(layer_tlsClosed(const TQByteArray &))); - connect(s, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(layer_readyRead(const TQByteArray &))); - connect(s, TQT_SIGNAL(needWrite(const TQByteArray &)), TQT_SLOT(layer_needWrite(const TQByteArray &))); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(layer_error(int))); + connect(s, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(layer_tlsHandshaken())); + connect(s, TQ_SIGNAL(tlsClosed(const TQByteArray &)), TQ_SLOT(layer_tlsClosed(const TQByteArray &))); + connect(s, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(layer_readyRead(const TQByteArray &))); + connect(s, TQ_SIGNAL(needWrite(const TQByteArray &)), TQ_SLOT(layer_needWrite(const TQByteArray &))); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(layer_error(int))); } int SecureStream::calcPrebytes() const diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 547844d9..f206b6bb 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -48,7 +48,7 @@ Task::Task(Task *parent) d->transfer = 0; d->client = parent->client(); d->id = client()->genUniqueId(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) @@ -57,7 +57,7 @@ Task::Task(Client *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/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index c88e22b4..496af2cc 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -42,8 +42,8 @@ ConferenceTask::ConferenceTask( Task* parent ) registerEvent( GroupWise::ReceivedSystemBroadcast ); // listen to the UserDetailsManager telling us that user details are available - connect( client()->userDetailsManager(), TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), - TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); + connect( client()->userDetailsManager(), TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), + TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index d41db4a9..31c077f7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -24,7 +24,7 @@ CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact - connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); + connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) ); } CreateContactInstanceTask::~CreateContactInstanceTask() diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 0d167236..2c3daf55 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -76,8 +76,8 @@ void CreateContactTask::onGo() // the add contact action may cause other contacts' sequence numbers to change // CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount // This updates our local versions of those contacts using the same mechanism by which they are updated at login. - connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) ); - connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) ); + connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) ); + connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) ); if ( (*it).id == 0 ) // caller asserts that this isn't on the server... { ccit->contactFromDNAndFolder( m_userId, m_displayName, m_firstSequenceNumber++, ( *it ).name ); @@ -92,8 +92,8 @@ void CreateContactTask::onGo() { client()->debug( " - contact is in top level folder " ); CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() ); - connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) ); - connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) ); + connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) ); + connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) ); ccit->contactFromDN( m_userId, m_displayName, 0 ); ccit->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index b7b1f1cc..a606008e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -113,8 +113,8 @@ bool JoinConferenceTask::take( Transfer * transfer ) { client()->debug( "JoinConferenceTask::slotReceiveUserDetails(), requesting details" ); connect( client()->userDetailsManager(), - TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), - TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); + TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), + TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); client()->userDetailsManager()->requestDetails( m_unknowns ); } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index 4a24f44f..c70eb37e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -25,7 +25,7 @@ MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact - connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); + connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 12c7382a..c1cb696c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -27,9 +27,9 @@ void NeedFolderTask::createFolder() { CreateFolderTask * cct = new CreateFolderTask( client()->rootTask() ); cct->folder( 0, m_folderSequence, m_folderDisplayName ); - connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQT_SIGNAL( folderReceived( const FolderItem & ) ) ); - connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQT_SLOT( slotFolderAdded( const FolderItem & ) ) ); - connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotFolderTaskFinished() ) ); + connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQ_SIGNAL( folderReceived( const FolderItem & ) ) ); + connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQ_SLOT( slotFolderAdded( const FolderItem & ) ) ); + connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotFolderTaskFinished() ) ); cct->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index 87694eb4..10a1ba82 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -75,7 +75,7 @@ bool SearchChatTask::take( Transfer * transfer ) m_objectId = sf->value().toInt(); // now start the results poll timer - TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) ); return true; } @@ -84,7 +84,7 @@ void SearchChatTask::slotPollForResults() //create a PollSearchResultsTask GetChatSearchResultsTask * gcsrt = new GetChatSearchResultsTask( client()->rootTask() ); gcsrt->poll( m_objectId ); - connect( gcsrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) ); + connect( gcsrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) ); gcsrt->go( true ); } @@ -97,14 +97,14 @@ void SearchChatTask::slotGotPollResults() { case GetChatSearchResultsTask::GettingData: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer - TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) ); else setSuccess( gcsrt->statusCode() ); break; case GetChatSearchResultsTask::DataRetrieved: // got some results, there may be more. m_results += gcsrt->results(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPollForResults() ) ); break; case GetChatSearchResultsTask::Completed: m_results += gcsrt->results(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 1b64c47d..e968c75c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -86,7 +86,7 @@ bool SearchUserTask::take( Transfer * transfer ) return true; } // now start the results poll timer - TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) ); return true; } @@ -95,7 +95,7 @@ void SearchUserTask::slotPollForResults() //create a PollSearchResultsTask PollSearchResultsTask * psrt = new PollSearchResultsTask( client()->rootTask() ); psrt->poll( m_queryHandle ); - connect( psrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) ); + connect( psrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) ); psrt->go( true ); } @@ -109,7 +109,7 @@ void SearchUserTask::slotGotPollResults() case PollSearchResultsTask::Pending: case PollSearchResultsTask::InProgess: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer - TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) ); else setSuccess( psrt->statusCode() ); break; diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp index aae0205c..0bb0ed1a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp @@ -12,15 +12,15 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc myTLSHandler = new TQCATLSHandler( myTLS ); myTestObject = new ClientStream( myConnector, myTLSHandler, 0); // notify when the transport layer is connected - connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); // it's necessary to catch this signal and tell the TLS handler to proceed, even if we don't check cert validity - connect( myTLSHandler, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(slotTLSHandshaken()) ); + connect( myTLSHandler, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(slotTLSHandshaken()) ); // notify and start sending - connect( myTestObject, TQT_SIGNAL( securityLayerActivated(int) ), TQT_SLOT( slotSend(int) ) ); - connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) ); + connect( myTestObject, TQ_SIGNAL( securityLayerActivated(int) ), TQ_SLOT( slotSend(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() ) ); } ClientStreamTest::~ClientStreamTest() diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index d0605239..ae52ca84 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -97,8 +97,8 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU { GetDetailsTask * gdt = new GetDetailsTask( m_client->rootTask() ); gdt->userDNs( requestList ); - connect( gdt, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), - TQT_SLOT( slotReceiveContactDetails( const GroupWise::ContactDetails & ) ) ); + connect( gdt, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), + TQ_SLOT( slotReceiveContactDetails( const GroupWise::ContactDetails & ) ) ); // TODO: connect to gdt's finished() signal, check for failures, expand gdt to maintain a list of not found DNs? gdt->go( true ); } diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 45dd9ec2..c7aa4b3c 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -82,18 +82,18 @@ void GroupWiseChatPropsDialog::initialise() { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; m_widget = new GroupWiseChatPropsWidget( this ); - connect( m_widget->m_topic, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_owner, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_createdOn, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_creator, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_description, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_disclaimer, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_query, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_archive, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_maxUsers, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_btnAddAcl, TQT_SIGNAL( clicked() ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_btnEditAcl, TQT_SIGNAL( clicked() ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_btnDeleteAcl, TQT_SIGNAL( clicked() ), TQT_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_topic, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_owner, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_createdOn, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_creator, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_description, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_disclaimer, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_query, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_archive, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_maxUsers, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_btnAddAcl, TQ_SIGNAL( clicked() ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_btnEditAcl, TQ_SIGNAL( clicked() ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_btnDeleteAcl, TQ_SIGNAL( clicked() ), TQ_SLOT( slotWidgetChanged() ) ); setMainWidget( m_widget ); show(); } diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index 3cf58e7d..885c8340 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -44,12 +44,12 @@ GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account m_manager = m_account->client()->chatroomManager(); - connect ( m_manager, TQT_SIGNAL( updated() ), TQT_SLOT( slotManagerUpdated() ) ); - connect ( m_manager, TQT_SIGNAL( gotProperties( const GroupWise::Chatroom & ) ), - TQT_SLOT( slotGotProperties( const GroupWise::Chatroom & ) ) ); + connect ( m_manager, TQ_SIGNAL( updated() ), TQ_SLOT( slotManagerUpdated() ) ); + connect ( m_manager, TQ_SIGNAL( gotProperties( const GroupWise::Chatroom & ) ), + TQ_SLOT( slotGotProperties( const GroupWise::Chatroom & ) ) ); - connect( m_widget->m_btnRefresh, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUpdateClicked() ) ); - connect( m_widget->m_btnProperties, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropertiesClicked() ) ); + connect( m_widget->m_btnRefresh, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUpdateClicked() ) ); + connect( m_widget->m_btnProperties, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPropertiesClicked() ) ); m_manager->updateRooms(); show(); diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 4d13b5b9..a9336845 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -81,10 +81,10 @@ void GroupWiseContactProperties::init() m_dialog = new KDialogBase( ::tqt_cast( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); // set up the context menu and copy action - m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); + m_copyAction = KStdAction::copy( this, TQ_SLOT( slotCopy() ), 0 ); connect( m_propsWidget->m_propsView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ), - TQT_SLOT( slotShowContextMenu( TQListViewItem *, const TQPoint & ) ) ); + TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ), + TQ_SLOT( slotShowContextMenu( TQListViewItem *, const TQPoint & ) ) ); // insert the props widget into the dialog m_dialog->setMainWidget( m_propsWidget ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 37a1f26e..64c638d9 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -47,9 +47,9 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete m_layout = new TQVBoxLayout( this ); m_preferencesDialog = new GroupWiseAccountPreferences( this ); m_layout->addWidget( m_preferencesDialog ); - connect( m_preferencesDialog->m_password, TQT_SIGNAL( changed() ), this, TQT_SLOT( configChanged() ) ); - connect( m_preferencesDialog->m_server, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_preferencesDialog->m_port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); + connect( m_preferencesDialog->m_password, TQ_SIGNAL( changed() ), this, TQ_SLOT( configChanged() ) ); + connect( m_preferencesDialog->m_server, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_preferencesDialog->m_port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); if ( account() ) reOpen(); else diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index 208e99fb..aec2b29d 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -68,13 +68,13 @@ GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWi m_privacy->m_allowList->setSelectionMode( TQListBox::Extended ); m_privacy->m_denyList->setSelectionMode( TQListBox::Extended ); - connect( m_privacy->m_btnAllow, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAllowClicked() ) ); - connect( m_privacy->m_btnBlock, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBlockClicked() ) ); - connect( m_privacy->m_btnAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddClicked() ) ); - connect( m_privacy->m_btnRemove, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveClicked() ) ); - connect( m_privacy->m_allowList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotAllowListClicked() ) ); - connect( m_privacy->m_denyList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotDenyListClicked() ) ); - connect( mgr, TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SLOT( slotPrivacyChanged() ) ); + connect( m_privacy->m_btnAllow, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAllowClicked() ) ); + connect( m_privacy->m_btnBlock, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBlockClicked() ) ); + connect( m_privacy->m_btnAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddClicked() ) ); + connect( m_privacy->m_btnRemove, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveClicked() ) ); + connect( m_privacy->m_allowList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotAllowListClicked() ) ); + connect( m_privacy->m_denyList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotDenyListClicked() ) ); + connect( mgr, TQ_SIGNAL( privacyChanged( const TQString &, bool ) ), TQ_SLOT( slotPrivacyChanged() ) ); m_privacy->m_btnAdd->setEnabled( true ); m_privacy->m_btnAllow->setEnabled( false ); m_privacy->m_btnBlock->setEnabled( false ); @@ -181,8 +181,8 @@ void GroupWisePrivacyDialog::slotAddClicked() KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( m_account, TQListView::Multi, false, m_searchDlg, "privacysearchwidget" ); m_searchDlg->setMainWidget( m_search ); - connect( m_searchDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSearchedForUsers() ) ); - connect( m_search, TQT_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( m_searchDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotSearchedForUsers() ) ); + connect( m_search, TQ_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQ_SLOT( enableButtonOK( bool ) ) ); m_searchDlg->enableButtonOK( false ); } m_searchDlg->show(); @@ -238,9 +238,9 @@ void GroupWisePrivacyDialog::slotRemoveClicked() void GroupWisePrivacyDialog::slotAllowListClicked() { // don't get into feedback - disconnect( m_privacy->m_denyList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotDenyListClicked() ) ); + disconnect( m_privacy->m_denyList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotDenyListClicked() ) ); m_privacy->m_denyList->clearSelection(); - connect( m_privacy->m_denyList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotDenyListClicked() ) ); + connect( m_privacy->m_denyList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotDenyListClicked() ) ); bool selected = false; for( int i = m_privacy->m_allowList->count() - 1; i >= 0 ; --i ) { @@ -258,9 +258,9 @@ void GroupWisePrivacyDialog::slotAllowListClicked() void GroupWisePrivacyDialog::slotDenyListClicked() { // don't get into feedback - disconnect( m_privacy->m_allowList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotAllowListClicked() ) ); + disconnect( m_privacy->m_allowList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotAllowListClicked() ) ); m_privacy->m_allowList->clearSelection(); - connect( m_privacy->m_allowList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotAllowListClicked() ) ); + connect( m_privacy->m_allowList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotAllowListClicked() ) ); bool selected = false; for( int i = m_privacy->m_denyList->count() - 1; i >= 0 ; --i ) { diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 4dbbe45b..b5f4d9a5 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -38,8 +38,8 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co { m_account = account; m_guid = event.guid; - connect( this, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotYesClicked() ) ); - connect( this, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotNoClicked() ) ); + connect( this, TQ_SIGNAL( yesClicked() ), TQ_SLOT( slotYesClicked() ) ); + connect( this, TQ_SIGNAL( noClicked() ), TQ_SLOT( slotNoClicked() ) ); GroupWiseContact * c = account->contactForDN( event.user ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index addb54cd..6bc26f0d 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -61,10 +61,10 @@ GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQLi { m_results->setSelectionMode( mode ); m_results->setAllColumnsShowFocus( true ); - connect( m_details, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowDetails() ) ); - connect( m_results, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotValidateSelection() ) ); - connect( m_search, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDoSearch() ) ); - connect( m_clear, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); + connect( m_details, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowDetails() ) ); + connect( m_results, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotValidateSelection() ) ); + connect( m_search, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDoSearch() ) ); + connect( m_clear, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) ); } @@ -130,7 +130,7 @@ void GroupWiseContactSearch::slotDoSearch() // start a search task SearchUserTask * st = new SearchUserTask( m_account->client()->rootTask() ); st->search( searchTerms ); - connect( st, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotSearchResults() ) ); + connect( st, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotSearchResults() ) ); st->go( true ); m_matchCount->setText( i18n( "Searching" ) ); } diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index ab7ba892..5175865a 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -82,36 +82,36 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T TQString version=i18n("Kopete IRC Plugin %1 [http://trinitydesktop.org]").arg(kapp->aboutData()->version()); m_engine->setVersionString( version ); - TQObject::connect(m_engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), - this, TQT_SLOT(successfullyChangedNick(const TQString &, const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), + this, TQ_SLOT(successfullyChangedNick(const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingFailedServerPassword()), - this, TQT_SLOT(slotFailedServerPassword())); + TQObject::connect(m_engine, TQ_SIGNAL(incomingFailedServerPassword()), + this, TQ_SLOT(slotFailedServerPassword())); - TQObject::connect(m_engine, TQT_SIGNAL(incomingNickInUse(const TQString &)), - this, TQT_SLOT(slotNickInUseAlert( const TQString &)) ); + TQObject::connect(m_engine, TQ_SIGNAL(incomingNickInUse(const TQString &)), + this, TQ_SLOT(slotNickInUseAlert( const TQString &)) ); - TQObject::connect(m_engine, TQT_SIGNAL(incomingFailedNickOnLogin(const TQString &)), - this, TQT_SLOT(slotNickInUse( const TQString &)) ); + TQObject::connect(m_engine, TQ_SIGNAL(incomingFailedNickOnLogin(const TQString &)), + this, TQ_SLOT(slotNickInUse( const TQString &)) ); - TQObject::connect(m_engine, TQT_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), - this, TQT_SLOT(slotJoinedUnknownChannel(const TQString &, const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), + this, TQ_SLOT(slotJoinedUnknownChannel(const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingCtcpReply(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT( slotNewCtcpReply(const TQString&, const TQString &, const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingCtcpReply(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT( slotNewCtcpReply(const TQString&, const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)), - this, TQT_SLOT(engineStatusChanged(KIRC::Engine::Status))); + TQObject::connect(m_engine, TQ_SIGNAL(statusChanged(KIRC::Engine::Status)), + this, TQ_SLOT(engineStatusChanged(KIRC::Engine::Status))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingServerLoadTooHigh()), - this, TQT_SLOT(slotServerBusy())); + TQObject::connect(m_engine, TQ_SIGNAL(incomingServerLoadTooHigh()), + this, TQ_SLOT(slotServerBusy())); - TQObject::connect(m_engine, TQT_SIGNAL(incomingNoSuchNickname(const TQString &)), - this, TQT_SLOT(slotNoSuchNickname(const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingNoSuchNickname(const TQString &)), + this, TQ_SLOT(slotNoSuchNickname(const TQString &))); mAwayAction = new Kopete::AwayAction ( i18n("Set Away"), m_protocol->m_UserStatusAway.iconFor( this ), 0, this, - TQT_SLOT(slotGoAway( const TQString & )), this ); + TQ_SLOT(slotGoAway( const TQString & )), this ); currentHost = 0; @@ -208,9 +208,9 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T m_myServer = m_contactManager->myServer(); m_joinChannelAction = new TDEAction ( i18n("Join Channel..."), TQString(), 0, this, - TQT_SLOT(slotJoinChannel()), this); + TQ_SLOT(slotJoinChannel()), this); m_searchChannelAction = new TDEAction ( i18n("Search Channels..."), TQString(), 0, this, - TQT_SLOT(slotSearchChannels()), this); + TQ_SLOT(slotSearchChannels()), this); } IRCAccount::~IRCAccount() @@ -426,12 +426,12 @@ TDEActionMenu *IRCAccount::actionMenu() mActionMenu->popupMenu()->insertSeparator(); mActionMenu->insert(m_joinChannelAction); mActionMenu->insert(m_searchChannelAction); - mActionMenu->insert( new TDEAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); + mActionMenu->insert( new TDEAction ( i18n("Show Server Window"), TQString(), 0, this, TQ_SLOT(slotShowServerWindow()), mActionMenu ) ); if( m_engine->isConnected() && m_engine->useSSL() ) { mActionMenu->insert( new TDEAction ( i18n("Show Security Information"), "", 0, m_engine, - TQT_SLOT(showInfoDialog()), mActionMenu ) ); + TQ_SLOT(showInfoDialog()), mActionMenu ) ); } return mActionMenu; @@ -534,7 +534,7 @@ void IRCAccount::engineStatusChanged(KIRC::Engine::Status newStatus) // after the 001 is sent, you need to wait until all the init junk is done. // Unfortunatly, there is no way for us to know when it is done (it could be // spewing out any number of replies), so just try delaying it - TQTimer::singleShot( 250, this, TQT_SLOT( slotPerformOnConnectCommands() ) ); + TQTimer::singleShot( 250, this, TQ_SLOT( slotPerformOnConnectCommands() ) ); } break; case KIRC::Engine::Closing: @@ -598,7 +598,7 @@ void IRCAccount::slotSearchChannels() { m_channelList = new ChannelListDialog( m_engine, i18n("Channel List for %1").arg( m_engine->currentHost() ), this, - TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) ); + TQ_SLOT( slotJoinNamedChannel( const TQString & ) ) ); } else m_channelList->clear(); @@ -889,7 +889,7 @@ IRCContact *IRCAccount::getContact(KIRC::EntityPtr entity, Kopete::MetaContact * m_contacts.append(contact); } - TQObject::connect(contact, TQT_SIGNAL(destroyed(IRCContact *)), TQT_SLOT(destroyed(IRCContact *))); + TQObject::connect(contact, TQ_SIGNAL(destroyed(IRCContact *)), TQ_SLOT(destroyed(IRCContact *))); return contact; } diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp index ec8f61e3..44e20c33 100644 --- a/kopete/protocols/irc/ircaddcontactpage.cpp +++ b/kopete/protocols/irc/ircaddcontactpage.cpp @@ -38,11 +38,11 @@ IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddCon mSearch = new ChannelList( (TQWidget*)ircdata->hbox, a->engine() ); mAccount = a; - connect( mSearch, TQT_SIGNAL( channelSelected( const TQString & ) ), - this, TQT_SLOT( slotChannelSelected( const TQString & ) ) ); + connect( mSearch, TQ_SIGNAL( channelSelected( const TQString & ) ), + this, TQ_SLOT( slotChannelSelected( const TQString & ) ) ); - connect( mSearch, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), - this, TQT_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); + connect( mSearch, TQ_SIGNAL( channelDoubleClicked( const TQString & ) ), + this, TQ_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); } IRCAddContactPage::~IRCAddContactPage() diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index c11aec03..1ac0a4b8 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -50,20 +50,20 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ KIRC::Engine *engine = kircEngine(); mInfoTimer = new TQTimer( this ); - TQObject::connect(mInfoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotUpdateInfo() ) ); + TQObject::connect(mInfoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotUpdateInfo() ) ); - TQObject::connect(engine, TQT_SIGNAL(incomingUserIsAway(const TQString &, const TQString &)), - this, TQT_SLOT(slotIncomingUserIsAway(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingUserIsAway(const TQString &, const TQString &)), + this, TQ_SLOT(slotIncomingUserIsAway(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingListedChan(const TQString &, uint, const TQString &)), - this, TQT_SLOT(slotChannelListed(const TQString &, uint, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingListedChan(const TQString &, uint, const TQString &)), + this, TQ_SLOT(slotChannelListed(const TQString &, uint, const TQString &))); actionJoin = 0L; - actionModeT = new TDEToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeN = new TDEToggleAction(i18n("&No Outside Messages"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeS = new TDEToggleAction(i18n("&Secret"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeM = new TDEToggleAction(i18n("&Moderated"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeI = new TDEToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeT = new TDEToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeN = new TDEToggleAction(i18n("&No Outside Messages"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeS = new TDEToggleAction(i18n("&Secret"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeM = new TDEToggleAction(i18n("&Moderated"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeI = new TDEToggleAction(i18n("&Invite Only"), 0, this, TQ_SLOT(slotModeChanged()), this ); actionHomePage = 0L; updateStatus(); @@ -261,7 +261,7 @@ void IRCChannelContact::slotAddNicknames() mJoinedNicks.pop_front(); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotAddNicknames() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAddNicknames() ) ); } void IRCChannelContact::channelTopic(const TQString &topic) @@ -303,9 +303,9 @@ void IRCChannelContact::join() if (manager()) { connect(manager(), - TQT_SIGNAL(onlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, + TQ_SIGNAL(onlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &)), - TQT_SLOT(slotOnlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, + TQ_SLOT(slotOnlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &))); } } @@ -658,15 +658,15 @@ TQPtrList *IRCChannelContact::customContextMenuActions() TQPtrList *mCustomActions = new TQPtrList(); if( !actionJoin ) { - actionJoin = new TDEAction(i18n("&Join"), 0, this, TQT_SLOT(join()), this, "actionJoin"); - actionPart = new TDEAction(i18n("&Part"), 0, this, TQT_SLOT(partAction()), this, "actionPart"); - actionTopic = new TDEAction(i18n("Change &Topic..."), 0, this, TQT_SLOT(setTopic()), this, "actionTopic"); + actionJoin = new TDEAction(i18n("&Join"), 0, this, TQ_SLOT(join()), this, "actionJoin"); + actionPart = new TDEAction(i18n("&Part"), 0, this, TQ_SLOT(partAction()), this, "actionPart"); + actionTopic = new TDEAction(i18n("Change &Topic..."), 0, this, TQ_SLOT(setTopic()), this, "actionTopic"); actionModeMenu = new TDEActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu"); if( !property(m_protocol->propHomepage).value().isNull() ) { actionHomePage = new TDEAction( i18n("Visit &Homepage"), 0, this, - TQT_SLOT(slotHomepage()), this, "actionHomepage"); + TQ_SLOT(slotHomepage()), this, "actionHomepage"); } else if( actionHomePage ) { @@ -681,8 +681,8 @@ TQPtrList *IRCChannelContact::customContextMenuActions() actionModeMenu->setEnabled( true ); codecAction = new KCodecAction( i18n("&Encoding"), 0, this, "selectcharset" ); - connect( codecAction, TQT_SIGNAL( activated( const TQTextCodec * ) ), - this, TQT_SLOT( setCodec( const TQTextCodec *) ) ); + connect( codecAction, TQ_SIGNAL( activated( const TQTextCodec * ) ), + this, TQ_SLOT( setCodec( const TQTextCodec *) ) ); codecAction->setCodec( codec() ); } diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 1df631f9..3532cb4c 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -53,22 +53,22 @@ IRCContact::IRCContact(IRCContactManager *contactManager, const TQString &nick, setProperty( Kopete::Global::Properties::self()->nickName(), m_nickName ); // IRCContactManager stuff - TQObject::connect(contactManager, TQT_SIGNAL(privateMessage(IRCContact *, IRCContact *, const TQString &)), - this, TQT_SLOT(privateMessage(IRCContact *, IRCContact *, const TQString &))); + TQObject::connect(contactManager, TQ_SIGNAL(privateMessage(IRCContact *, IRCContact *, const TQString &)), + this, TQ_SLOT(privateMessage(IRCContact *, IRCContact *, const TQString &))); // Kopete::ChatSessionManager stuff mMyself.append( static_cast( this ) ); // KIRC stuff - TQObject::connect(engine, TQT_SIGNAL(incomingNickChange(const TQString &, const TQString &)), - this, TQT_SLOT( slotNewNickChange(const TQString&, const TQString&))); - TQObject::connect(engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), - this, TQT_SLOT(slotNewNickChange(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)), - this, TQT_SLOT( slotUserDisconnected(const TQString&, const TQString&))); + TQObject::connect(engine, TQ_SIGNAL(incomingNickChange(const TQString &, const TQString &)), + this, TQ_SLOT( slotNewNickChange(const TQString&, const TQString&))); + TQObject::connect(engine, TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), + this, TQ_SLOT(slotNewNickChange(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)), + this, TQ_SLOT( slotUserDisconnected(const TQString&, const TQString&))); - TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)), - this, TQT_SLOT(updateStatus())); + TQObject::connect(engine, TQ_SIGNAL(statusChanged(KIRC::Engine::Status)), + this, TQ_SLOT(updateStatus())); engine->setCodec( m_nickName, codec() ); } @@ -159,10 +159,10 @@ Kopete::ChatSession *IRCContact::manager(Kopete::Contact::CanCreateFlags canCrea m_chatSession = Kopete::ChatSessionManager::self()->create(account->myself(), mMyself, account->protocol()); m_chatSession->setDisplayName(caption()); - TQObject::connect(m_chatSession, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession *)), - this, TQT_SLOT(slotSendMsg(Kopete::Message&, Kopete::ChatSession *))); - TQObject::connect(m_chatSession, TQT_SIGNAL(closing(Kopete::ChatSession *)), - this, TQT_SLOT(chatSessionDestroyed())); + TQObject::connect(m_chatSession, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession *)), + this, TQ_SLOT(slotSendMsg(Kopete::Message&, Kopete::ChatSession *))); + TQObject::connect(m_chatSession, TQ_SIGNAL(closing(Kopete::ChatSession *)), + this, TQ_SLOT(chatSessionDestroyed())); initConversation(); } diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index 10ae8a69..7f6c5625 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -48,23 +48,23 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou // m->setTemporary( true ); m_myServer = new IRCServerContact(this, account->networkName(), m); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingMessage(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotNewMessage(const TQString &, const TQString &, const TQString &))); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingMessage(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotNewMessage(const TQString &, const TQString &, const TQString &))); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingPrivMessage(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotNewPrivMessage(const TQString &, const TQString &, const TQString &))); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingPrivMessage(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotNewPrivMessage(const TQString &, const TQString &, const TQString &))); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingNickChange(const TQString &, const TQString &)), - this, TQT_SLOT( slotNewNickChange(const TQString&, const TQString&))); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingNickChange(const TQString &, const TQString &)), + this, TQ_SLOT( slotNewNickChange(const TQString&, const TQString&))); - TQObject::connect(account->engine(), TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), - this, TQT_SLOT( slotNewNickChange(const TQString &, const TQString &))); + TQObject::connect(account->engine(), TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), + this, TQ_SLOT( slotNewNickChange(const TQString &, const TQString &))); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingUserOnline(const TQString &)), - this, TQT_SLOT( slotIsonRecieved())); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingUserOnline(const TQString &)), + this, TQ_SLOT( slotIsonRecieved())); - TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL(metaContactAdded( Kopete::MetaContact * )), - this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* ))); + TQObject::connect(Kopete::ContactList::self(), TQ_SIGNAL(metaContactAdded( Kopete::MetaContact * )), + this, TQ_SLOT( slotContactAdded( Kopete::MetaContact* ))); socketTimeout = 15000; TQString timeoutPath = locate( "config", "tdeioslaverc" ); @@ -75,8 +75,8 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou } m_NotifyTimer = new TQTimer(this); - TQObject::connect(m_NotifyTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkOnlineNotifyList())); + TQObject::connect(m_NotifyTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkOnlineNotifyList())); m_NotifyTimer->start(30000); // check online every 30sec new IRCSignalHandler(this); @@ -155,8 +155,8 @@ IRCChannelContact *IRCContactManager::findChannel(const TQString &name, Kopete:: channel = new IRCChannelContact(this, name, m); m_channels.insert( name, channel ); - TQObject::connect(channel, TQT_SIGNAL(contactDestroyed(Kopete::Contact *)), - this, TQT_SLOT(unregister(Kopete::Contact *))); + TQObject::connect(channel, TQ_SIGNAL(contactDestroyed(Kopete::Contact *)), + this, TQ_SLOT(unregister(Kopete::Contact *))); } return channel; @@ -193,8 +193,8 @@ IRCUserContact *IRCContactManager::findUser(const TQString &name, Kopete::MetaCo user = new IRCUserContact(this, name, m); m_users.insert( name, user ); - TQObject::connect(user, TQT_SIGNAL(contactDestroyed(Kopete::Contact *)), - this, TQT_SLOT(unregister(Kopete::Contact *))); + TQObject::connect(user, TQ_SIGNAL(contactDestroyed(Kopete::Contact *)), + this, TQ_SLOT(unregister(Kopete::Contact *))); } return user; @@ -279,7 +279,7 @@ void IRCContactManager::checkOnlineNotifyList() { isonRecieved = false; m_account->engine()->ison( m_NotifyList ); - //TQTimer::singleShot( socketTimeout, this, TQT_SLOT( slotIsonTimeout() ) ); + //TQTimer::singleShot( socketTimeout, this, TQ_SLOT( slotIsonTimeout() ) ); } } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 6229a294..a74ae8d4 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -169,77 +169,77 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList addAddressBookField("messaging/irc", Kopete::Plugin::MakeIndexField); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("raw"), - TQT_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /raw - Sends the text in raw form to the server."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quote"), - TQT_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quote - Sends the text in quoted form to the server."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ctcp"), - TQT_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ctcp - Send the CTCP message to nick."), 2 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ping"), - TQT_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ping - Alias for /CTCP PING."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("motd"), - TQT_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /motd [] - Shows the message of the day for the current or the given server.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("list"), - TQT_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /list - List the public channels on the server.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("join"), - TQT_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /join <#channel 1> [] - Joins the specified channel."), 1, 2 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("topic"), - TQT_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /topic [] - Sets and/or displays the topic for the active channel.") ); //FIXME: Update help text Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whois"), - TQT_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whois - Display whois info on this user."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whowas"), - TQT_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whowas - Display whowas info on this user."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("who"), - TQT_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /who - Display who info on this user/channel."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("query"), - TQT_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /query [] - Open a private chat with this user."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("mode"), - TQT_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /mode - Set modes on the given channel."), 2 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("nick"), - TQT_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /nick - Change your nickname to the given one."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("me"), - TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /me - Do something."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ame"), - TQT_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ame - Do something in every open chat."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("kick"), - TQT_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /kick [] - Kick someone from the channel (requires operator status).") , 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ban"), - TQT_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ban - Add someone to this channel's ban list. (requires operator status)."), 1, 1 ); @@ -248,33 +248,33 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList i18n("USAGE: /bannick - Add someone to this channel's ban list. Uses the hostmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("op"), - TQT_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /op [ <...>] - Give channel operator status to someone (requires operator status)."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("deop"), - TQT_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /deop [ <...>]- Remove channel operator status from someone (requires operator status)."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("voice"), - TQT_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /voice [ <...>]- Give channel voice status to someone (requires operator status)."), 1); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("devoice"), - TQT_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /devoice [ <...>]- Remove channel voice status from someone (requires operator status)."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quit"), - TQT_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quit [] - Disconnect from IRC, optionally leaving a message.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("part"), - TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /part [] - Part from a channel, optionally leaving a message.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("invite"), - TQT_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /invite [] - Invite a user to join a channel."), 1 ); Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("j"), @@ -286,11 +286,11 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList TQString::fromLatin1("query %s"), i18n("USAGE: /msg [] - Alias for QUERY ."), Kopete::CommandHandler::SystemAlias, 1 ); - TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)), - this, TQT_SLOT(slotMessageFilter(Kopete::Message &)) ); + TQObject::connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL(aboutToDisplay(Kopete::Message &)), + this, TQ_SLOT(slotMessageFilter(Kopete::Message &)) ); - TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( viewCreated( KopeteView* ) ), - this, TQT_SLOT( slotViewCreated( KopeteView* ) ) ); + TQObject::connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( viewCreated( KopeteView* ) ), + this, TQ_SLOT( slotViewCreated( KopeteView* ) ) ); setCapabilities( Kopete::Protocol::RichBFormatting | Kopete::Protocol::RichUFormatting | Kopete::Protocol::RichColor ); @@ -774,24 +774,24 @@ void IRCProtocol::editNetworks( const TQString &networkName ) netConf->upButton->setIconSet( SmallIconSet( "go-up" ) ); netConf->downButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); - connect( netConf, TQT_SIGNAL( accepted() ), this, TQT_SLOT( slotSaveNetworkConfig() ) ); - connect( netConf, TQT_SIGNAL( rejected() ), this, TQT_SLOT( slotReadNetworks() ) ); - connect( netConf->upButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveServerUp() ) ); - connect( netConf->downButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveServerDown() ) ); - connect( netConf->removeNetwork, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeleteNetwork() ) ); - connect( netConf->removeHost, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeleteHost() ) ); - connect( netConf->newHost, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNewHost() ) ); - connect( netConf->newNetwork, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNewNetwork() ) ); - connect( netConf->renameNetwork, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRenameNetwork() ) ); - connect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); - connect( netConf->networkList, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), TQT_SLOT(slotRenameNetwork())); + connect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf, TQ_SIGNAL( accepted() ), this, TQ_SLOT( slotSaveNetworkConfig() ) ); + connect( netConf, TQ_SIGNAL( rejected() ), this, TQ_SLOT( slotReadNetworks() ) ); + connect( netConf->upButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveServerUp() ) ); + connect( netConf->downButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveServerDown() ) ); + connect( netConf->removeNetwork, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteNetwork() ) ); + connect( netConf->removeHost, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteHost() ) ); + connect( netConf->newHost, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewHost() ) ); + connect( netConf->newNetwork, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewNetwork() ) ); + connect( netConf->renameNetwork, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRenameNetwork() ) ); + connect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); + connect( netConf->networkList, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), TQ_SLOT(slotRenameNetwork())); } - disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->networkList->clear(); @@ -803,8 +803,8 @@ void IRCProtocol::editNetworks( const TQString &networkName ) netConf->networkList->sort(); - connect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); if( !networkName.isEmpty() ) netConf->networkList->setSelected( netConf->networkList->findItem( networkName ), true ); @@ -830,10 +830,10 @@ void IRCProtocol::slotUpdateNetworkConfig() netConf->hostList->insertItem( (*it)->host + TQString::fromLatin1(":") + TQString::number((*it)->port) ); // prevent nested event loop crash - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->hostList->setSelected( 0, true ); slotUpdateNetworkHostConfig(); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); } // record the current selection @@ -873,9 +873,9 @@ void IRCProtocol::slotHostPortChanged( int value ) { TQString entryText = m_uiCurrentHostSelection + TQString::fromLatin1(":") + TQString::number( value ); // changeItem causes a take() and insert, and we don't want a selectionChanged() signal that sets all this off again. - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->hostList->changeItem( entryText, netConf->hostList->currentItem() ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); } void IRCProtocol::slotUpdateNetworkHostConfig() @@ -891,9 +891,9 @@ void IRCProtocol::slotUpdateNetworkHostConfig() { netConf->host->setText( host->host ); netConf->password->setText( host->password ); - disconnect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + disconnect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); netConf->port->setValue( host->port ); - connect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + connect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); netConf->useSSL->setChecked( host->ssl ); netConf->upButton->setEnabled( netConf->hostList->currentItem() > 0 ); @@ -903,12 +903,12 @@ void IRCProtocol::slotUpdateNetworkHostConfig() else { m_uiCurrentHostSelection = TQString(); - disconnect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + disconnect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); netConf->host->clear(); netConf->password->clear(); netConf->port->setValue( 6667 ); netConf->useSSL->setChecked( false ); - connect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + connect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); } } @@ -921,8 +921,8 @@ void IRCProtocol::slotDeleteNetwork() .arg(network), i18n("Deleting Network"), KGuiItem(i18n("&Delete Network"),"edit-delete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { - disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); IRCNetwork *net = m_networks[ network ]; for( TQValueList::iterator it = net->hosts.begin(); it != net->hosts.end(); ++it ) { @@ -932,8 +932,8 @@ void IRCProtocol::slotDeleteNetwork() m_networks.remove( network ); delete net; netConf->networkList->removeItem( netConf->networkList->currentItem() ); - connect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); slotUpdateNetworkHostConfig(); } @@ -950,11 +950,11 @@ void IRCProtocol::slotDeleteHost() IRCHost *host = m_hosts[ hostName ]; if ( host ) { - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port); TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); // remove from network as well IRCNetwork *net = m_networks[ m_uiCurrentNetworkSelection ]; diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 7c7a9d50..0f9189f0 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -35,33 +35,33 @@ IRCServerContact::IRCServerContact(IRCContactManager *contactManager, const TQSt { KIRC::Engine *engine = kircEngine(); - TQObject::connect(engine, TQT_SIGNAL(internalError(KIRC::Engine::Error, KIRC::Message &)), - this, TQT_SLOT(engineInternalError(KIRC::Engine::Error, KIRC::Message &))); + TQObject::connect(engine, TQ_SIGNAL(internalError(KIRC::Engine::Error, KIRC::Message &)), + this, TQ_SLOT(engineInternalError(KIRC::Engine::Error, KIRC::Message &))); /* //FIXME: Have some kind of a debug option for raw input/ouput display?? - TQObject::connect(engine, TQT_SIGNAL(sentMessage(KIRC::Message &)), - this, TQT_SLOT(engineSentMessage(KIRC::Message &))); - TQObject::connect(engine, TQT_SIGNAL(receivedMessage(KIRC::Message &)), - this, TQT_SLOT(engineReceivedMessage(KIRC::Message &))); + TQObject::connect(engine, TQ_SIGNAL(sentMessage(KIRC::Message &)), + this, TQ_SLOT(engineSentMessage(KIRC::Message &))); + TQObject::connect(engine, TQ_SIGNAL(receivedMessage(KIRC::Message &)), + this, TQ_SLOT(engineReceivedMessage(KIRC::Message &))); */ - TQObject::connect(engine, TQT_SIGNAL(incomingNotice(const TQString &, const TQString &)), - this, TQT_SLOT(slotIncomingNotice(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingNotice(const TQString &, const TQString &)), + this, TQ_SLOT(slotIncomingNotice(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingCannotSendToChannel(const TQString &, const TQString &)), - this, TQT_SLOT(slotCannotSendToChannel(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingCannotSendToChannel(const TQString &, const TQString &)), + this, TQ_SLOT(slotCannotSendToChannel(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingUnknown(const TQString &)), - this, TQT_SLOT(slotIncomingUnknown(const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingUnknown(const TQString &)), + this, TQ_SLOT(slotIncomingUnknown(const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingConnectString(const TQString &)), - this, TQT_SLOT(slotIncomingConnect(const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingConnectString(const TQString &)), + this, TQ_SLOT(slotIncomingConnect(const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingMotd(const TQString &)), - this, TQT_SLOT(slotIncomingMotd(const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingMotd(const TQString &)), + this, TQ_SLOT(slotIncomingMotd(const TQString &))); - TQObject::connect(Kopete::ChatSessionManager::self(), TQT_SIGNAL(viewCreated(KopeteView*)), - this, TQT_SLOT(slotViewCreated(KopeteView*)) ); + TQObject::connect(Kopete::ChatSessionManager::self(), TQ_SIGNAL(viewCreated(KopeteView*)), + this, TQ_SLOT(slotViewCreated(KopeteView*)) ); updateStatus(); } @@ -206,7 +206,7 @@ void IRCServerContact::slotDumpMessages() { manager()->appendMessage( mMsgBuffer.front() ); mMsgBuffer.pop_front(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDumpMessages() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDumpMessages() ) ); } } @@ -214,7 +214,7 @@ void IRCServerContact::slotViewCreated( KopeteView *v ) { kdDebug(14121) << k_funcinfo << "Created: " << v << ", mgr: " << v->msgManager() << ", Mine: " << m_chatSession << endl; if (m_chatSession && v->msgManager() == m_chatSession) - TQTimer::singleShot(500, this, TQT_SLOT(slotDumpMessages())); + TQTimer::singleShot(500, this, TQ_SLOT(slotDumpMessages())); } #include "ircservercontact.moc" diff --git a/kopete/protocols/irc/ircsignalhandler.cpp b/kopete/protocols/irc/ircsignalhandler.cpp index db0acec2..cdc73665 100644 --- a/kopete/protocols/irc/ircsignalhandler.cpp +++ b/kopete/protocols/irc/ircsignalhandler.cpp @@ -29,101 +29,101 @@ IRCSignalHandler::IRCSignalHandler(IRCContactManager *m) KIRC::Engine *m_engine = static_cast( manager->mySelf()->account() )->engine(); //Channel Connections to ourself - TQObject::connect(m_engine, TQT_SIGNAL(incomingNamesList(const TQString &, const TQStringList &)), - this, TQT_SLOT(slotNamesList(const TQString &, const TQStringList &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingNamesList(const TQString &, const TQStringList &)), + this, TQ_SLOT(slotNamesList(const TQString &, const TQStringList &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingEndOfNames(const TQString &)), - this, TQT_SLOT(slotEndOfNames(const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingEndOfNames(const TQString &)), + this, TQ_SLOT(slotEndOfNames(const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingTopicUser(const TQString &, const TQString &, const TQDateTime &)), - this, TQT_SLOT(slotTopicUser(const TQString&,const TQString&,const TQDateTime&))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingTopicUser(const TQString &, const TQString &, const TQDateTime &)), + this, TQ_SLOT(slotTopicUser(const TQString&,const TQString&,const TQDateTime&))); //Channel String mappings - map( m, TQT_SIGNAL(incomingFailedChankey(const TQString &)), + map( m, TQ_SIGNAL(incomingFailedChankey(const TQString &)), &IRCChannelContact::failedChankey ); - map( m, TQT_SIGNAL(incomingFailedChanFull(const TQString &)), + map( m, TQ_SIGNAL(incomingFailedChanFull(const TQString &)), &IRCChannelContact::failedChanInvite ); - map( m, TQT_SIGNAL(incomingFailedChanInvite(const TQString &)), + map( m, TQ_SIGNAL(incomingFailedChanInvite(const TQString &)), &IRCChannelContact::failedChanInvite ); - map( m, TQT_SIGNAL(incomingFailedChanBanned(const TQString &)), + map( m, TQ_SIGNAL(incomingFailedChanBanned(const TQString &)), &IRCChannelContact::failedChanBanned ); - mapSingle( m, TQT_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), + mapSingle( m, TQ_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), &IRCChannelContact::userJoinedChannel ); - mapSingle( m, TQT_SIGNAL(incomingExistingTopic(const TQString &, const TQString &)), + mapSingle( m, TQ_SIGNAL(incomingExistingTopic(const TQString &, const TQString &)), &IRCChannelContact::channelTopic ); - mapSingle( m, TQT_SIGNAL(incomingChannelHomePage(const TQString &, const TQString &)), + mapSingle( m, TQ_SIGNAL(incomingChannelHomePage(const TQString &, const TQString &)), &IRCChannelContact::channelHomePage ); mapDouble( m, - TQT_SIGNAL(incomingPartedChannel(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingPartedChannel(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::userPartedChannel ); mapDouble( m, - TQT_SIGNAL(incomingTopicChange(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingTopicChange(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::topicChanged ); mapDouble( m, - TQT_SIGNAL(incomingChannelModeChange(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingChannelModeChange(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::incomingModeChange ); mapDouble( m, - TQT_SIGNAL(incomingChannelMode(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingChannelMode(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::incomingChannelMode ); mapTriple( m, - TQT_SIGNAL(incomingKick(const TQString &, const TQString &,const TQString &,const TQString &)), + TQ_SIGNAL(incomingKick(const TQString &, const TQString &,const TQString &,const TQString &)), &IRCChannelContact::userKicked ); //User connections to ourself - TQObject::connect(m_engine, TQT_SIGNAL(incomingWhoIsIdle(const TQString &, unsigned long )), - this, TQT_SLOT(slotNewWhoIsIdle(const TQString &, unsigned long ))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingWhoIsIdle(const TQString &, unsigned long )), + this, TQ_SLOT(slotNewWhoIsIdle(const TQString &, unsigned long ))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingWhoReply(const TQString &, const TQString &, const TQString &, + TQObject::connect(m_engine, TQ_SIGNAL(incomingWhoReply(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, bool, const TQString &, uint, const TQString & )), - this, TQT_SLOT( slotNewWhoReply(const TQString &, const TQString &, const TQString &, const TQString &, + this, TQ_SLOT( slotNewWhoReply(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, bool, const TQString &, uint, const TQString &))); //User signal mappings - map( m, TQT_SIGNAL(incomingUserOnline( const TQString & )), &IRCUserContact::userOnline ); + map( m, TQ_SIGNAL(incomingUserOnline( const TQString & )), &IRCUserContact::userOnline ); - map( m, TQT_SIGNAL(incomingWhoIsOperator( const TQString & )), &IRCUserContact::newWhoIsOperator ); + map( m, TQ_SIGNAL(incomingWhoIsOperator( const TQString & )), &IRCUserContact::newWhoIsOperator ); - map( m, TQT_SIGNAL(incomingWhoIsIdentified( const TQString & )), &IRCUserContact::newWhoIsIdentified ); + map( m, TQ_SIGNAL(incomingWhoIsIdentified( const TQString & )), &IRCUserContact::newWhoIsIdentified ); - map( m, TQT_SIGNAL(incomingEndOfWhois( const TQString & )), &IRCUserContact::whoIsComplete ); + map( m, TQ_SIGNAL(incomingEndOfWhois( const TQString & )), &IRCUserContact::whoIsComplete ); - map( m, TQT_SIGNAL(incomingEndOfWhoWas( const TQString & )), &IRCUserContact::whoWasComplete ); + map( m, TQ_SIGNAL(incomingEndOfWhoWas( const TQString & )), &IRCUserContact::whoWasComplete ); - mapSingle( m, TQT_SIGNAL(incomingUserIsAway( const TQString &, const TQString & )), + mapSingle( m, TQ_SIGNAL(incomingUserIsAway( const TQString &, const TQString & )), &IRCUserContact::incomingUserIsAway ); - mapSingle( m, TQT_SIGNAL(incomingWhoIsChannels( const TQString &, const TQString & )), + mapSingle( m, TQ_SIGNAL(incomingWhoIsChannels( const TQString &, const TQString & )), &IRCUserContact::newWhoIsChannels ); mapDouble( m, - TQT_SIGNAL(incomingWhoIsServer(const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingWhoIsServer(const TQString &, const TQString &, const TQString &)), &IRCUserContact::newWhoIsServer ); mapDouble( m, - TQT_SIGNAL(incomingPrivAction(const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingPrivAction(const TQString &, const TQString &, const TQString &)), &IRCUserContact::newAction ); mapDouble( m, - TQT_SIGNAL(incomingAction(const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingAction(const TQString &, const TQString &, const TQString &)), &IRCChannelContact::newAction ); mapTriple( m, - TQT_SIGNAL(incomingWhoIsUser(const TQString &, const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingWhoIsUser(const TQString &, const TQString &, const TQString &, const TQString &)), &IRCUserContact::newWhoIsUser ); mapTriple( m, - TQT_SIGNAL(incomingWhoWasUser(const TQString &, const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingWhoWasUser(const TQString &, const TQString &, const TQString &, const TQString &)), &IRCUserContact::newWhoIsUser ); } diff --git a/kopete/protocols/irc/ircsignalhandler.h b/kopete/protocols/irc/ircsignalhandler.h index 50331f70..f975c2b7 100644 --- a/kopete/protocols/irc/ircsignalhandler.h +++ b/kopete/protocols/irc/ircsignalhandler.h @@ -294,7 +294,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, new QMember( mapping, this), - TQT_SLOT( slotEmit( const TQString &) ) + TQ_SLOT( slotEmit( const TQString &) ) ); } @@ -306,7 +306,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, new QMemberSingle( mapping, this), - TQT_SLOT( slotEmit( const TQString &, const TQString &) ) + TQ_SLOT( slotEmit( const TQString &, const TQString &) ) ); } @@ -318,7 +318,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, new QMemberDouble( mapping, this), - TQT_SLOT( slotEmit( const TQString &, const TQString &,const TQString &) ) + TQ_SLOT( slotEmit( const TQString &, const TQString &,const TQString &) ) ); } @@ -331,7 +331,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, new QMemberTriple( mapping, this), - TQT_SLOT( slotEmit( const TQString &, const TQString &,const TQString &,const TQString &) ) + TQ_SLOT( slotEmit( const TQString &, const TQString &,const TQString &,const TQString &) ) ); } }; diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index fd004985..6846bea1 100644 --- a/kopete/protocols/irc/irctransferhandler.cpp +++ b/kopete/protocols/irc/irctransferhandler.cpp @@ -41,13 +41,13 @@ KIRC::TransferHandler *IRCTransferHandler::handler() IRCTransferHandler::IRCTransferHandler() { - connect(handler(), TQT_SIGNAL(transferCreated(KIRC::Transfer *)), - this, TQT_SLOT(transferCreated(KIRC::Transfer *))); + connect(handler(), TQ_SIGNAL(transferCreated(KIRC::Transfer *)), + this, TQ_SLOT(transferCreated(KIRC::Transfer *))); - connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(accepted(Kopete::Transfer *, const TQString &)), - this, TQT_SLOT(transferAccepted(Kopete::Transfer *, const TQString&))); - connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo &)), - this, TQT_SLOT(transferRefused(const Kopete::FileTransferInfo &))); + connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(accepted(Kopete::Transfer *, const TQString &)), + this, TQ_SLOT(transferAccepted(Kopete::Transfer *, const TQString&))); + connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL(refused(const Kopete::FileTransferInfo &)), + this, TQ_SLOT(transferRefused(const Kopete::FileTransferInfo &))); } void IRCTransferHandler::transferCreated(KIRC::Transfer *t) @@ -121,8 +121,8 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans // case KIRC::Transfer::Chat: case KIRC::Transfer::FileOutgoing: case KIRC::Transfer::FileIncoming: - connect(t , TQT_SIGNAL(fileSizeAcknowledge(unsigned int)), - kt, TQT_SLOT(slotProcessed(unsigned int))); + connect(t , TQ_SIGNAL(fileSizeAcknowledge(unsigned int)), + kt, TQ_SLOT(slotProcessed(unsigned int))); break; default: kdDebug(14120) << k_funcinfo << "Unknown transfer connections for type" << endl; @@ -130,16 +130,16 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans return; } - connect(t , TQT_SIGNAL(complete()), - kt, TQT_SLOT(slotComplete())); + connect(t , TQ_SIGNAL(complete()), + kt, TQ_SLOT(slotComplete())); -// connect(kt , TQT_SIGNAL(transferCanceled()), -// t, TQT_SLOT(abort())); -// connect(kt, TQT_SIGNAL(destroyed()), -// t, TQT_SLOT(slotKopeteTransferDestroyed())); +// connect(kt , TQ_SIGNAL(transferCanceled()), +// t, TQ_SLOT(abort())); +// connect(kt, TQ_SIGNAL(destroyed()), +// t, TQ_SLOT(slotKopeteTransferDestroyed())); - connect(kt, TQT_SIGNAL(result(TDEIO::Job *)), - this , TQT_SLOT(tdeioresult(TDEIO::Job *))); + connect(kt, TQ_SIGNAL(result(TDEIO::Job *)), + this , TQ_SLOT(tdeioresult(TDEIO::Job *))); t->initiate(); } diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 1254b9d9..0e7f8760 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -41,10 +41,10 @@ IRCUserContact::IRCUserContact(IRCContactManager *contactManager, const TQString mOnlineTimer = new TQTimer( this ); - TQObject::connect(mOnlineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotUserOffline() ) ); + TQObject::connect(mOnlineTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotUserOffline() ) ); - TQObject::connect(kircEngine(), TQT_SIGNAL(incomingChannelModeChange(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotIncomingModeChange(const TQString&,const TQString&, const TQString&))); + TQObject::connect(kircEngine(), TQ_SIGNAL(incomingChannelModeChange(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotIncomingModeChange(const TQString&,const TQString&, const TQString&))); mInfo.isOperator = false; mInfo.isIdentified = false; @@ -246,7 +246,7 @@ void IRCUserContact::slotBanHost() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanHostOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanHostOnce() ) ); } } else { slotBanHostOnce(); @@ -270,7 +270,7 @@ void IRCUserContact::slotBanUserHost() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanUserHostOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanUserHostOnce() ) ); } } else { slotBanUserHostOnce(); @@ -294,7 +294,7 @@ void IRCUserContact::slotBanDomain() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanDomainOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanDomainOnce() ) ); } } else { slotBanDomainOnce(); @@ -320,7 +320,7 @@ void IRCUserContact::slotBanUserDomain() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanUserDomainOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanUserDomainOnce() ) ); } } else { slotBanUserDomainOnce(); @@ -537,38 +537,38 @@ TQPtrList *IRCUserContact::customContextMenuActions( Kopete::ChatSess { actionCtcpMenu = new TDEActionMenu(i18n("C&TCP"), 0, this ); actionCtcpMenu->insert( new TDEAction(i18n("&Version"), 0, this, - TQT_SLOT(slotCtcpVersion()), actionCtcpMenu) ); + TQ_SLOT(slotCtcpVersion()), actionCtcpMenu) ); actionCtcpMenu->insert( new TDEAction(i18n("&Ping"), 0, this, - TQT_SLOT(slotCtcpPing()), actionCtcpMenu) ); + TQ_SLOT(slotCtcpPing()), actionCtcpMenu) ); actionModeMenu = new TDEActionMenu(i18n("&Modes"), 0, this, "actionModeMenu"); actionModeMenu->insert( new TDEAction(i18n("&Op"), 0, this, - TQT_SLOT(slotOp()), actionModeMenu, "actionOp") ); + TQ_SLOT(slotOp()), actionModeMenu, "actionOp") ); actionModeMenu->insert( new TDEAction(i18n("&Deop"), 0, this, - TQT_SLOT(slotDeop()), actionModeMenu, "actionDeop") ); + TQ_SLOT(slotDeop()), actionModeMenu, "actionDeop") ); actionModeMenu->insert( new TDEAction(i18n("&Voice"), 0, this, - TQT_SLOT(slotVoice()), actionModeMenu, "actionVoice") ); + TQ_SLOT(slotVoice()), actionModeMenu, "actionVoice") ); actionModeMenu->insert( new TDEAction(i18n("Devoice"), 0, this, - TQT_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") ); + TQ_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") ); actionModeMenu->setEnabled( false ); - actionKick = new TDEAction(i18n("&Kick"), 0, this, TQT_SLOT(slotKick()), this); + actionKick = new TDEAction(i18n("&Kick"), 0, this, TQ_SLOT(slotKick()), this); actionKick->setEnabled( false ); actionBanMenu = new TDEActionMenu(i18n("&Ban"), 0, this, "actionBanMenu"); actionBanMenu->insert( new TDEAction(i18n("Host (*!*@host.domain.net)"), 0, this, - TQT_SLOT(slotBanHost()), actionBanMenu ) ); + TQ_SLOT(slotBanHost()), actionBanMenu ) ); actionBanMenu->insert( new TDEAction(i18n("Domain (*!*@*.domain.net)"), 0, this, - TQT_SLOT(slotBanDomain()), actionBanMenu ) ); + TQ_SLOT(slotBanDomain()), actionBanMenu ) ); actionBanMenu->insert( new TDEAction(i18n("User@Host (*!*user@host.domain.net)"), 0, this, - TQT_SLOT(slotBanUserHost()), actionBanMenu ) ); + TQ_SLOT(slotBanUserHost()), actionBanMenu ) ); actionBanMenu->insert( new TDEAction(i18n("User@Domain (*!*user@*.domain.net)"), 0, this, - TQT_SLOT(slotBanUserDomain()), actionBanMenu ) ); + TQ_SLOT(slotBanUserDomain()), actionBanMenu ) ); actionBanMenu->setEnabled( false ); codecAction = new KCodecAction( i18n("&Encoding"), 0, this, "selectcharset" ); - connect( codecAction, TQT_SIGNAL( activated( const TQTextCodec * ) ), - this, TQT_SLOT( setCodec( const TQTextCodec *) ) ); + connect( codecAction, TQ_SIGNAL( activated( const TQTextCodec * ) ), + this, TQ_SLOT( setCodec( const TQTextCodec *) ) ); codecAction->setCodec( codec() ); } diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 8d864078..71cffe43 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -23,8 +23,8 @@ KCodecAction::KCodecAction( const TQString &text, const TDEShortcut &cut, TQObject *parent, const char *name ) : TDESelectAction( text, "", cut, parent, name ) { - TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotActivated( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotActivated( const TQString & ) ) ); setItems( KCodecAction::supportedEncodings() ); } diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index d2f35f72..464e8883 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -110,9 +110,9 @@ void Engine::setUseSSL( bool useSSL ) m_sock = new KSSLSocket; m_sock->setSocketFlags( KExtendedSocket::inetSocket ); - connect(m_sock, TQT_SIGNAL(certificateAccepted()), TQT_SLOT(slotConnected())); - connect(m_sock, TQT_SIGNAL(certificateRejected()), TQT_SLOT(slotConnectionClosed())); - connect(m_sock, TQT_SIGNAL(sslFailure()), TQT_SLOT(slotConnectionClosed())); + connect(m_sock, TQ_SIGNAL(certificateAccepted()), TQ_SLOT(slotConnected())); + connect(m_sock, TQ_SIGNAL(certificateRejected()), TQ_SLOT(slotConnectionClosed())); + connect(m_sock, TQ_SIGNAL(sslFailure()), TQ_SLOT(slotConnectionClosed())); } else #else @@ -124,12 +124,12 @@ void Engine::setUseSSL( bool useSSL ) m_sock = new KExtendedSocket; m_sock->setSocketFlags( KExtendedSocket::inputBufferedSocket | KExtendedSocket::inetSocket ); - connect(m_sock, TQT_SIGNAL(connectionSuccess()), TQT_SLOT(slotConnected())); - connect(m_sock, TQT_SIGNAL(connectionFailed(int)), TQT_SLOT(error(int))); + connect(m_sock, TQ_SIGNAL(connectionSuccess()), TQ_SLOT(slotConnected())); + connect(m_sock, TQ_SIGNAL(connectionFailed(int)), TQ_SLOT(error(int))); } - connect(m_sock, TQT_SIGNAL(closed(int)), TQT_SLOT(slotConnectionClosed())); - connect(m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead())); + connect(m_sock, TQ_SIGNAL(closed(int)), TQ_SLOT(slotConnectionClosed())); + connect(m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead())); } } @@ -393,7 +393,7 @@ void Engine::slotReadyRead() emit internalError(ParsingFailed, msg); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotReadyRead() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReadyRead() ) ); } if(m_sock->socketStatus() != KExtendedSocket::connected) @@ -474,7 +474,7 @@ EntityPtr Engine::getEntity(const TQString &name) m_entities.append(entity); } - connect(entity, TQT_SIGNAL(destroyed(KIRC::Entity *)), TQT_SLOT(destroyed(KIRC::Entity *))); + connect(entity, TQ_SIGNAL(destroyed(KIRC::Entity *)), TQ_SLOT(destroyed(KIRC::Entity *))); return EntityPtr(entity); } diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp index 8aa5916e..7044bebc 100644 --- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp @@ -27,19 +27,19 @@ using namespace KIRC; void Engine::bindCommands() { - bind("ERROR", this, TQT_SLOT(error(KIRC::Message &)), 0, 0); - bind("JOIN", this, TQT_SLOT(join(KIRC::Message &)), 0, 1); - bind("KICK", this, TQT_SLOT(kick(KIRC::Message &)), 2, 2); - bind("NICK", this, TQT_SLOT(nick(KIRC::Message &)), 0, 0); - bind("MODE", this, TQT_SLOT(mode(KIRC::Message &)), 1, 1); - bind("NOTICE", this, TQT_SLOT(notice(KIRC::Message &)), 1, 1); - bind("PART", this, TQT_SLOT(part(KIRC::Message &)), 1, 1); - bind("PING", this, TQT_SLOT(ping(KIRC::Message &)), 0, 0); - bind("PONG", this, TQT_SLOT(pong(KIRC::Message &)), 0, 0); - bind("PRIVMSG", this, TQT_SLOT(privmsg(KIRC::Message &)), 1, 1); - bind("QUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0); -// bind("SQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1); - bind("TOPIC", this, TQT_SLOT(topic(KIRC::Message &)), 1, 1); + bind("ERROR", this, TQ_SLOT(error(KIRC::Message &)), 0, 0); + bind("JOIN", this, TQ_SLOT(join(KIRC::Message &)), 0, 1); + bind("KICK", this, TQ_SLOT(kick(KIRC::Message &)), 2, 2); + bind("NICK", this, TQ_SLOT(nick(KIRC::Message &)), 0, 0); + bind("MODE", this, TQ_SLOT(mode(KIRC::Message &)), 1, 1); + bind("NOTICE", this, TQ_SLOT(notice(KIRC::Message &)), 1, 1); + bind("PART", this, TQ_SLOT(part(KIRC::Message &)), 1, 1); + bind("PING", this, TQ_SLOT(ping(KIRC::Message &)), 0, 0); + bind("PONG", this, TQ_SLOT(pong(KIRC::Message &)), 0, 0); + bind("PRIVMSG", this, TQ_SLOT(privmsg(KIRC::Message &)), 1, 1); + bind("QUIT", this, TQ_SLOT(quit(KIRC::Message &)), 0, 0); +// bind("SQUIT", this, TQ_SLOT(squit(KIRC::Message &)), 1, 1); + bind("TOPIC", this, TQ_SLOT(topic(KIRC::Message &)), 1, 1); } void Engine::away(bool isAway, const TQString &awayMessage) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 0159f790..14462f1b 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -35,30 +35,30 @@ using namespace KIRC; void Engine::bindCtcp() { - bindCtcpQuery("ACTION", this, TQT_SLOT(CtcpQuery_action(KIRC::Message &)), + bindCtcpQuery("ACTION", this, TQ_SLOT(CtcpQuery_action(KIRC::Message &)), -1, -1); - bindCtcpQuery("CLIENTINFO", this, TQT_SLOT(CtcpQuery_clientinfo(KIRC::Message &)), + bindCtcpQuery("CLIENTINFO", this, TQ_SLOT(CtcpQuery_clientinfo(KIRC::Message &)), -1, 1); - bindCtcpQuery("DCC", this, TQT_SLOT(CtcpQuery_dcc(KIRC::Message &)), + bindCtcpQuery("DCC", this, TQ_SLOT(CtcpQuery_dcc(KIRC::Message &)), 4, 5); - bindCtcpQuery("FINGER", this, TQT_SLOT(CtcpQuery_finger(KIRC::Message &)), + bindCtcpQuery("FINGER", this, TQ_SLOT(CtcpQuery_finger(KIRC::Message &)), -1, 0); - bindCtcpQuery("PING", this, TQT_SLOT(CtcpQuery_ping(KIRC::Message &)), + bindCtcpQuery("PING", this, TQ_SLOT(CtcpQuery_ping(KIRC::Message &)), 1, 1); - bindCtcpQuery("SOURCE", this, TQT_SLOT(CtcpQuery_source(KIRC::Message &)), + bindCtcpQuery("SOURCE", this, TQ_SLOT(CtcpQuery_source(KIRC::Message &)), -1, 0); - bindCtcpQuery("TIME", this, TQT_SLOT(CtcpQuery_time(KIRC::Message &)), + bindCtcpQuery("TIME", this, TQ_SLOT(CtcpQuery_time(KIRC::Message &)), -1, 0); - bindCtcpQuery("USERINFO", this, TQT_SLOT(CtcpQuery_userinfo(KIRC::Message &)), + bindCtcpQuery("USERINFO", this, TQ_SLOT(CtcpQuery_userinfo(KIRC::Message &)), -1, 0); - bindCtcpQuery("VERSION", this, TQT_SLOT(CtcpQuery_version(KIRC::Message &)), + bindCtcpQuery("VERSION", this, TQ_SLOT(CtcpQuery_version(KIRC::Message &)), -1, 0); - bindCtcpReply("ERRMSG", this, TQT_SLOT(CtcpReply_errmsg(KIRC::Message &)), + bindCtcpReply("ERRMSG", this, TQ_SLOT(CtcpReply_errmsg(KIRC::Message &)), 1, -1); - bindCtcpReply("PING", this, TQT_SLOT(CtcpReply_ping(KIRC::Message &)), + bindCtcpReply("PING", this, TQ_SLOT(CtcpReply_ping(KIRC::Message &)), 1, 1, ""); - bindCtcpReply("VERSION", this, TQT_SLOT(CtcpReply_version(KIRC::Message &)), + bindCtcpReply("VERSION", this, TQ_SLOT(CtcpReply_version(KIRC::Message &)), -1, -1, ""); } diff --git a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp index 67d3a842..4118fe23 100644 --- a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp @@ -31,69 +31,69 @@ using namespace KIRC; void Engine::bindNumericReplies() { - bind(1, this, TQT_SLOT(numericReply_001(KIRC::Message &)), 1, 1); - bind(2, this, TQT_SLOT(numericReply_002(KIRC::Message &)), 1, 1); - bind(3, this, TQT_SLOT(numericReply_003(KIRC::Message &)), 1, 1); - bind(4, this, TQT_SLOT(numericReply_004(KIRC::Message &)), 5, 5); - bind(5, this, TQT_SLOT(numericReply_004(KIRC::Message &)), 1, 1); - - bind(250, this, TQT_SLOT(numericReply_250(KIRC::Message &))); - bind(251, this, TQT_SLOT(numericReply_251(KIRC::Message &))); - bind(252, this, TQT_SLOT(numericReply_252(KIRC::Message &)), 2, 2); - bind(253, this, TQT_SLOT(numericReply_253(KIRC::Message &)), 2, 2); - bind(254, this, TQT_SLOT(numericReply_254(KIRC::Message &)), 2, 2); - bind(255, this, TQT_SLOT(numericReply_255(KIRC::Message &)), 1, 1); // incomingConnectString - - bind(263, this, TQT_SLOT(numericReply_263(KIRC::Message &))); // incomingServerLoadTooHigh - bind(265, this, TQT_SLOT(numericReply_265(KIRC::Message &))); - bind(266, this, TQT_SLOT(numericReply_266(KIRC::Message &))); - - bind(301, this, TQT_SLOT(numericReply_301(KIRC::Message &)), 2, 2); - bind(303, this, TQT_SLOT(numericReply_303(KIRC::Message &)), 1, 1); - bind(305, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are no longer marked as away - bind(306, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are marked as away - bind(307, this, TQT_SLOT(numericReply_307(KIRC::Message &)), 1, 1); - bind(311, this, TQT_SLOT(numericReply_311(KIRC::Message &)), 5, 5); - bind(312, this, TQT_SLOT(numericReply_312(KIRC::Message &)), 3, 3); - bind(313, this, TQT_SLOT(numericReply_313(KIRC::Message &)), 2, 2); - bind(314, this, TQT_SLOT(numericReply_314(KIRC::Message &)), 5, 5); - bind(315, this, TQT_SLOT(numericReply_315(KIRC::Message &)), 2, 2); - bind(317, this, TQT_SLOT(numericReply_317(KIRC::Message &)), 3, 4); - bind(318, this, TQT_SLOT(numericReply_318(KIRC::Message &)), 2, 2); - bind(319, this, TQT_SLOT(numericReply_319(KIRC::Message &)), 2, 2); - bind(320, this, TQT_SLOT(numericReply_320(KIRC::Message &)), 2, 2); - bind(321, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); - bind(322, this, TQT_SLOT(numericReply_322(KIRC::Message &)), 3, 3); - bind(323, this, TQT_SLOT(numericReply_323(KIRC::Message &)), 1, 1); - bind(324, this, TQT_SLOT(numericReply_324(KIRC::Message &)), 2, 4); - bind(328, this, TQT_SLOT(numericReply_328(KIRC::Message &)), 2, 2); - bind(329, this, TQT_SLOT(numericReply_329(KIRC::Message &)), 3, 3); - bind(330, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0); // ??? - bind(331, this, TQT_SLOT(numericReply_331(KIRC::Message &)), 2, 2); - bind(332, this, TQT_SLOT(numericReply_332(KIRC::Message &)), 2, 2); - bind(333, this, TQT_SLOT(numericReply_333(KIRC::Message &)), 4, 4); - bind(352, this, TQT_SLOT(numericReply_352(KIRC::Message &)), 5, 10); - bind(353, this, TQT_SLOT(numericReply_353(KIRC::Message &)), 3, 3); - bind(366, this, TQT_SLOT(numericReply_366(KIRC::Message &)), 2, 2); - bind(369, this, TQT_SLOT(numericReply_369(KIRC::Message &)), 2, 2); - bind(372, this, TQT_SLOT(numericReply_372(KIRC::Message &)), 1, 1); - bind(375, this, TQT_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); - bind(376, this, TQT_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); - - bind(401, this, TQT_SLOT(numericReply_401(KIRC::Message &)), 2, 2); // incomingNoNickChan -// bind(404, this, TQT_SLOT(numericReply_404(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel - bind(406, this, TQT_SLOT(numericReply_406(KIRC::Message &)), 2, 2); // incomingWasNoNick - bind(422, this, TQT_SLOT(numericReply_422(KIRC::Message &)), 1, 1); - bind(433, this, TQT_SLOT(numericReply_433(KIRC::Message &)), 2, 2); -// bind(442, this, TQT_SLOT(numericReply_442(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel - bind(464, this, TQT_SLOT(numericReply_464(KIRC::Message &)), 1, 1); - bind(471, this, TQT_SLOT(numericReply_471(KIRC::Message &)), 2, 2); - bind(473, this, TQT_SLOT(numericReply_473(KIRC::Message &)), 2, 2); - bind(474, this, TQT_SLOT(numericReply_474(KIRC::Message &)), 2, 2); - bind(475, this, TQT_SLOT(numericReply_475(KIRC::Message &)), 2, 2); + bind(1, this, TQ_SLOT(numericReply_001(KIRC::Message &)), 1, 1); + bind(2, this, TQ_SLOT(numericReply_002(KIRC::Message &)), 1, 1); + bind(3, this, TQ_SLOT(numericReply_003(KIRC::Message &)), 1, 1); + bind(4, this, TQ_SLOT(numericReply_004(KIRC::Message &)), 5, 5); + bind(5, this, TQ_SLOT(numericReply_004(KIRC::Message &)), 1, 1); + + bind(250, this, TQ_SLOT(numericReply_250(KIRC::Message &))); + bind(251, this, TQ_SLOT(numericReply_251(KIRC::Message &))); + bind(252, this, TQ_SLOT(numericReply_252(KIRC::Message &)), 2, 2); + bind(253, this, TQ_SLOT(numericReply_253(KIRC::Message &)), 2, 2); + bind(254, this, TQ_SLOT(numericReply_254(KIRC::Message &)), 2, 2); + bind(255, this, TQ_SLOT(numericReply_255(KIRC::Message &)), 1, 1); // incomingConnectString + + bind(263, this, TQ_SLOT(numericReply_263(KIRC::Message &))); // incomingServerLoadTooHigh + bind(265, this, TQ_SLOT(numericReply_265(KIRC::Message &))); + bind(266, this, TQ_SLOT(numericReply_266(KIRC::Message &))); + + bind(301, this, TQ_SLOT(numericReply_301(KIRC::Message &)), 2, 2); + bind(303, this, TQ_SLOT(numericReply_303(KIRC::Message &)), 1, 1); + bind(305, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are no longer marked as away + bind(306, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are marked as away + bind(307, this, TQ_SLOT(numericReply_307(KIRC::Message &)), 1, 1); + bind(311, this, TQ_SLOT(numericReply_311(KIRC::Message &)), 5, 5); + bind(312, this, TQ_SLOT(numericReply_312(KIRC::Message &)), 3, 3); + bind(313, this, TQ_SLOT(numericReply_313(KIRC::Message &)), 2, 2); + bind(314, this, TQ_SLOT(numericReply_314(KIRC::Message &)), 5, 5); + bind(315, this, TQ_SLOT(numericReply_315(KIRC::Message &)), 2, 2); + bind(317, this, TQ_SLOT(numericReply_317(KIRC::Message &)), 3, 4); + bind(318, this, TQ_SLOT(numericReply_318(KIRC::Message &)), 2, 2); + bind(319, this, TQ_SLOT(numericReply_319(KIRC::Message &)), 2, 2); + bind(320, this, TQ_SLOT(numericReply_320(KIRC::Message &)), 2, 2); + bind(321, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); + bind(322, this, TQ_SLOT(numericReply_322(KIRC::Message &)), 3, 3); + bind(323, this, TQ_SLOT(numericReply_323(KIRC::Message &)), 1, 1); + bind(324, this, TQ_SLOT(numericReply_324(KIRC::Message &)), 2, 4); + bind(328, this, TQ_SLOT(numericReply_328(KIRC::Message &)), 2, 2); + bind(329, this, TQ_SLOT(numericReply_329(KIRC::Message &)), 3, 3); + bind(330, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0); // ??? + bind(331, this, TQ_SLOT(numericReply_331(KIRC::Message &)), 2, 2); + bind(332, this, TQ_SLOT(numericReply_332(KIRC::Message &)), 2, 2); + bind(333, this, TQ_SLOT(numericReply_333(KIRC::Message &)), 4, 4); + bind(352, this, TQ_SLOT(numericReply_352(KIRC::Message &)), 5, 10); + bind(353, this, TQ_SLOT(numericReply_353(KIRC::Message &)), 3, 3); + bind(366, this, TQ_SLOT(numericReply_366(KIRC::Message &)), 2, 2); + bind(369, this, TQ_SLOT(numericReply_369(KIRC::Message &)), 2, 2); + bind(372, this, TQ_SLOT(numericReply_372(KIRC::Message &)), 1, 1); + bind(375, this, TQ_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); + bind(376, this, TQ_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); + + bind(401, this, TQ_SLOT(numericReply_401(KIRC::Message &)), 2, 2); // incomingNoNickChan +// bind(404, this, TQ_SLOT(numericReply_404(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel + bind(406, this, TQ_SLOT(numericReply_406(KIRC::Message &)), 2, 2); // incomingWasNoNick + bind(422, this, TQ_SLOT(numericReply_422(KIRC::Message &)), 1, 1); + bind(433, this, TQ_SLOT(numericReply_433(KIRC::Message &)), 2, 2); +// bind(442, this, TQ_SLOT(numericReply_442(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel + bind(464, this, TQ_SLOT(numericReply_464(KIRC::Message &)), 1, 1); + bind(471, this, TQ_SLOT(numericReply_471(KIRC::Message &)), 2, 2); + bind(473, this, TQ_SLOT(numericReply_473(KIRC::Message &)), 2, 2); + bind(474, this, TQ_SLOT(numericReply_474(KIRC::Message &)), 2, 2); + bind(475, this, TQ_SLOT(numericReply_475(KIRC::Message &)), 2, 2); //Freenode seems to use this for a non-RFC compliant purpose, as does Unreal - bind(477, this, TQT_SLOT(emitSuffix(KIRC::Message&)),0,0); + bind(477, this, TQ_SLOT(emitSuffix(KIRC::Message&)),0,0); } /* 001: "Welcome to the Internet Relay Network !@" diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp index 2e1d0b4c..4eecdd6c 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp @@ -32,7 +32,7 @@ MessageRedirector::MessageRedirector(KIRC::Engine *engine, bool MessageRedirector::connect(TQObject *object, const char *member) { - return TQObject::connect(this, TQT_SIGNAL(redirect(KIRC::Message &)), + return TQObject::connect(this, TQ_SIGNAL(redirect(KIRC::Message &)), object, member); } diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.h b/kopete/protocols/irc/libkirc/kircmessageredirector.h index 2c3f9e37..489ab412 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.h +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.h @@ -48,9 +48,9 @@ public: /** * Connects the given object member signal/slot to this message redirector. * The member signal slot should be looking like: - * TQT_SIGNAL(mysignal(KIRC::Message &msg)) + * TQ_SIGNAL(mysignal(KIRC::Message &msg)) * or - * TQT_SIGNAL(myslot(KIRC::Message &msg)) + * TQ_SIGNAL(myslot(KIRC::Message &msg)) */ bool connect(TQObject *object, const char *member); diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp index cbcb6682..50e96ce8 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.cpp +++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp @@ -81,11 +81,11 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress else if(!properites["hostAddress"].isNull() && !properites["hostPort"].isNull()) setSocket(new KExtendedSocket(properites["hostAddress"], properites["hostPort"])); - connect(this, TQT_SIGNAL(complete()), - this, TQT_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(complete()), + this, TQ_SLOT(closeSocket())); - connect(this, TQT_SIGNAL(abort(TQString)), - this, TQT_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(abort(TQString)), + this, TQ_SLOT(closeSocket())); } */ Transfer::~Transfer() @@ -134,39 +134,39 @@ bool Transfer::initiate() m_file.setName(m_fileName); - connect(this, TQT_SIGNAL(complete()), - this, TQT_SLOT(closeSocket())); - connect(this, TQT_SIGNAL(abort(TQString)), - this, TQT_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(complete()), + this, TQ_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(abort(TQString)), + this, TQ_SLOT(closeSocket())); -// connect(m_socket, TQT_SIGNAL(connectionClosed()), -// this, TQT_SLOT(slotConnectionClosed())); -// connect(m_socket, TQT_SIGNAL(delayedCloseFinished()), -// this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(error(int)), // FIXME: connection failed: No such signal KExtendedSocket::error(int) - this, TQT_SLOT(slotError(int))); +// connect(m_socket, TQ_SIGNAL(connectionClosed()), +// this, TQ_SLOT(slotConnectionClosed())); +// connect(m_socket, TQ_SIGNAL(delayedCloseFinished()), +// this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(error(int)), // FIXME: connection failed: No such signal KExtendedSocket::error(int) + this, TQ_SLOT(slotError(int))); switch( m_type ) { case Chat: kdDebug(14121) << k_funcinfo << "Stting up a chat." << endl; - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileIncoming())); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileIncoming())); break; case FileIncoming: kdDebug(14121) << k_funcinfo << "Stting up an incoming file transfer." << endl; m_file.open(IO_WriteOnly); - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileIncoming())); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileIncoming())); break; case FileOutgoing: kdDebug(14121) << k_funcinfo << "Stting up an outgoing file transfer." << endl; m_file.open(IO_ReadOnly); - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileOutgoing())); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileOutgoing())); // timer = new TQTimer(this); -// connect(timer, TQT_SIGNAL(timeout()), -// this, TQT_SLOT(writeFileOutgoing())); +// connect(timer, TQ_SIGNAL(timeout()), +// this, TQ_SLOT(writeFileOutgoing())); // timer->start(1000, false); writeFileOutgoing(); // send a first packet. break; @@ -190,8 +190,8 @@ bool Transfer::initiate() // As far as I understand, buffer (socket buffer at least) should be flushed while event-looping. // But I'm not really sure of this, so I force the flush. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(flush())); + connect(timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(flush())); timer->start(1000, FALSE); // flush the streams at every seconds return true; diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.cpp b/kopete/protocols/irc/libkirc/kirctransferserver.cpp index 25b41ff9..b7c0917d 100644 --- a/kopete/protocols/irc/libkirc/kirctransferserver.cpp +++ b/kopete/protocols/irc/libkirc/kirctransferserver.cpp @@ -68,8 +68,8 @@ bool TransferServer::initServer() { if (!m_socket) { - TQObject::connect(this, TQT_SIGNAL(incomingNewTransfer(Transfer *)), - TransferHandler::self(), TQT_SIGNAL(transferCreated(Transfer *))); + TQObject::connect(this, TQ_SIGNAL(incomingNewTransfer(Transfer *)), + TransferHandler::self(), TQ_SIGNAL(transferCreated(Transfer *))); m_socket = new KExtendedSocket(); @@ -83,10 +83,10 @@ bool TransferServer::initServer() if (!m_socket->setTimeout(2*60)) // FIXME: allow configuration of this. kdDebug(14120) << k_funcinfo << "Failed to set timeout." << endl; - TQObject::connect(m_socket, TQT_SIGNAL(readyAccept()), - this, TQT_SLOT(readyAccept())); - TQObject::connect(m_socket, TQT_SIGNAL(connectionFailed(int)), - this, TQT_SLOT(connectionFailed(int))); + TQObject::connect(m_socket, TQ_SIGNAL(readyAccept()), + this, TQ_SLOT(readyAccept())); + TQObject::connect(m_socket, TQ_SIGNAL(connectionFailed(int)), + this, TQ_SLOT(connectionFailed(int))); m_socket->listen(m_backlog); m_socket->setBlockingMode(true); @@ -137,14 +137,14 @@ void Transfer::initClient() { if(!m_socket) { - connect(m_socket, TQT_SIGNAL(connectionClosed()), - this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(delayedCloseFinished()), - this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(error(int)), - this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileOut)); + connect(m_socket, TQ_SIGNAL(connectionClosed()), + this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(delayedCloseFinished()), + this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(error(int)), + this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileOut)); m_socket->enableRead( true ); m_socket->enableWrite( true ); diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index a1781c24..82440bbb 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -52,9 +52,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() setBlockingMode(false); //Connect internal slots - TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) ); - TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) ); - TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected())); + TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) ); + TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) ); + TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected())); } KSSLSocket::~KSSLSocket() @@ -148,11 +148,11 @@ void KSSLSocket::slotConnected() } //Disconnect the KExtSocket notifier slot, we use our own - TQObject::disconnect( readNotifier(), TQT_SIGNAL(activated( int )), - this, TQT_SLOT(socketActivityRead()) ); + TQObject::disconnect( readNotifier(), TQ_SIGNAL(activated( int )), + this, TQ_SLOT(socketActivityRead()) ); - TQObject::connect( readNotifier(), TQT_SIGNAL(activated( int )), - this, TQT_SLOT(slotReadData()) ); + TQObject::connect( readNotifier(), TQ_SIGNAL(activated( int )), + this, TQ_SLOT(slotReadData()) ); readNotifier()->setEnabled(true); diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 9ee7bbcb..fdff5512 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -213,21 +213,21 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) mChannelList->header()->setLabel( 2, i18n( "Topic" ) ); // signals and slots connections - connect( mChannelList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotItemDoubleClicked(TQListViewItem*) ) ); + connect( mChannelList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotItemDoubleClicked(TQListViewItem*) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( search() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( search() ) ); - connect( mChannelList, TQT_SIGNAL( selectionChanged( TQListViewItem*) ), this, - TQT_SLOT( slotItemSelected( TQListViewItem *) ) ); + connect( mChannelList, TQ_SIGNAL( selectionChanged( TQListViewItem*) ), this, + TQ_SLOT( slotItemSelected( TQListViewItem *) ) ); - connect( m_engine, TQT_SIGNAL( incomingListedChan( const TQString &, uint, const TQString & ) ), - this, TQT_SLOT( slotChannelListed( const TQString &, uint, const TQString & ) ) ); + connect( m_engine, TQ_SIGNAL( incomingListedChan( const TQString &, uint, const TQString & ) ), + this, TQ_SLOT( slotChannelListed( const TQString &, uint, const TQString & ) ) ); - connect( m_engine, TQT_SIGNAL( incomingEndOfList() ), this, TQT_SLOT( slotListEnd() ) ); + connect( m_engine, TQ_SIGNAL( incomingEndOfList() ), this, TQ_SLOT( slotListEnd() ) ); - connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::Status) ), - this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); + connect( m_engine, TQ_SIGNAL( statusChanged(KIRC::Engine::Status) ), + this, TQ_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); show(); } @@ -328,7 +328,7 @@ void ChannelList::slotSearchCache() { checkSearchResult( cacheIterator.key(), cacheIterator.data().first, cacheIterator.data().second ); ++cacheIterator; - TQTimer::singleShot( 0, this, TQT_SLOT( slotSearchCache() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSearchCache() ) ); } else { diff --git a/kopete/protocols/irc/ui/channellistdialog.cpp b/kopete/protocols/irc/ui/channellistdialog.cpp index e344d227..cd127147 100644 --- a/kopete/protocols/irc/ui/channellistdialog.cpp +++ b/kopete/protocols/irc/ui/channellistdialog.cpp @@ -30,11 +30,11 @@ ChannelListDialog::ChannelListDialog(KIRC::Engine *engine, const TQString &capti m_engine = engine; m_list = new ChannelList( this, engine ); - connect( m_list, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), + connect( m_list, TQ_SIGNAL( channelDoubleClicked( const TQString & ) ), target, slotJoinChan ); - connect( m_list, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), - this, TQT_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); + connect( m_list, TQ_SIGNAL( channelDoubleClicked( const TQString & ) ), + this, TQ_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); new TQHBoxLayout( m_list, 0, spacingHint() ); diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 2304bcd5..db0443f2 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -106,21 +106,21 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident } } - connect( commandList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotCommandContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( commandList, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + this, TQ_SLOT( slotCommandContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( ctcpList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotCtcpContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( ctcpList, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + this, TQ_SLOT( slotCtcpContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCommand() ) ); - connect( editButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotEditNetworks() ) ); - connect( addReply, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCtcp() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCommand() ) ); + connect( editButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotEditNetworks() ) ); + connect( addReply, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCtcp() ) ); - connect( network, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotUpdateNetworkDescription( const TQString &) ) ); + connect( network, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotUpdateNetworkDescription( const TQString &) ) ); - connect( IRCProtocol::protocol(), TQT_SIGNAL( networkConfigUpdated( const TQString & ) ), - this, TQT_SLOT( slotUpdateNetworks( const TQString & ) ) ); + connect( IRCProtocol::protocol(), TQ_SIGNAL( networkConfigUpdated( const TQString & ) ), + this, TQ_SLOT( slotUpdateNetworks( const TQString & ) ) ); slotUpdateNetworks( TQString() ); } diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 5eb071a2..4117bb3c 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -109,7 +109,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI JabberContact *myContact = contactPool()->addContact ( XMPP::RosterItem ( accountId ), Kopete::ContactList::self()->myself(), false ); setMyself( myContact ); - TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) ); + TQObject::connect(Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQ_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) ); m_initialPresence = XMPP::Status ( "", "", 5, true ); @@ -178,7 +178,7 @@ TDEActionMenu *JabberAccount::actionMenu () TDEAction *action; - action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); + action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQ_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); m_actionMenu->insert(action); action->setEnabled( isConnected() ); @@ -190,17 +190,17 @@ TDEActionMenu *JabberAccount::actionMenu () m_actionMenu->popupMenu()->insertSeparator(); action = new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0, - this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices"); + this, TQ_SLOT ( slotGetServices () ), this, "actionJabberServices"); action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0, - this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ; + this, TQ_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ; action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); action = new TDEAction ( i18n ("Edit User Info..."), "identity", 0, - this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ; + this, TQ_SLOT ( slotEditVCard () ), this, "actionEditVCard") ; action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); @@ -295,40 +295,40 @@ void JabberAccount::connectWithPassword ( const TQString &password ) { m_jabberClient = new JabberClient; - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( subscription ( const XMPP::Jid &, const TQString & ) ), - this, TQT_SLOT ( slotSubscription ( const XMPP::Jid &, const TQString & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( rosterRequestFinished ( bool ) ), - this, TQT_SLOT ( slotRosterRequestFinished ( bool ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( newContact ( const XMPP::RosterItem & ) ), - this, TQT_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ), - this, TQT_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ), - this, TQT_SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ), - this, TQT_SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ), - this, TQT_SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( messageReceived ( const XMPP::Message & ) ), - this, TQT_SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( incomingFileTransfer () ), - this, TQT_SLOT ( slotIncomingFileTransfer () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ), - this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ), - this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ), - this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ), - this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), - this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csDisconnected () ), this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQ_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( subscription ( const XMPP::Jid &, const TQString & ) ), + this, TQ_SLOT ( slotSubscription ( const XMPP::Jid &, const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( rosterRequestFinished ( bool ) ), + this, TQ_SLOT ( slotRosterRequestFinished ( bool ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( newContact ( const XMPP::RosterItem & ) ), + this, TQ_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ), + this, TQ_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ), + this, TQ_SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ), + this, TQ_SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ), + this, TQ_SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( messageReceived ( const XMPP::Message & ) ), + this, TQ_SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( incomingFileTransfer () ), + this, TQ_SLOT ( slotIncomingFileTransfer () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ), + this, TQ_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ), + this, TQ_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ), + this, TQ_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ), + this, TQ_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQ_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); } else { @@ -560,7 +560,7 @@ void JabberAccount::slotConnected () { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Creating Jingle Voice caller..." << endl; m_voiceCaller = new JingleVoiceCaller( this ); - TQObject::connect(m_voiceCaller,TQT_SIGNAL(incoming(const Jid&)),this,TQT_SLOT(slotIncomingVoiceCall( const Jid& ))); + TQObject::connect(m_voiceCaller,TQ_SIGNAL(incoming(const Jid&)),this,TQ_SLOT(slotIncomingVoiceCall( const Jid& ))); m_voiceCaller->initialize(); } @@ -571,7 +571,7 @@ void JabberAccount::slotConnected () { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Creating Jingle Session Manager..." << endl; m_jingleSessionManager = new JingleSessionManager( this ); - TQObject::connect(m_jingleSessionManager, TQT_SIGNAL(incomingSession(const TQString &, JingleSession *)), this, TQT_SLOT(slotIncomingJingleSession(const TQString &, JingleSession *))); + TQObject::connect(m_jingleSessionManager, TQ_SIGNAL(incomingSession(const TQString &, JingleSession *)), this, TQ_SLOT(slotIncomingJingleSession(const TQString &, JingleSession *))); } #endif @@ -1108,8 +1108,8 @@ void JabberAccount::slotSubscription (const XMPP::Jid & jid, const TQString & ty Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString(),this, hideFlags ); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), - this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)), + this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } else if (type == "unsubscribed") @@ -1709,13 +1709,13 @@ bool JabberAccount::removeAccount( ) } XMPP::JT_Register *task = new XMPP::JT_Register ( client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotUnregisterFinished ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotUnregisterFinished ) ); task->unreg (); task->go ( true ); m_removing=true; // from my experiment, not all server reply us with a response. it simply dosconnect // so after one seconde, we will force to remove the account - TQTimer::singleShot(1111, this, TQT_SLOT(slotUnregisterFinished())); + TQTimer::singleShot(1111, this, TQ_SLOT(slotUnregisterFinished())); return false; //the account will be removed when the task will be finished } diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 54d4e427..f13c28a7 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) setDontSync ( false ); //can't do it now because it's called from contructor at a point some virtual function are not available - TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus())); + TQTimer::singleShot(0, this, TQ_SLOT(reevaluateStatus())); } diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index ba8d1779..875bc5b6 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -28,7 +28,7 @@ JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) { - connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); + connect( m_account , TQ_SIGNAL( isConnectedChanged() ) , this , TQ_SLOT( accountConnected() ) ); } void JabberBookmarks::accountConnected() @@ -38,7 +38,7 @@ void JabberBookmarks::accountConnected() XMPP::JT_PrivateStorage * task = new XMPP::JT_PrivateStorage ( m_account->client()->rootTask ()); task->get( "storage" , "storage:bookmarks" ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotReceivedBookmarks() ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotReceivedBookmarks() ) ); task->go ( true ); } @@ -131,7 +131,7 @@ TDEAction * JabberBookmarks::bookmarksAction(TQObject *parent) { TDESelectAction *groupchatBM = new TDESelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); - TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); + TQObject::connect(groupchatBM, TQ_SIGNAL(activated (const TQString&)) , this, TQ_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; } diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index f04518a6..2f711bcb 100644 --- a/kopete/protocols/jabber/jabberbytestream.cpp +++ b/kopete/protocols/jabber/jabberbytestream.cpp @@ -38,11 +38,11 @@ JabberByteStream::JabberByteStream ( 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 ) ) ); } diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 57292ad3..b4aeb5ad 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -433,7 +433,7 @@ void JabberCapabilitiesManager::requestDiscoInfo(JabberAccount *account, const J return; JT_DiscoInfo *discoInfo = new JT_DiscoInfo(account->client()->rootTask()); - connect(discoInfo, TQT_SIGNAL(finished()), TQT_SLOT(discoRequestFinished())); + connect(discoInfo, TQ_SIGNAL(finished()), TQ_SLOT(discoRequestFinished())); discoInfo->get(jid, node); //pending_++; //timer_.start(REQUEST_TIMEOUT,true); diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 3ff2680c..f83774c2 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -50,12 +50,12 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas // make sure Kopete knows about this instance Kopete::ChatSessionManager::self()->registerChatSession ( this ); - connect ( this, TQT_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - this, TQT_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect ( this, TQ_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + this, TQ_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); - connect ( this, TQT_SIGNAL ( myselfTyping ( bool ) ), this, TQT_SLOT ( slotSendTypingNotification ( bool ) ) ); + connect ( this, TQ_SIGNAL ( myselfTyping ( bool ) ), this, TQ_SLOT ( slotSendTypingNotification ( bool ) ) ); - connect ( this, TQT_SIGNAL ( onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ), this, TQT_SLOT ( slotUpdateDisplayName () ) ); + connect ( this, TQ_SIGNAL ( onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ), this, TQ_SLOT ( slotUpdateDisplayName () ) ); // check if the user ID contains a hardwired resource, // we'll have to use that one in that case @@ -65,7 +65,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas slotUpdateDisplayName (); #ifdef SUPPORT_JINGLE - TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); + TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQ_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); setInstance(protocol->instance()); jabber_voicecall->setEnabled( false ); @@ -85,7 +85,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas #endif - new TDEAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); + new TDEAction( i18n( "Send File" ), "attach", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); setXMLFile("jabberchatui.rc"); diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index 0bcdaebd..458ee605 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -126,7 +126,7 @@ JabberClient::JabberClient () cleanUp (); // initiate penalty timer - TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQT_SLOT ( slotUpdatePenaltyTime () ) ); + TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQ_SLOT ( slotUpdatePenaltyTime () ) ); } @@ -189,7 +189,7 @@ void JabberClient::slotUpdatePenaltyTime () else d->currentPenaltyTime = 0; - TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQT_SLOT ( slotUpdatePenaltyTime () ) ); + TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQ_SLOT ( slotUpdatePenaltyTime () ) ); } @@ -234,7 +234,7 @@ XMPP::S5BServer *JabberClient::s5bServer () if ( !d->s5bServer ) { d->s5bServer = new XMPP::S5BServer (); - TQObject::connect ( d->s5bServer, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotS5BServerGone () ) ); + TQObject::connect ( d->s5bServer, TQ_SIGNAL ( destroyed () ), this, TQ_SLOT ( slotS5BServerGone () ) ); /* * Try to start the server at the default port here. @@ -638,7 +638,7 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt { using namespace XMPP; - TQObject::connect ( d->jabberTLSHandler, TQT_SIGNAL ( tlsHandshaken() ), this, TQT_SLOT ( slotTLSHandshaken () ) ); + TQObject::connect ( d->jabberTLSHandler, TQ_SIGNAL ( tlsHandshaken() ), this, TQ_SLOT ( slotTLSHandshaken () ) ); } TQPtrList certStore; @@ -653,18 +653,18 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt { using namespace XMPP; - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( needAuthParams(bool, bool, bool) ), - this, TQT_SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( authenticated () ), - this, TQT_SLOT ( slotCSAuthenticated () ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( connectionClosed () ), - this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( delayedCloseFinished () ), - this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( warning (int) ), - this, TQT_SLOT ( slotCSWarning (int) ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( error (int) ), - this, TQT_SLOT ( slotCSError (int) ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( needAuthParams(bool, bool, bool) ), + this, TQ_SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( authenticated () ), + this, TQ_SLOT ( slotCSAuthenticated () ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( connectionClosed () ), + this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( delayedCloseFinished () ), + this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( warning (int) ), + this, TQ_SLOT ( slotCSWarning (int) ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( error (int) ), + this, TQ_SLOT ( slotCSError (int) ) ); } d->jabberClientStream->setOldOnly ( useXMPP09 () ); @@ -694,8 +694,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt { using namespace XMPP; - TQObject::connect ( d->jabberClient->fileTransferManager(), TQT_SIGNAL ( incomingReady() ), - this, TQT_SLOT ( slotIncomingFileTransfer () ) ); + TQObject::connect ( d->jabberClient->fileTransferManager(), TQ_SIGNAL ( incomingReady() ), + this, TQ_SLOT ( slotIncomingFileTransfer () ) ); } } @@ -704,36 +704,36 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt */ { using namespace XMPP; - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( subscription (const Jid &, const TQString &) ), - this, TQT_SLOT ( slotSubscription (const Jid &, const TQString &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterRequestFinished ( bool, int, const TQString & ) ), - this, TQT_SLOT ( slotRosterRequestFinished ( bool, int, const TQString & ) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemAdded (const RosterItem &) ), - this, TQT_SLOT ( slotNewContact (const RosterItem &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemUpdated (const RosterItem &) ), - this, TQT_SLOT ( slotContactUpdated (const RosterItem &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemRemoved (const RosterItem &) ), - this, TQT_SLOT ( slotContactDeleted (const RosterItem &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( resourceAvailable (const Jid &, const Resource &) ), - this, TQT_SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ), - this, TQT_SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( messageReceived (const Message &) ), - this, TQT_SLOT ( slotReceivedMessage (const Message &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatJoined (const Jid &) ), - this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ), - this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ), - this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ), - this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) ); - //TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ), - // this, TQT_SLOT ( slotPsiDebug (const TQString &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( xmlIncoming(const TQString& ) ), - this, TQT_SLOT ( slotIncomingXML (const TQString &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( xmlOutgoing(const TQString& ) ), - this, TQT_SLOT ( slotOutgoingXML (const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( subscription (const Jid &, const TQString &) ), + this, TQ_SLOT ( slotSubscription (const Jid &, const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterRequestFinished ( bool, int, const TQString & ) ), + this, TQ_SLOT ( slotRosterRequestFinished ( bool, int, const TQString & ) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemAdded (const RosterItem &) ), + this, TQ_SLOT ( slotNewContact (const RosterItem &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemUpdated (const RosterItem &) ), + this, TQ_SLOT ( slotContactUpdated (const RosterItem &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemRemoved (const RosterItem &) ), + this, TQ_SLOT ( slotContactDeleted (const RosterItem &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( resourceAvailable (const Jid &, const Resource &) ), + this, TQ_SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ), + this, TQ_SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( messageReceived (const Message &) ), + this, TQ_SLOT ( slotReceivedMessage (const Message &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatJoined (const Jid &) ), + this, TQ_SLOT ( slotGroupChatJoined (const Jid &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatLeft (const Jid &) ), + this, TQ_SLOT ( slotGroupChatLeft (const Jid &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatPresence (const Jid &, const Status &) ), + this, TQ_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ), + this, TQ_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) ); + //TQObject::connect ( d->jabberClient, TQ_SIGNAL (debugText (const TQString &) ), + // this, TQ_SLOT ( slotPsiDebug (const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( xmlIncoming(const TQString& ) ), + this, TQ_SLOT ( slotIncomingXML (const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( xmlOutgoing(const TQString& ) ), + this, TQ_SLOT ( slotOutgoingXML (const TQString &) ) ); } d->jabberClient->setClientName ( clientName () ); diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index d08db42e..aa1e7921 100644 --- a/kopete/protocols/jabber/jabberconnector.cpp +++ b/kopete/protocols/jabber/jabberconnector.cpp @@ -32,9 +32,9 @@ JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ ) mByteStream = new JabberByteStream ( this ); mSrvResolver = new SrvResolver; - connect ( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - connect ( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - connect ( mSrvResolver, TQT_SIGNAL( resultsReady() ), this, TQT_SLOT( slotSrvLookup() ) ); + connect ( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + connect ( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + connect ( mSrvResolver, TQ_SIGNAL( resultsReady() ), this, TQ_SLOT( slotSrvLookup() ) ); } JabberConnector::~JabberConnector () diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 7d8035f9..79b09508 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -89,19 +89,19 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun { // this contact is a regular contact connect ( this, - TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT ( slotCheckVCard () ) ); + TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT ( slotCheckVCard () ) ); } else { // this contact is the myself instance connect ( account()->myself (), - TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT ( slotCheckVCard () ) ); + TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT ( slotCheckVCard () ) ); connect ( account()->myself (), - TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); /* * Trigger update once if we're already connected for contacts @@ -137,34 +137,34 @@ TQPtrList *JabberContact::customContextMenuActions () TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction; resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail-forward", 0, - this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth"); + this, TQ_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth"); resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None ); actionAuthorization->insert(resendAuthAction); requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail-reply-sender", 0, - this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth"); + this, TQ_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth"); requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None ); actionAuthorization->insert(requestAuthAction); removeAuthAction = new TDEAction (i18n ("Remove Authorization From"), "mail_delete", 0, - this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth"); + this, TQ_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth"); removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From ); actionAuthorization->insert(removeAuthAction); TDEActionMenu *actionSetAvailability = new TDEActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online"); actionSetAvailability->insert(new TDEAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this), - 0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline")); + 0, this, TQ_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline")); actionSetAvailability->insert(new TDEAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this), - 0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty")); + 0, this, TQ_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty")); actionSetAvailability->insert(new TDEAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this), - 0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway")); + 0, this, TQ_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway")); actionSetAvailability->insert(new TDEAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this), - 0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA")); + 0, this, TQ_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA")); actionSetAvailability->insert(new TDEAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this), - 0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND")); + 0, this, TQ_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND")); actionSetAvailability->insert(new TDEAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this), - 0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible")); + 0, this, TQ_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible")); TDEActionMenu *actionSelectResource = new TDEActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource"); @@ -203,7 +203,7 @@ TQPtrList *JabberContact::customContextMenuActions () { if( i == activeItem ) { - actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ), + actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQ_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); } else @@ -215,7 +215,7 @@ TQPtrList *JabberContact::customContextMenuActions () TQIconSet iconSet ( !i ? protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); - actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), + actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQ_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); } @@ -230,7 +230,7 @@ TQPtrList *JabberContact::customContextMenuActions () #ifdef SUPPORT_JINGLE - TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall"); + TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQ_SLOT (voiceCall ()), this, "jabber_voicecall"); actionVoiceCall->setEnabled( false ); actionCollection->append( actionVoiceCall ); @@ -431,7 +431,7 @@ void JabberContact::slotCheckVCard () mDiscoDone = true; //or it will happen twice, we don't want that. //disco to see if it's not a transport XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account()->client()->rootTask()); - TQObject::connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); + TQObject::connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished())); jt->get(rosterItem().jid(), TQString()); jt->go(true); } @@ -453,7 +453,7 @@ void JabberContact::slotCheckVCard () mVCardUpdateInProgress = true; // current data is older than 24 hours, request a new one - TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedVCard () ) ); + TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedVCard () ) ); } } @@ -479,7 +479,7 @@ void JabberContact::slotGetTimedVCard () { //disco to see if it's not a transport XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account()->client()->rootTask()); - TQObject::connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); + TQObject::connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished())); jt->get(rosterItem().jid(), TQString()); jt->go(true); } @@ -492,7 +492,7 @@ void JabberContact::slotGetTimedVCard () // request vCard XMPP::JT_VCard *task = new XMPP::JT_VCard ( account()->client()->rootTask () ); // signal to ourselves when the vCard data arrived - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotVCard () ) ); task->get ( mRosterItem.jid () ); task->go ( true ); @@ -551,7 +551,7 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl; - TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedLastActivity () ) ); + TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedLastActivity () ) ); } } @@ -578,7 +578,7 @@ void JabberContact::slotGetTimedLastActivity () kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl; XMPP::JT_GetLastActivity *task = new XMPP::JT_GetLastActivity ( account()->client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotLastActivity () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotLastActivity () ) ); task->get ( mRosterItem.jid () ); task->go ( true ); } @@ -717,7 +717,7 @@ void JabberContact::slotSendVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard (account()->client()->rootTask ()); // signal to ourselves when the vCard data arrived - TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentVCard ())); + TQObject::connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentVCard ())); task->set (vCard); task->go (true); } @@ -826,7 +826,7 @@ JabberChatSession *JabberContact::manager ( Kopete::ContactPtrList chatMembers, kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "No manager found, creating a new one with resource '" << jid.resource () << "'" << endl; manager = new JabberChatSession ( protocol(), static_cast(account()->myself()), chatMembers, jid.resource () ); - connect ( manager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); + connect ( manager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); mManagers.append ( manager ); } @@ -880,7 +880,7 @@ JabberChatSession *JabberContact::manager ( const TQString &resource, Kopete::Co JabberChatSession *manager = new JabberChatSession ( protocol(), static_cast(account()->myself()), chatmembers, resource ); - connect ( manager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); + connect ( manager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); mManagers.append ( manager ); return manager; @@ -955,7 +955,7 @@ void JabberContact::sync ( unsigned int ) if(!m_syncTimer) { m_syncTimer=new TQTimer(this); - connect(m_syncTimer, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotDelayedSync())); + connect(m_syncTimer, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotDelayedSync())); } m_syncTimer->start(2*1000,true); /* diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 2d580957..16463c8c 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -102,7 +102,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact, // create new contact instance and add it to the dictionary JabberContact *newContact = new JabberContact ( contact, transport ? (Kopete::Account*)transport : (Kopete::Account*)mAccount, metaContact , legacyId ); JabberContactPoolItem *newContactItem = new JabberContactPoolItem ( newContact ); - connect ( newContact, TQT_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQT_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); + connect ( newContact, TQ_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQ_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); newContactItem->setDirty ( dirty ); mPool.append ( newContactItem ); @@ -161,7 +161,7 @@ JabberBaseContact *JabberContactPool::addGroupContact ( const XMPP::RosterItem & JabberContactPoolItem *newContactItem = new JabberContactPoolItem ( newContact ); - connect ( newContact, TQT_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQT_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); + connect ( newContact, TQ_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQ_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); newContactItem->setDirty ( dirty ); mPool.append ( newContactItem ); diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index c172b30f..f8303855 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -62,10 +62,10 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, XMPP::FileTrans Kopete::ContactList::self ()->addMetaContact ( metaContact ); } - connect ( Kopete::TransferManager::transferManager (), TQT_SIGNAL ( accepted ( Kopete::Transfer *, const TQString & ) ), - this, TQT_SLOT ( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); - connect ( Kopete::TransferManager::transferManager (), TQT_SIGNAL ( refused ( const Kopete::FileTransferInfo & ) ), - this, TQT_SLOT ( slotTransferRefused ( const Kopete::FileTransferInfo & ) ) ); + connect ( Kopete::TransferManager::transferManager (), TQ_SIGNAL ( accepted ( Kopete::Transfer *, const TQString & ) ), + this, TQ_SLOT ( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); + connect ( Kopete::TransferManager::transferManager (), TQ_SIGNAL ( refused ( const Kopete::FileTransferInfo & ) ), + this, TQ_SLOT ( slotTransferRefused ( const Kopete::FileTransferInfo & ) ) ); initializeVariables (); @@ -90,15 +90,15 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, JabberBaseConta contact->contactId (), Kopete::FileTransferInfo::Outgoing ); - connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); + connect ( mKopeteTransfer, TQ_SIGNAL ( result ( TDEIO::Job * ) ), this, TQ_SLOT ( slotTransferResult () ) ); mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer (); initializeVariables (); - connect ( mXMPPTransfer, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotOutgoingConnected () ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotOutgoingBytesWritten ( int ) ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotOutgoingConnected () ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotOutgoingBytesWritten ( int ) ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotTransferError ( int ) ) ); mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), KURL(file).fileName (), mLocalFile.size (), "" ); @@ -188,9 +188,9 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf } else { - connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQT_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) ); + connect ( mKopeteTransfer, TQ_SIGNAL ( result ( TDEIO::Job * ) ), this, TQ_SLOT ( slotTransferResult () ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQ_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotTransferError ( int ) ) ); mXMPPTransfer->accept ( offset, length ); } diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index 3344f802..4d88fb17 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -67,7 +67,7 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * formLayout->addWidget (edit, row, 1); edit->show (); - connect (this, TQT_SIGNAL (gatherData (XMPP::Form &)), edit, TQT_SLOT (slotGatherData (XMPP::Form &))); + connect (this, TQ_SIGNAL (gatherData (XMPP::Form &)), edit, TQ_SLOT (slotGatherData (XMPP::Form &))); } innerLayout->addStretch (); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index 3687f835..e15d01b3 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -40,8 +40,8 @@ JabberGroupChatManager::JabberGroupChatManager ( JabberProtocol *protocol, const // make sure Kopete knows about this instance Kopete::ChatSessionManager::self()->registerChatSession ( this ); - connect ( this, TQT_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - this, TQT_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect ( this, TQ_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + this, TQ_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); updateDisplayName (); } diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index fde5e300..9aa068eb 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -58,10 +58,10 @@ JabberGroupContact::JabberGroupContact (const XMPP::RosterItem &rosterItem, Jabb mManager = new JabberGroupChatManager ( protocol (), mSelfContact, Kopete::ContactPtrList (), XMPP::Jid ( rosterItem.jid().userHost () ) ); - connect ( mManager, TQT_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) ); + connect ( mManager, TQ_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) ); - connect ( account->myself() , TQT_SIGNAL(onlineStatusChanged( Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ) , - this , TQT_SLOT(slotStatusChanged() ) ) ; + connect ( account->myself() , TQ_SIGNAL(onlineStatusChanged( Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ) , + this , TQ_SLOT(slotStatusChanged() ) ) ; /** * FIXME: The first contact in the list of the message manager @@ -113,7 +113,7 @@ TQPtrList *JabberGroupContact::customContextMenuActions () { TQPtrList *actionCollection = new TQPtrList(); - TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick"); + TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQ_SLOT (slotChangeNick()), this, "jabber_changenick"); actionCollection->append( actionSetNick ); return actionCollection; @@ -129,7 +129,7 @@ Kopete::ChatSession *JabberGroupContact::manager ( Kopete::Contact::CanCreateFla mManager->addContact ( this ); - connect ( mManager, TQT_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) ); + connect ( mManager, TQ_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) ); //if we have to recreate the manager, we probably have to connect again to the chat. slotStatusChanged(); @@ -238,7 +238,7 @@ JabberBaseContact *JabberGroupContact::addSubContact ( const XMPP::RosterItem &r // now, add the contact also to our own list mContactList.append ( subContact ); - connect(subContact , TQT_SIGNAL(contactDestroyed(Kopete::Contact*)) , this , TQT_SLOT(slotSubContactDestroyed(Kopete::Contact*))); + connect(subContact , TQ_SIGNAL(contactDestroyed(Kopete::Contact*)) , this , TQ_SLOT(slotSubContactDestroyed(Kopete::Contact*))); return subContact; diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index 35b06c09..66b4d229 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -80,7 +80,7 @@ Kopete::ChatSession *JabberGroupMemberContact::manager ( Kopete::Contact::CanCre * the global myself() instance for a correct representation. */ mManager = new JabberChatSession ( protocol(), static_cast(account()->myself()), chatMembers ); - connect ( mManager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) ); + connect ( mManager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) ); return mManager; diff --git a/kopete/protocols/jabber/jabberresource.cpp b/kopete/protocols/jabber/jabberresource.cpp index a971e1c8..f351e30e 100644 --- a/kopete/protocols/jabber/jabberresource.cpp +++ b/kopete/protocols/jabber/jabberresource.cpp @@ -59,10 +59,10 @@ JabberResource::JabberResource ( JabberAccount *account, const XMPP::Jid &jid, c if ( account->isConnected () ) { - TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedClientVersion () ) ); + TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedClientVersion () ) ); if(!d->capsEnabled) { - TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetDiscoCapabilties () ) ); + TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetDiscoCapabilties () ) ); } } } @@ -123,7 +123,7 @@ void JabberResource::slotGetTimedClientVersion () // request client version XMPP::JT_ClientVersion *task = new XMPP::JT_ClientVersion ( d->account->client()->rootTask () ); // signal to ourselves when the vCard data arrived - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotClientVersion () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotClientVersion () ) ); task->get ( d->jid ); task->go ( true ); } @@ -150,7 +150,7 @@ void JabberResource:: slotGetDiscoCapabilties () XMPP:: JT_DiscoInfo *task = new XMPP::JT_DiscoInfo ( d->account->client()->rootTask () ); // Retrive features when service discovery is done. - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT (slotGotDiscoCapabilities () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT (slotGotDiscoCapabilities () ) ); task->get ( d->jid); task->go ( true ); } diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp index 19492790..cbe91f1e 100644 --- a/kopete/protocols/jabber/jabberresourcepool.cpp +++ b/kopete/protocols/jabber/jabberresourcepool.cpp @@ -133,8 +133,8 @@ void JabberResourcePool::addResource ( const XMPP::Jid &jid, const XMPP::Resourc // create new resource instance and add it to the dictionary JabberResource *newResource = new JabberResource(d->account, jid, resource); - connect ( newResource, TQT_SIGNAL ( destroyed (TQObject *) ), this, TQT_SLOT ( slotResourceDestroyed (TQObject *) ) ); - connect ( newResource, TQT_SIGNAL ( updated (JabberResource *) ), this, TQT_SLOT ( slotResourceUpdated (JabberResource *) ) ); + connect ( newResource, TQ_SIGNAL ( destroyed (TQObject *) ), this, TQ_SLOT ( slotResourceDestroyed (TQObject *) ) ); + connect ( newResource, TQ_SIGNAL ( updated (JabberResource *) ), this, TQ_SLOT ( slotResourceUpdated (JabberResource *) ) ); d->pool.append ( newResource ); // send notifications out to the relevant contacts that diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 6c1d0411..e57363d0 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -83,7 +83,7 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros configGroup()->writeEntry("GatewayJID" , item.jid().full() ); - TQTimer::singleShot(0, this, TQT_SLOT(eatContacts())); + TQTimer::singleShot(0, this, TQ_SLOT(eatContacts())); m_status=Normal; } @@ -147,18 +147,18 @@ TDEActionMenu *JabberTransport::actionMenu () m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert(new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, - this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat")); + this, TQ_SLOT (slotJoinNewChat ()), this, "actionJoinChat")); m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0, - this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") ); + this, TQ_SLOT ( slotGetServices () ), this, "actionJabberServices") ); m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0, - this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ); + this, TQ_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ); m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0, - this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ); + this, TQ_SLOT ( slotEditVCard () ), this, "actionEditVCard") ); return m_actionMenu;*/ } @@ -263,7 +263,7 @@ bool JabberTransport::removeAccount( ) m_status = Removing; XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( removeAllContacts() ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( removeAllContacts() ) ); //JabberContact *my=static_cast(myself()); task->unreg ( myself()->contactId() ); diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN index 3a3a9636..bfd1cd6c 100644 --- a/kopete/protocols/jabber/jingle/DESIGN +++ b/kopete/protocols/jabber/jingle/DESIGN @@ -102,7 +102,7 @@ JingleVoiceSession : public JingleSession Define a VoIP voice session between two peers(for the moment). Hold the PhoneSessionClient object. -connect(account()->client(),SIGNAL(xmlIncoming(const TQString&)),SLOT(receiveStanza(const TQString&))); +connect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&))); private Q_SLOTS: diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index c9979411..66470f09 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -108,7 +108,7 @@ JingleSessionManager::JingleSessionManager(JabberAccount *account) // Create watch incoming session task. d->watchSessionTask = new JingleWatchSessionTask(account->client()->rootTask()); - connect(d->watchSessionTask, TQT_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQT_SLOT(slotIncomingSession(const TQString &, const TQString &))); + connect(d->watchSessionTask, TQ_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQ_SLOT(slotIncomingSession(const TQString &, const TQString &))); // Create global cricket variables common to all sessions. // Seed random generation with the JID of the account. diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index e25c7c3c..cc417279 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -233,7 +233,7 @@ void JingleVoiceCaller::initialize() new JingleITQResponder(account()->client()->rootTask()); // Listen to incoming packets - connect(account()->client()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),TQT_SLOT(receiveStanza(const TQString&))); + connect(account()->client()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&))); initialized_ = true; } @@ -245,7 +245,7 @@ void JingleVoiceCaller::deinitialize() return; // Stop listening to incoming packets - disconnect(account()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),this,TQT_SLOT(receiveStanza(const TQString&))); + disconnect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),this,TQ_SLOT(receiveStanza(const TQString&))); // Disconnect signals (is this needed) //phone_client_->SignalCallCreate.disconnect(slots_); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 8a6331d6..a27aac10 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -224,7 +224,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe d->phoneSessionClient->SignalCallCreate.connect(slotsProxy, &JingleVoiceSession::SlotsProxy::OnCallCreated); // Listen to incoming packets - connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&))); + connect(account->client()->client(), TQ_SIGNAL(xmlIncoming(const TQString&)), this, TQ_SLOT(receiveStanza(const TQString&))); new JingleITQResponder(account->client()->rootTask()); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index dc2b2c8d..8a55c499 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -46,21 +46,21 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall TQString contactJid = m_peerJid.full(); setCaption( i18n("Voice session with %1").arg(contactJid) ); - connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked())); - connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked())); - connect(buttonTerminate, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTerminateClicked())); + connect(buttonAccept, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAcceptClicked())); + connect(buttonDecline, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeclineClicked())); + connect(buttonTerminate, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTerminateClicked())); // NOTE: Disabled for 0.12 #if 0 - connect(m_session, TQT_SIGNAL(sessionStarted()), this, TQT_SLOT(sessionStarted())); - connect(m_session, TQT_SIGNAL(accepted()), this, TQT_SLOT(sessionAccepted())); - connect(m_session, TQT_SIGNAL(declined()), this, TQT_SLOT(sessionDeclined())); - connect(m_session, TQT_SIGNAL(terminated()), this, TQT_SLOT(sessionTerminated())); + connect(m_session, TQ_SIGNAL(sessionStarted()), this, TQ_SLOT(sessionStarted())); + connect(m_session, TQ_SIGNAL(accepted()), this, TQ_SLOT(sessionAccepted())); + connect(m_session, TQ_SIGNAL(declined()), this, TQ_SLOT(sessionDeclined())); + connect(m_session, TQ_SIGNAL(terminated()), this, TQ_SLOT(sessionTerminated())); #endif - connect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) )); - connect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) )); - connect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) )); - connect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) )); + connect(m_session, TQ_SIGNAL(accepted( const Jid & )), this, TQ_SLOT( sessionAccepted(const Jid &) )); + connect(m_session, TQ_SIGNAL(in_progress( const Jid & )), this, TQ_SLOT( sessionStarted(const Jid &) )); + connect(m_session, TQ_SIGNAL(rejected( const Jid& )), this, TQ_SLOT( sessionDeclined(const Jid &) )); + connect(m_session, TQ_SIGNAL(terminated( const Jid& )), this, TQ_SLOT( sessionTerminated(const Jid &) )); // Find JabberContact for the peer and fill this dialog with contact information. JabberContact *peerContact = static_cast( m_session->account()->contactPool()->findRelevantRecipient( m_peerJid ) ); @@ -199,10 +199,10 @@ void JingleVoiceSessionDialog::reject() void JingleVoiceSessionDialog::finalize() { - disconnect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) )); - disconnect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) )); - disconnect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) )); - disconnect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(accepted( const Jid & )), this, TQ_SLOT( sessionAccepted(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(in_progress( const Jid & )), this, TQ_SLOT( sessionStarted(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(rejected( const Jid& )), this, TQ_SLOT( sessionDeclined(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(terminated( const Jid& )), this, TQ_SLOT( sessionTerminated(const Jid &) )); } #include "jinglevoicesessiondialog.moc" diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index cabd62b3..96843678 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -63,9 +63,9 @@ BSocket::BSocket(TQObject *parent) { d = new Private; #ifndef NO_NDNS - connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); #endif - connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done())); + connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done())); reset(); } @@ -110,13 +110,13 @@ void BSocket::ensureSocket() if(!d->qsock) { d->qsock = new TQSocket; d->qsock->setReadBufferSize(READBUFSIZE); - connect(d->qsock, TQT_SIGNAL(hostFound()), TQT_SLOT(qs_hostFound())); - connect(d->qsock, TQT_SIGNAL(connected()), TQT_SLOT(qs_connected())); - connect(d->qsock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(qs_connectionClosed())); - connect(d->qsock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(qs_delayedCloseFinished())); - connect(d->qsock, TQT_SIGNAL(readyRead()), TQT_SLOT(qs_readyRead())); - connect(d->qsock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(qs_bytesWritten(int))); - connect(d->qsock, TQT_SIGNAL(error(int)), TQT_SLOT(qs_error(int))); + connect(d->qsock, TQ_SIGNAL(hostFound()), TQ_SLOT(qs_hostFound())); + connect(d->qsock, TQ_SIGNAL(connected()), TQ_SLOT(qs_connected())); + connect(d->qsock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(qs_connectionClosed())); + connect(d->qsock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(qs_delayedCloseFinished())); + connect(d->qsock, TQ_SIGNAL(readyRead()), TQ_SLOT(qs_readyRead())); + connect(d->qsock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(qs_bytesWritten(int))); + connect(d->qsock, TQ_SIGNAL(error(int)), TQ_SLOT(qs_error(int))); } } @@ -283,7 +283,7 @@ void BSocket::srv_done() d->host = d->srv.resultAddress().toString(); d->port = d->srv.resultPort(); do_connect(); - //TQTimer::singleShot(0, this, TQT_SLOT(do_connect())); + //TQTimer::singleShot(0, this, TQ_SLOT(do_connect())); //hostFound(); } @@ -294,7 +294,7 @@ void BSocket::ndns_done() d->host = d->ndns.resultString(); d->state = Connecting; do_connect(); - //TQTimer::singleShot(0, this, TQT_SLOT(do_connect())); + //TQTimer::singleShot(0, this, TQ_SLOT(do_connect())); //hostFound(); } else { diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index e9cc5781..3c6273d6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -100,12 +100,12 @@ HttpConnect::HttpConnect(TQObject *parent) :ByteStream(parent) { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int))); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int))); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index ed211ac5..c5192472 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -89,10 +89,10 @@ HttpPoll::HttpPoll(TQObject *parent) d->polltime = 30; d->t = new TQTimer; - connect(d->t, TQT_SIGNAL(timeout()), TQT_SLOT(do_sync())); + connect(d->t, TQ_SIGNAL(timeout()), TQ_SLOT(do_sync())); - connect(&d->http, TQT_SIGNAL(result()), TQT_SLOT(http_result())); - connect(&d->http, TQT_SIGNAL(error(int)), TQT_SLOT(http_error(int))); + connect(&d->http, TQ_SIGNAL(result()), TQ_SLOT(http_result())); + connect(&d->http, TQ_SIGNAL(error(int)), TQ_SLOT(http_error(int))); reset(true); } @@ -442,10 +442,10 @@ HttpProxyPost::HttpProxyPost(TQObject *parent) :TQObject(parent) { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index d36b1fd0..e3527855 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -157,7 +157,7 @@ NDnsManager::NDnsManager() d = new Private; d->list.setAutoDelete(true); - connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); + connect(tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(app_aboutToQuit())); } NDnsManager::~NDnsManager() diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 9ee26ee5..ce41d7ca 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -61,7 +61,7 @@ bool ServSock::listen(TQ_UINT16 port) d->serv = 0; return false; } - connect(d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(sss_connectionReady(int))); + connect(d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(sss_connectionReady(int))); return true; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index f314e23e..750abdcb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -169,7 +169,7 @@ SocksUDP::SocksUDP(SocksClient *sc, const TQString &host, int port, const TQHost d->sd = new TQSocketDevice(TQSocketDevice::Datagram); d->sd->setBlocking(false); d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read); - connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int))); + connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int))); d->host = host; d->port = port; d->routeAddr = routeAddr; @@ -548,12 +548,12 @@ SocksClient::SocksClient(int s, TQObject *parent) void SocksClient::init() { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int))); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int))); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } @@ -1108,7 +1108,7 @@ SocksServer::SocksServer(TQObject *parent) d = new Private; d->sd = 0; d->sn = 0; - connect(&d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(connectionReady(int))); + connect(&d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(connectionReady(int))); } SocksServer::~SocksServer() @@ -1139,7 +1139,7 @@ bool SocksServer::listen(TQ_UINT16 port, bool udp) return false; } d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read); - connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int))); + connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int))); } return true; } @@ -1172,10 +1172,10 @@ SocksClient *SocksServer::takeIncoming() d->incomingConns.removeRef(c); // we don't care about errors anymore - disconnect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError())); + disconnect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError())); // don't serve the connection until the event loop, to give the caller a chance to map signals - TQTimer::singleShot(0, c, TQT_SLOT(serve())); + TQTimer::singleShot(0, c, TQ_SLOT(serve())); return c; } @@ -1192,7 +1192,7 @@ void SocksServer::writeUDP(const TQHostAddress &addr, int port, const TQByteArra void SocksServer::connectionReady(int s) { SocksClient *c = new SocksClient(s, this); - connect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError())); + connect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError())); d->incomingConns.append(c); incomingReady(); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 873d6c11..93b5cbfa 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -85,9 +85,9 @@ SrvResolver::SrvResolver(TQObject *parent) d->qdns = 0; #ifndef NO_NDNS - connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); #endif - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); stop(); } @@ -106,7 +106,7 @@ void SrvResolver::resolve(const TQString &server, const TQString &type, const TQ d->srv = TQString("_") + type + "._" + proto + '.' + server; d->t.start(15000, true); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done())); d->qdns->setRecordType(TQDns::Srv); d->qdns->setLabel(d->srv); } @@ -120,7 +120,7 @@ void SrvResolver::resolveSrvOnly(const TQString &server, const TQString &type, c d->srv = TQString("_") + type + "._" + proto + '.' + server; d->t.start(15000, true); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done())); d->qdns->setRecordType(TQDns::Srv); d->qdns->setLabel(d->srv); } @@ -191,7 +191,7 @@ void SrvResolver::tryNext() d->ndns.resolve(d->servers.first().name); #else d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); if(d->aaaa) d->qdns->setRecordType(TQDns::Aaaa); // IPv6 else diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp index 7f5dc901..ad9a7381 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp @@ -91,7 +91,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/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 7dbb0dd3..9c099ae0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -51,7 +51,7 @@ ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, con TQHBoxLayout *hb1 = new TQHBoxLayout(vb1); hb1->addStretch(1); TQPushButton *pb = new TQPushButton(tr("&OK"), this); - connect(pb, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(pb, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); hb1->addWidget(pb); hb1->addStretch(1); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp index 107d082b..4b0e35ad 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp @@ -115,7 +115,7 @@ void FileTransfer::sendFile(const Jid &to, const TQString &fname, TQ_LLONG size, d->id = d->m->link(this); d->ft = new JT_FT(d->m->client()->rootTask()); - connect(d->ft, TQT_SIGNAL(finished()), TQT_SLOT(ft_finished())); + connect(d->ft, TQ_SIGNAL(finished()), TQ_SLOT(ft_finished())); TQStringList list; list += "http://jabber.org/protocol/bytestreams"; d->ft->request(to, d->id, fname, size, desc, list); @@ -228,10 +228,10 @@ void FileTransfer::ft_finished() d->length = d->size - d->rangeOffset; d->streamType = ft->streamType(); d->c = d->m->client()->s5bManager()->createConnection(); - connect(d->c, TQT_SIGNAL(connected()), TQT_SLOT(s5b_connected())); - connect(d->c, TQT_SIGNAL(connectionClosed()), TQT_SLOT(s5b_connectionClosed())); - connect(d->c, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(s5b_bytesWritten(int))); - connect(d->c, TQT_SIGNAL(error(int)), TQT_SLOT(s5b_error(int))); + connect(d->c, TQ_SIGNAL(connected()), TQ_SLOT(s5b_connected())); + connect(d->c, TQ_SIGNAL(connectionClosed()), TQ_SLOT(s5b_connectionClosed())); + connect(d->c, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(s5b_bytesWritten(int))); + connect(d->c, TQ_SIGNAL(error(int)), TQ_SLOT(s5b_error(int))); if(d->proxy.isValid()) d->c->setProxy(d->proxy); @@ -250,14 +250,14 @@ void FileTransfer::ft_finished() void FileTransfer::takeConnection(S5BConnection *c) { d->c = c; - connect(d->c, TQT_SIGNAL(connected()), TQT_SLOT(s5b_connected())); - connect(d->c, TQT_SIGNAL(connectionClosed()), TQT_SLOT(s5b_connectionClosed())); - connect(d->c, TQT_SIGNAL(readyRead()), TQT_SLOT(s5b_readyRead())); - connect(d->c, TQT_SIGNAL(error(int)), TQT_SLOT(s5b_error(int))); + connect(d->c, TQ_SIGNAL(connected()), TQ_SLOT(s5b_connected())); + connect(d->c, TQ_SIGNAL(connectionClosed()), TQ_SLOT(s5b_connectionClosed())); + connect(d->c, TQ_SIGNAL(readyRead()), TQ_SLOT(s5b_readyRead())); + connect(d->c, TQ_SIGNAL(error(int)), TQ_SLOT(s5b_error(int))); if(d->proxy.isValid()) d->c->setProxy(d->proxy); accepted(); - TQTimer::singleShot(0, this, TQT_SLOT(doAccept())); + TQTimer::singleShot(0, this, TQ_SLOT(doAccept())); } void FileTransfer::s5b_connected() @@ -338,7 +338,7 @@ FileTransferManager::FileTransferManager(Client *client) d->client = client; d->pft = new JT_PushFT(d->client->rootTask()); - connect(d->pft, TQT_SIGNAL(incoming(const FTRequest &)), TQT_SLOT(pft_incoming(const FTRequest &))); + connect(d->pft, TQ_SIGNAL(incoming(const FTRequest &)), TQ_SLOT(pft_incoming(const FTRequest &))); } FileTransferManager::~FileTransferManager() diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index 8f2e01b6..971af3a4 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -394,15 +394,15 @@ void S5BConnection::man_waitForAccept(const S5BRequest &r) void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp) { d->sc = sc; - connect(d->sc, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sc_connectionClosed())); - connect(d->sc, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sc_delayedCloseFinished())); - connect(d->sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(d->sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(d->sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(d->sc, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sc_connectionClosed())); + connect(d->sc, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sc_delayedCloseFinished())); + connect(d->sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(d->sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(d->sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); if(sc_udp) { d->su = sc_udp; - connect(d->su, TQT_SIGNAL(packetReady(const TQByteArray &)), TQT_SLOT(su_packetReady(const TQByteArray &))); + connect(d->su, TQ_SIGNAL(packetReady(const TQByteArray &)), TQ_SLOT(su_packetReady(const TQByteArray &))); } d->state = Active; @@ -425,7 +425,7 @@ void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp) d->notifyClose = true; } if(d->notifyRead || d->notifyClose) - TQTimer::singleShot(0, this, TQT_SLOT(doPending())); + TQTimer::singleShot(0, this, TQ_SLOT(doPending())); connected(); } @@ -433,7 +433,7 @@ void S5BConnection::doPending() { if(d->notifyRead) { if(d->notifyClose) - TQTimer::singleShot(0, this, TQT_SLOT(doPending())); + TQTimer::singleShot(0, this, TQ_SLOT(doPending())); sc_readyRead(); } else if(d->notifyClose) @@ -588,9 +588,9 @@ S5BManager::S5BManager(Client *parent) d->activeList.setAutoDelete(true); d->ps = new JT_PushS5B(d->client->rootTask()); - connect(d->ps, TQT_SIGNAL(incoming(const S5BRequest &)), TQT_SLOT(ps_incoming(const S5BRequest &))); - connect(d->ps, TQT_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQT_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &))); - connect(d->ps, TQT_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQT_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &))); + connect(d->ps, TQ_SIGNAL(incoming(const S5BRequest &)), TQ_SLOT(ps_incoming(const S5BRequest &))); + connect(d->ps, TQ_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQ_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &))); + connect(d->ps, TQ_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQ_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &))); } S5BManager::~S5BManager() @@ -1008,12 +1008,12 @@ void S5BManager::entryContinue(Entry *e) e->i = new Item(this); e->i->proxy = e->proxyInfo; - connect(e->i, TQT_SIGNAL(accepted()), TQT_SLOT(item_accepted())); - connect(e->i, TQT_SIGNAL(tryingHosts(const StreamHostList &)), TQT_SLOT(item_tryingHosts(const StreamHostList &))); - connect(e->i, TQT_SIGNAL(proxyConnect()), TQT_SLOT(item_proxyConnect())); - connect(e->i, TQT_SIGNAL(waitingForActivation()), TQT_SLOT(item_waitingForActivation())); - connect(e->i, TQT_SIGNAL(connected()), TQT_SLOT(item_connected())); - connect(e->i, TQT_SIGNAL(error(int)), TQT_SLOT(item_error(int))); + connect(e->i, TQ_SIGNAL(accepted()), TQ_SLOT(item_accepted())); + connect(e->i, TQ_SIGNAL(tryingHosts(const StreamHostList &)), TQ_SLOT(item_tryingHosts(const StreamHostList &))); + connect(e->i, TQ_SIGNAL(proxyConnect()), TQ_SLOT(item_proxyConnect())); + connect(e->i, TQ_SIGNAL(waitingForActivation()), TQ_SLOT(item_waitingForActivation())); + connect(e->i, TQ_SIGNAL(connected()), TQ_SLOT(item_connected())); + connect(e->i, TQ_SIGNAL(error(int)), TQ_SLOT(item_error(int))); if(e->c->isRemote()) { const S5BRequest &req = e->c->d->req; @@ -1036,7 +1036,7 @@ void S5BManager::queryProxy(Entry *e) printf("querying proxy: [%s]\n", e->c->d->proxy.full().latin1()); #endif e->query = new JT_S5B(d->client->rootTask()); - connect(e->query, TQT_SIGNAL(finished()), TQT_SLOT(query_finished())); + connect(e->query, TQ_SIGNAL(finished()), TQ_SLOT(query_finished())); e->query->requestProxyInfo(e->c->d->proxy); e->query->go(true); } @@ -1246,7 +1246,7 @@ void S5BManager::Item::doOutgoing() allowIncoming = true; task = new JT_S5B(m->client()->rootTask()); - connect(task, TQT_SIGNAL(finished()), TQT_SLOT(jt_finished())); + connect(task, TQ_SIGNAL(finished()), TQ_SLOT(jt_finished())); task->request(peer, sid, hosts, state == Initiator ? wantFast : false, udp); out_id = task->id(); task->go(true); @@ -1292,7 +1292,7 @@ void S5BManager::Item::doIncoming() } conn = new S5BConnector; - connect(conn, TQT_SIGNAL(result(bool)), TQT_SLOT(conn_result(bool))); + connect(conn, TQ_SIGNAL(result(bool)), TQ_SLOT(conn_result(bool))); TQGuardedPtr self = this; tryingHosts(list); @@ -1308,9 +1308,9 @@ void S5BManager::Item::setIncomingClient(SocksClient *sc) printf("S5BManager::Item: %s [%s] successful incoming connection\n", peer.full().latin1(), sid.latin1()); #endif - connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); client = sc; allowIncoming = false; @@ -1388,7 +1388,7 @@ void S5BManager::Item::jt_finished() #endif // connect to the proxy proxy_conn = new S5BConnector; - connect(proxy_conn, TQT_SIGNAL(result(bool)), TQT_SLOT(proxy_result(bool))); + connect(proxy_conn, TQ_SIGNAL(result(bool)), TQ_SLOT(proxy_result(bool))); StreamHostList list; list += proxy; @@ -1442,9 +1442,9 @@ void S5BManager::Item::conn_result(bool b) printf("S5BManager::Item: %s [%s] successful outgoing connection\n", peer.full().latin1(), sid.latin1()); #endif - connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); m->doSuccess(peer, in_id, h.jid()); @@ -1493,9 +1493,9 @@ void S5BManager::Item::proxy_result(bool b) delete proxy_conn; proxy_conn = 0; - connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); client = sc; client_udp = sc_udp; @@ -1505,7 +1505,7 @@ void S5BManager::Item::proxy_result(bool b) printf("activating proxy stream\n"); #endif proxy_task = new JT_S5B(m->client()->rootTask()); - connect(proxy_task, TQT_SIGNAL(finished()), TQT_SLOT(proxy_finished())); + connect(proxy_task, TQ_SIGNAL(finished()), TQ_SLOT(proxy_finished())); proxy_task->requestActivation(proxy.jid(), sid, peer); proxy_task->go(true); } @@ -1768,9 +1768,9 @@ public: udp = _udp; client = new SocksClient; client_udp = 0; - connect(client, TQT_SIGNAL(connected()), TQT_SLOT(sc_connected())); - connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); - connect(&t, TQT_SIGNAL(timeout()), TQT_SLOT(trySendUDP())); + connect(client, TQ_SIGNAL(connected()), TQ_SLOT(sc_connected())); + connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); + connect(&t, TQ_SIGNAL(timeout()), TQ_SLOT(trySendUDP())); } ~Item() @@ -1872,7 +1872,7 @@ S5BConnector::S5BConnector(TQObject *parent) d->active = 0; d->active_udp = 0; d->itemList.setAutoDelete(true); - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); } S5BConnector::~S5BConnector() @@ -1900,7 +1900,7 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const TQS #endif for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) { Item *i = new Item(self, *it, key, udp); - connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool))); + connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool))); d->itemList.append(i); i->start(); } @@ -1990,11 +1990,11 @@ public: Item(SocksClient *c) : TQObject(0) { client = c; - connect(client, TQT_SIGNAL(incomingMethods(int)), TQT_SLOT(sc_incomingMethods(int))); - connect(client, TQT_SIGNAL(incomingConnectRequest(const TQString &, int)), TQT_SLOT(sc_incomingConnectRequest(const TQString &, int))); - connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(client, TQ_SIGNAL(incomingMethods(int)), TQ_SLOT(sc_incomingMethods(int))); + connect(client, TQ_SIGNAL(incomingConnectRequest(const TQString &, int)), TQ_SLOT(sc_incomingConnectRequest(const TQString &, int))); + connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); - connect(&expire, TQT_SIGNAL(timeout()), TQT_SLOT(doError())); + connect(&expire, TQ_SIGNAL(timeout()), TQ_SLOT(doError())); resetExpiration(); } @@ -2059,8 +2059,8 @@ S5BServer::S5BServer(TQObject *parent) { d = new Private; d->itemList.setAutoDelete(true); - connect(&d->serv, TQT_SIGNAL(incomingReady()), TQT_SLOT(ss_incomingReady())); - connect(&d->serv, TQT_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQT_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &))); + connect(&d->serv, TQ_SIGNAL(incomingReady()), TQ_SLOT(ss_incomingReady())); + connect(&d->serv, TQ_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQ_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &))); } S5BServer::~S5BServer() @@ -2106,7 +2106,7 @@ void S5BServer::ss_incomingReady() #ifdef S5B_DEBUG printf("S5BServer: incoming connection from %s:%d\n", i->client->peerAddress().toString().latin1(), i->client->peerPort()); #endif - connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool))); + connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool))); d->itemList.append(i); } @@ -2200,7 +2200,7 @@ JT_S5B::JT_S5B(Task *parent) { d = new Private; d->mode = -1; - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); } JT_S5B::~JT_S5B() diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp index aaf3e4cd..ed6c44c7 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp @@ -110,7 +110,7 @@ void IBBConnection::connectToJid(const Jid &peer, const TQDomElement &comment) d->m->client()->debug(dstr); d->j = new JT_IBB(d->m->client()->rootTask()); - connect(d->j, TQT_SIGNAL(finished()), TQT_SLOT(ibb_finished())); + connect(d->j, TQ_SIGNAL(finished()), TQ_SLOT(ibb_finished())); d->j->request(d->peer, comment); d->j->go(true); } @@ -270,7 +270,7 @@ void IBBConnection::ibb_finished() } if(!d->sendbuf.isEmpty() || d->closePending) - TQTimer::singleShot(IBB_PACKET_DELAY, this, TQT_SLOT(trySend())); + TQTimer::singleShot(IBB_PACKET_DELAY, this, TQ_SLOT(trySend())); } } else { @@ -326,7 +326,7 @@ void IBBConnection::trySend() d->blockSize = a.size(); d->j = new JT_IBB(d->m->client()->rootTask()); - connect(d->j, TQT_SIGNAL(finished()), TQT_SLOT(ibb_finished())); + connect(d->j, TQ_SIGNAL(finished()), TQ_SLOT(ibb_finished())); d->j->sendData(d->peer, d->sid, a, doClose); d->j->go(true); } @@ -353,8 +353,8 @@ IBBManager::IBBManager(Client *parent) d->client = parent; d->ibb = new JT_IBB(d->client->rootTask(), true); - connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); - connect(d->ibb, TQT_SIGNAL(incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)), TQT_SLOT(ibb_incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool))); + connect(d->ibb, TQ_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQ_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); + connect(d->ibb, TQ_SIGNAL(incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)), TQ_SLOT(ibb_incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool))); } IBBManager::~IBBManager() diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp index 5139dffd..7cfecda0 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp @@ -105,18 +105,18 @@ void JidLink::link() { if(d->type == DTCP) { S5BConnection *c = (S5BConnection *)d->bs; - connect(c, TQT_SIGNAL(connected()), TQT_SLOT(dtcp_connected())); - connect(c, TQT_SIGNAL(accepted()), TQT_SLOT(dtcp_accepted())); + connect(c, TQ_SIGNAL(connected()), TQ_SLOT(dtcp_connected())); + connect(c, TQ_SIGNAL(accepted()), TQ_SLOT(dtcp_accepted())); } else { IBBConnection *c = (IBBConnection *)d->bs; - connect(c, TQT_SIGNAL(connected()), TQT_SLOT(ibb_connected())); + connect(c, TQ_SIGNAL(connected()), TQ_SLOT(ibb_connected())); } - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); } void JidLink::unlink() @@ -129,7 +129,7 @@ void JidLink::accept() if(d->state != WaitingForAccept) return; - TQTimer::singleShot(0, this, TQT_SLOT(doRealAccept())); + TQTimer::singleShot(0, this, TQ_SLOT(doRealAccept())); } void JidLink::doRealAccept() diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index a27811ec..493d887d 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp @@ -231,9 +231,9 @@ AdvancedConnector::AdvancedConnector(TQObject *parent) #ifdef NO_NDNS d->qdns = 0; #else - connect(&d->dns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done())); + connect(&d->dns, TQ_SIGNAL(resultsReady()), TQ_SLOT(dns_done())); #endif - connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done())); + connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done())); d->opt_probe = false; d->opt_ssl = false; cleanup(); @@ -326,10 +326,10 @@ void AdvancedConnector::connectToServer(const TQString &server) HttpPoll *s = new HttpPoll; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(syncStarted()), TQT_SLOT(http_syncStarted())); - connect(s, TQT_SIGNAL(syncFinished()), TQT_SLOT(http_syncFinished())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(syncStarted()), TQ_SLOT(http_syncStarted())); + connect(s, TQ_SIGNAL(syncFinished()), TQ_SLOT(http_syncFinished())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); if(!d->proxy.user().isEmpty()) s->setAuth(d->proxy.user(), d->proxy.pass()); s->setPollInterval(d->proxy.pollInterval()); @@ -389,7 +389,7 @@ void AdvancedConnector::do_resolve() #ifdef NO_NDNS printf("resolving (aaaa=%d)\n", d->aaaa); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(dns_done())); if(d->aaaa) d->qdns->setRecordType(TQDns::Aaaa); // IPv6 else @@ -502,8 +502,8 @@ void AdvancedConnector::do_connect() #endif BSocket *s = new BSocket; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); s->connectToHost(d->host, d->port); } else if(t == Proxy::HttpConnect) { @@ -512,8 +512,8 @@ void AdvancedConnector::do_connect() #endif HttpConnect *s = new HttpConnect; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); if(!d->proxy.user().isEmpty()) s->setAuth(d->proxy.user(), d->proxy.pass()); s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port); @@ -524,8 +524,8 @@ void AdvancedConnector::do_connect() #endif SocksClient *s = new SocksClient; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); if(!d->proxy.user().isEmpty()) s->setAuth(d->proxy.user(), d->proxy.pass()); s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp index 84b387e8..14ff7019 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp @@ -132,11 +132,11 @@ public: type = TLS; p.tls = t; init(); - connect(p.tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(p.tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(p.tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(p.tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(p.tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(p.tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(p.tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(p.tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(p.tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(p.tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); } SecureLayer(TQCA::SASL *s) @@ -144,9 +144,9 @@ public: type = SASL; p.sasl = s; init(); - connect(p.sasl, TQT_SIGNAL(readyRead()), TQT_SLOT(sasl_readyRead())); - connect(p.sasl, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(sasl_readyReadOutgoing(int))); - connect(p.sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(p.sasl, TQ_SIGNAL(readyRead()), TQ_SLOT(sasl_readyRead())); + connect(p.sasl, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(sasl_readyReadOutgoing(int))); + connect(p.sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); } #ifdef USE_TLSHANDLER @@ -155,11 +155,11 @@ public: type = TLSH; p.tlsHandler = t; init(); - connect(p.tlsHandler, TQT_SIGNAL(success()), TQT_SLOT(tlsHandler_success())); - connect(p.tlsHandler, TQT_SIGNAL(fail()), TQT_SLOT(tlsHandler_fail())); - connect(p.tlsHandler, TQT_SIGNAL(closed()), TQT_SLOT(tlsHandler_closed())); - connect(p.tlsHandler, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(tlsHandler_readyRead(const TQByteArray &))); - connect(p.tlsHandler, TQT_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQT_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); + connect(p.tlsHandler, TQ_SIGNAL(success()), TQ_SLOT(tlsHandler_success())); + connect(p.tlsHandler, TQ_SIGNAL(fail()), TQ_SLOT(tlsHandler_fail())); + connect(p.tlsHandler, TQ_SIGNAL(closed()), TQ_SLOT(tlsHandler_closed())); + connect(p.tlsHandler, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(tlsHandler_readyRead(const TQByteArray &))); + connect(p.tlsHandler, TQ_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQ_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); } #endif @@ -349,8 +349,8 @@ SecureStream::SecureStream(ByteStream *s) d = new Private; d->bs = s; - 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, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); d->layers.setAutoDelete(true); d->pending = 0; @@ -365,11 +365,11 @@ SecureStream::~SecureStream() void SecureStream::linkLayer(TQObject *s) { - connect(s, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(layer_tlsHandshaken())); - connect(s, TQT_SIGNAL(tlsClosed(const TQByteArray &)), TQT_SLOT(layer_tlsClosed(const TQByteArray &))); - connect(s, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(layer_readyRead(const TQByteArray &))); - connect(s, TQT_SIGNAL(needWrite(const TQByteArray &)), TQT_SLOT(layer_needWrite(const TQByteArray &))); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(layer_error(int))); + connect(s, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(layer_tlsHandshaken())); + connect(s, TQ_SIGNAL(tlsClosed(const TQByteArray &)), TQ_SLOT(layer_tlsClosed(const TQByteArray &))); + connect(s, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(layer_readyRead(const TQByteArray &))); + connect(s, TQ_SIGNAL(needWrite(const TQByteArray &)), TQ_SLOT(layer_needWrite(const TQByteArray &))); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(layer_error(int))); } int SecureStream::calcPrebytes() const diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index e0d09d8e..18b19688 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -618,11 +618,11 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa d = new Private; d->mode = Client; 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->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected())); + connect(d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error())); d->noop_time = 0; - connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop())); + connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop())); d->tlsHandler = tlsHandler; } @@ -633,18 +633,18 @@ ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteS d = new Private; d->mode = Server; d->bs = bs; - 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(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(error(int)), TQ_SLOT(bs_error(int))); TQByteArray spare = d->bs->read(); d->ss = new SecureStream(d->bs); - connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead())); - connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int))); - connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken())); - connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed())); - connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int))); + connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead())); + connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int))); + connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken())); + connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed())); + connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int))); d->server = host; d->defRealm = defRealm; @@ -940,17 +940,17 @@ void ClientStream::write(const Stanza &s) 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, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); TQByteArray spare = d->bs->read(); d->ss = new SecureStream(d->bs); - connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead())); - connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int))); - connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken())); - connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed())); - connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int))); + connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead())); + connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int))); + connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken())); + connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed())); + connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int))); //d->client.startDialbackOut("andbit.net", "im.pyxa.org"); //d->client.startServerOut(d->server); @@ -1163,10 +1163,10 @@ void ClientStream::srvProcessNext() else if(need == CoreProtocol::NSASLMechs) { if(!d->sasl) { d->sasl = new TQCA::SASL; - connect(d->sasl, TQT_SIGNAL(authCheck(const TQString &, const TQString &)), TQT_SLOT(sasl_authCheck(const TQString &, const TQString &))); - connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &))); - connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated())); - connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(d->sasl, TQ_SIGNAL(authCheck(const TQString &, const TQString &)), TQ_SLOT(sasl_authCheck(const TQString &, const TQString &))); + connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &))); + connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated())); + connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); //d->sasl->setAllowAnonymous(false); //d->sasl->setRequirePassCredentials(true); @@ -1258,7 +1258,7 @@ void ClientStream::srvProcessNext() } case CoreProtocol::ESASLSuccess: { printf("Break SASL Success\n"); - disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int))); + disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int))); TQByteArray a = d->srv.spare; d->ss->setLayerSASL(d->sasl, a); break; @@ -1324,7 +1324,7 @@ void ClientStream::processNext() //if(!d->in_rrsig && !d->in.isEmpty()) { if(!d->in.isEmpty()) { //d->in_rrsig = true; - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } if(cont) @@ -1480,11 +1480,11 @@ bool ClientStream::handleNeed() } d->sasl = new TQCA::SASL; - connect(d->sasl, TQT_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQT_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *))); - connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &))); - connect(d->sasl, TQT_SIGNAL(needParams(bool, bool, bool, bool)), TQT_SLOT(sasl_needParams(bool, bool, bool, bool))); - connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated())); - connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(d->sasl, TQ_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQ_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *))); + connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &))); + connect(d->sasl, TQ_SIGNAL(needParams(bool, bool, bool, bool)), TQ_SLOT(sasl_needParams(bool, bool, bool, bool))); + connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated())); + connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); if(d->haveLocalAddr) d->sasl->setLocalAddr(d->localAddr, d->localPort); @@ -1531,7 +1531,7 @@ bool ClientStream::handleNeed() } case CoreProtocol::NSASLLayer: { // SecureStream will handle the errors from this point - disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int))); + disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int))); d->ss->setLayerSASL(d->sasl, d->client.spare); if(d->sasl_ssf > 0) { TQGuardedPtr self = this; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp index 86092bad..51e75bbf 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp @@ -53,11 +53,11 @@ TQCATLSHandler::TQCATLSHandler(TQCA::TLS *parent) { d = new Private; d->tls = parent; - connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(d->tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(d->tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(d->tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(d->tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(d->tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(d->tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(d->tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); d->state = 0; d->err = -1; } @@ -88,7 +88,7 @@ void TQCATLSHandler::startClient(const TQString &host) d->state = 0; d->err = -1; if(!d->tls->startClient(host)) - TQTimer::singleShot(0, this, TQT_SIGNAL(fail())); + TQTimer::singleShot(0, this, TQ_SIGNAL(fail())); } void TQCATLSHandler::write(const TQByteArray &a) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 08c5c415..f03ab71b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -50,8 +50,8 @@ //! Session::Session() //! { //! client = new Client; -//! connect(client, TQT_SIGNAL(handshaken()), TQT_SLOT(clientHandshaken())); -//! connect(client, TQT_SIGNAL(authFinished(bool, int, const TQString &)), TQT_SLOT(authFinished(bool, int, const TQString &))); +//! connect(client, TQ_SIGNAL(handshaken()), TQ_SLOT(clientHandshaken())); +//! connect(client, TQ_SIGNAL(authFinished(bool, int, const TQString &)), TQ_SLOT(authFinished(bool, int, const TQString &))); //! client->connectToHost("jabber.org"); //! } //! @@ -162,10 +162,10 @@ Client::Client(TQObject *par) d->stream = 0; d->s5bman = new S5BManager(this); - connect(d->s5bman, TQT_SIGNAL(incomingReady()), TQT_SLOT(s5b_incomingReady())); + connect(d->s5bman, TQ_SIGNAL(incomingReady()), TQ_SLOT(s5b_incomingReady())); d->ibbman = new IBBManager(this); - connect(d->ibbman, TQT_SIGNAL(incomingReady()), TQT_SLOT(ibb_incomingReady())); + connect(d->ibbman, TQ_SIGNAL(incomingReady()), TQ_SLOT(ibb_incomingReady())); d->jlman = new JidLinkManager(this); @@ -188,14 +188,14 @@ Client::~Client() void Client::connectToServer(ClientStream *s, const Jid &j, bool auth) { d->stream = s; - //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); - //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); - connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); - connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); - //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); - connect(d->stream, TQT_SIGNAL(incomingXml(const TQString &)), TQT_SLOT(streamIncomingXml(const TQString &))); - connect(d->stream, TQT_SIGNAL(outgoingXml(const TQString &)), TQT_SLOT(streamOutgoingXml(const TQString &))); + //connect(d->stream, TQ_SIGNAL(connected()), TQ_SLOT(streamConnected())); + //connect(d->stream, TQ_SIGNAL(handshaken()), TQ_SLOT(streamHandshaken())); + connect(d->stream, TQ_SIGNAL(error(int)), TQ_SLOT(streamError(int))); + //connect(d->stream, TQ_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQ_SLOT(streamSSLCertificateReady(const TQSSLCert &))); + connect(d->stream, TQ_SIGNAL(readyRead()), TQ_SLOT(streamReadyRead())); + //connect(d->stream, TQ_SIGNAL(closeFinished()), TQ_SLOT(streamCloseFinished())); + connect(d->stream, TQ_SIGNAL(incomingXml(const TQString &)), TQ_SLOT(streamIncomingXml(const TQString &))); + connect(d->stream, TQ_SIGNAL(outgoingXml(const TQString &)), TQ_SLOT(streamOutgoingXml(const TQString &))); d->stream->connectToServer(j, auth); } @@ -213,14 +213,14 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); - connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &))); - connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); + connect(pp, TQ_SIGNAL(subscription(const Jid &, const TQString &)), TQ_SLOT(ppSubscription(const Jid &, const TQString &))); + connect(pp, TQ_SIGNAL(presence(const Jid &, const Status &)), TQ_SLOT(ppPresence(const Jid &, const Status &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); - connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); + connect(pm, TQ_SIGNAL(message(const Message &)), TQ_SLOT(pmMessage(const Message &))); JT_PushRoster *pr = new JT_PushRoster(rootTask()); - connect(pr, TQT_SIGNAL(roster(const Roster &)), TQT_SLOT(prRoster(const Roster &))); + connect(pr, TQ_SIGNAL(roster(const Roster &)), TQ_SLOT(prRoster(const Roster &))); new JT_ServInfo(rootTask()); new PongServer(rootTask()); @@ -884,7 +884,7 @@ void Client::rosterRequest() return; JT_Roster *r = new JT_Roster(rootTask()); - connect(r, TQT_SIGNAL(finished()), TQT_SLOT(slotRosterRequestFinished())); + connect(r, TQ_SIGNAL(finished()), TQ_SLOT(slotRosterRequestFinished())); r->get(); d->roster.flagAllForDelete(); // mod_groups patch r->go(true); @@ -1163,7 +1163,7 @@ Task::Task(Task *parent) d->client = parent->client(); d->id = client()->genUniqueId(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) @@ -1172,7 +1172,7 @@ Task::Task(Client *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() @@ -1276,7 +1276,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/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index c331e123..e7e929ab 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -270,7 +270,7 @@ void JT_UnRegister::onGo() d->jt_reg = new JT_Register(this); d->jt_reg->getForm(d->j); - connect(d->jt_reg, TQT_SIGNAL(finished()), TQT_SLOT(getFormFinished())); + connect(d->jt_reg, TQ_SIGNAL(finished()), TQ_SLOT(getFormFinished())); d->jt_reg->go(false); } @@ -279,7 +279,7 @@ void JT_UnRegister::getFormFinished() disconnect(d->jt_reg, 0, this, 0); d->jt_reg->unreg(d->j); - connect(d->jt_reg, TQT_SIGNAL(finished()), TQT_SLOT(unregFinished())); + connect(d->jt_reg, TQ_SIGNAL(finished()), TQ_SLOT(unregFinished())); d->jt_reg->go(false); } diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp index 470a9f2e..709255a7 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -76,14 +76,14 @@ void JabberDiscoProtocol::openConnection () { m_jabberClient = new JabberClient; - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), - this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csDisconnected () ), this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQ_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQ_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); } else { @@ -232,7 +232,7 @@ void JabberDiscoProtocol::slotConnected () case ListDir: // list a directory kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); - connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); + connect ( discoTask, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotQueryFinished () ) ); discoTask->get ( m_host ); discoTask->go ( true ); break; diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index 10c11b0f..64970573 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -45,7 +45,7 @@ dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotGotForm ())); task->get (jid); task->go (true); @@ -83,7 +83,7 @@ void dlgJabberBrowse::slotGotForm () tblResults->setColumnStretchable (i, true); } - connect (btnSearch, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ())); + connect (btnSearch, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSendForm ())); } @@ -92,7 +92,7 @@ void dlgJabberBrowse::slotSendForm () XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentForm ())); task->set (translator->resultData ()); task->go (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index c890b158..dd2ffd62 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -80,7 +80,7 @@ void DlgJabberChangePassword::slotOk () i18n ( "Your account needs to be connected before the password can be changed. Do you want to try to connect now?" ), i18n ( "Jabber Password Change" ), i18n("Connect"), i18n("Stay Offline") ) == KMessageBox::Yes ) { - connect ( m_account, TQT_SIGNAL ( isConnectedChanged () ), this, TQT_SLOT ( slotChangePassword () ) ); + connect ( m_account, TQ_SIGNAL ( isConnectedChanged () ), this, TQ_SLOT ( slotChangePassword () ) ); m_account->connect (); } } @@ -102,7 +102,7 @@ void DlgJabberChangePassword::slotChangePassword () { XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotChangePasswordDone () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotChangePasswordDone () ) ); task->changepw ( m_mainWidget->peNewPassword1->password () ); task->go ( true ); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index 46071122..5988c712 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -77,7 +77,7 @@ void dlgJabberChatJoin::slotBowse() void dlgJabberChatJoin::checkDefaultChatroomServer() { XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices(m_account->client()->rootTask()); - connect(serviceTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotQueryFinished())); + connect(serviceTask, TQ_SIGNAL (finished()), this, TQ_SLOT (slotQueryFinished())); serviceTask->get(m_account->server()); serviceTask->go(true); @@ -97,7 +97,7 @@ void dlgJabberChatJoin::slotQueryFinished() for (XMPP::AgentList::const_iterator it = task->agents().begin(); it != task->agents().end(); ++it) { XMPP::JT_DiscoInfo *discoTask = new XMPP::JT_DiscoInfo(m_account->client()->rootTask()); - connect(discoTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotDiscoFinished())); + connect(discoTask, TQ_SIGNAL (finished()), this, TQ_SLOT (slotDiscoFinished())); discoTask->get((*it).jid().full()); discoTask->go(true); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index 3afea298..4fec5b7f 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -74,7 +74,7 @@ void dlgJabberChatRoomsList::slotQuery() tblChatRoomsList->setNumRows(0); XMPP::JT_DiscoItems *discoTask = new XMPP::JT_DiscoItems(m_account->client()->rootTask()); - connect (discoTask, TQT_SIGNAL(finished()), this, TQT_SLOT(slotQueryFinished())); + connect (discoTask, TQ_SIGNAL(finished()), this, TQ_SLOT(slotQueryFinished())); m_chatServer = leServer->text(); discoTask->get(leServer->text()); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 0f6f55f4..5d46695b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -32,7 +32,7 @@ dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & XMPP::JT_Register * task = new XMPP::JT_Register(m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotGotForm ())); task->getForm (jid); task->go (true); @@ -66,7 +66,7 @@ void dlgJabberRegister::slotGotForm () // enable the send button btnRegister->setEnabled (true); - connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ())); + connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSendForm ())); } @@ -76,7 +76,7 @@ void dlgJabberRegister::slotSendForm () return; XMPP::JT_Register * task = new XMPP::JT_Register (m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentForm ())); task->setForm (translator->resultData ()); task->go (true); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 499eb2b7..c665847c 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -28,10 +28,10 @@ dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, con : DlgSendRaw (parent, name) { // Connect the GUI elements to things that do stuff - connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); - connect (btnClose, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotCancel ())); - connect (btnClear, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotClear ())); - connect (inputWidget, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotCreateMessage (int))); + connect (btnSend, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSend ())); + connect (btnClose, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotCancel ())); + connect (btnClear, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotClear ())); + connect (inputWidget, TQ_SIGNAL (activated (int)), this, TQ_SLOT (slotCreateMessage (int))); m_client = client; diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index bf0eaa27..11839b79 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -63,12 +63,12 @@ dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, //tblServices->horizontalHeader ()->setLabel (0, i18n ("Name")); //tblServices->horizontalHeader ()->setLabel (1, i18n ("Address")); - connect (btnQuery, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDisco ())); - //connect (tblServices, TQT_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQT_SLOT (slotSetSelection (int, int, int, const TQPoint &))); - connect (lvServices, TQT_SIGNAL (selectionChanged (TQListViewItem *)), this, TQT_SLOT (slotSetSelection (TQListViewItem *))); + connect (btnQuery, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotDisco ())); + //connect (tblServices, TQ_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQ_SLOT (slotSetSelection (int, int, int, const TQPoint &))); + connect (lvServices, TQ_SIGNAL (selectionChanged (TQListViewItem *)), this, TQ_SLOT (slotSetSelection (TQListViewItem *))); - connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRegister ())); - connect (btnBrowse, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotBrowse ())); + connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotRegister ())); + connect (btnBrowse, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotBrowse ())); } @@ -99,7 +99,7 @@ void dlgJabberServices::slotService () } XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices (m_account->client()->rootTask ()); - connect (serviceTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotServiceFinished ())); + connect (serviceTask, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotServiceFinished ())); /* populate server field if it is empty */ if(leServer->text().isEmpty()) @@ -148,7 +148,7 @@ void dlgJabberServices::slotDisco() } JT_DiscoItems *jt = new JT_DiscoItems(m_account->client()->rootTask()); - connect(jt, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDiscoFinished())); + connect(jt, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDiscoFinished())); /* populate server field if it is empty */ if(leServer->text().isEmpty()) @@ -214,7 +214,7 @@ dlgJabberServices::~dlgJabberServices () void dlgJabberServies_item::updateInfo( const XMPP::Jid & jid , const TQString & node , JabberAccount *account ) { XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account->client()->rootTask()); - connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); + connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished())); jt->get(jid, node); jt->go(true); diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 3f12b2f5..6dbc4456 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -70,14 +70,14 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta m_mainWidget = new dlgVCard(this); setMainWidget(m_mainWidget); - connect (this, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSaveVCard ())); - connect (this, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT (slotGetVCard ())); + connect (this, TQ_SIGNAL (user1Clicked()), this, TQ_SLOT (slotSaveVCard ())); + connect (this, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT (slotGetVCard ())); - connect (m_mainWidget->btnSelectPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotSelectPhoto())); - connect (m_mainWidget->btnClearPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotClearPhoto())); - connect (m_mainWidget->urlHomeEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); - connect (m_mainWidget->urlWorkEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); - connect (m_mainWidget->urlHomepage, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->btnSelectPhoto, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotSelectPhoto())); + connect (m_mainWidget->btnClearPhoto, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotClearPhoto())); + connect (m_mainWidget->urlHomeEmail, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->urlWorkEmail, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->urlHomepage, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &))); assignContactProperties(); @@ -407,7 +407,7 @@ void dlgJabberVCard::slotSaveVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard( m_account->client()->rootTask() ); // signal to ourselves when the vCard data arrived - TQObject::connect(task, TQT_SIGNAL(finished()), this, TQT_SLOT(slotVCardSaved())); + TQObject::connect(task, TQ_SIGNAL(finished()), this, TQ_SLOT(slotVCardSaved())); task->set(vCard); task->go(true); } @@ -438,7 +438,7 @@ void dlgJabberVCard::slotGetVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard ( m_account->client()->rootTask() ); // signal to ourselves when the vCard data arrived - TQObject::connect( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) ); + TQObject::connect( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotVCard () ) ); task->get ( m_contact->rosterItem().jid().full() ); task->go ( true ); } diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 0fc940c9..2379f261 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -51,7 +51,7 @@ JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * { jabData->textLabel1->setText( i18n("Loading instruction from gateway...") ); XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); - TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotPromtReceived())); + TQObject::connect (gatewayTask, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotPromtReceived())); gatewayTask->get ( transport->myself()->contactId() ); gatewayTask->go ( true ); } @@ -91,7 +91,7 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); - TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); + TQObject::connect (gatewayTask, TQ_SIGNAL (finished ()), workaround, TQ_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 9221b2c4..47721e55 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -48,11 +48,11 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch // retrieve server list mTransferJob = TDEIO::get ( "http://www.jabber.org/servers.xml" ); - connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); - connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( result ( TDEIO::Job* ) ), this, TQ_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); - connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) ); - connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) ); + connect ( mMainWidget->listServers, TQ_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQ_SLOT ( slotSetSelection ( int ) ) ); + connect ( mMainWidget->listServers, TQ_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQ_SLOT ( slotOk () ) ); enableButtonOK ( false ); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 6db53bff..e951b0ac 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -46,12 +46,12 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber m_protocol = proto; - connect (mID, TQT_SIGNAL (textChanged (const TQString &)), this, TQT_SLOT (updateServerField ())); - connect (cbCustomServer, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (updateServerField ())); + connect (mID, TQ_SIGNAL (textChanged (const TQString &)), this, TQ_SLOT (updateServerField ())); + connect (cbCustomServer, TQ_SIGNAL (toggled (bool)), this, TQ_SLOT (updateServerField ())); - connect (cbUseSSL, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (sslToggled (bool))); + connect (cbUseSSL, TQ_SIGNAL (toggled (bool)), this, TQ_SLOT (sslToggled (bool))); - connect (btnChangePassword, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotChangePasswordClicked () )); + connect (btnChangePassword, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( slotChangePasswordClicked () )); if (account()) { @@ -63,7 +63,7 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber { // this is a new account btnChangePassword->setEnabled ( false ); - connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (registerClicked ())); + connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (registerClicked ())); } } @@ -264,7 +264,7 @@ void JabberEditAccountWidget::slotChangePasswordClicked () DlgJabberChangePassword *passwordDlg = new DlgJabberChangePassword ( account (), this ); - connect ( passwordDlg, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotChangePasswordFinished () ) ); + connect ( passwordDlg, TQ_SIGNAL ( destroyed () ), this, TQ_SLOT ( slotChangePasswordFinished () ) ); passwordDlg->show (); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index a75e206e..ca7f0723 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -68,9 +68,9 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, // clear variables jabberClient = new JabberClient (); - connect ( jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - connect ( jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); + connect ( jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) ); + connect ( jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) ); + connect ( jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", TDEIcon::Small ); @@ -86,16 +86,16 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default - connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); - connect ( mMainWidget->btnChooseServer, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotChooseServer () ) ); - connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) ); - connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) ); - connect ( mMainWidget->cbUseSSL, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( slotSSLToggled () ) ); + connect ( this, TQ_SIGNAL ( cancelClicked () ), this, TQ_SLOT ( slotDeleteDialog () ) ); + connect ( mMainWidget->btnChooseServer, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotChooseServer () ) ); + connect ( mMainWidget->leServer, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( slotJIDInformation () ) ); + connect ( mMainWidget->leJID, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( slotJIDInformation () ) ); + connect ( mMainWidget->cbUseSSL, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( slotSSLToggled () ) ); - connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); - connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); - connect ( mMainWidget->lePassword, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); - connect ( mMainWidget->lePasswordVerify, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); + connect ( mMainWidget->leServer, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); + connect ( mMainWidget->leJID, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); + connect ( mMainWidget->lePassword, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); + connect ( mMainWidget->lePasswordVerify, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); // display JID info now slotJIDInformation (); @@ -329,7 +329,7 @@ void JabberRegisterAccount::slotConnected () mMainWidget->lblStatusMessage->setText ( i18n ( "Connected successfully, registering new account..." ) ); XMPP::JT_Register * task = new XMPP::JT_Register (jabberClient->rootTask ()); - TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotRegisterUserDone ())); + TQObject::connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotRegisterUserDone ())); task->reg (mMainWidget->leJID->text().section("@", 0, 0), mMainWidget->lePassword->password ()); task->go (true); @@ -371,7 +371,7 @@ void JabberRegisterAccount::slotRegisterUserDone () // rewire buttons enableButtonOK ( false ); setButtonCancel ( KStdGuiItem::close () ); - connect ( this, TQT_SIGNAL ( closeClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); + connect ( this, TQ_SIGNAL ( closeClicked () ), this, TQ_SLOT ( slotDeleteDialog () ) ); } else { @@ -384,7 +384,7 @@ void JabberRegisterAccount::slotRegisterUserDone () // FIXME: this is required because Iris crashes if we try // to disconnect here. Hopefully Justin can fix this. - TQTimer::singleShot(0, this, TQT_SLOT(disconnect ())); + TQTimer::singleShot(0, this, TQ_SLOT(disconnect ())); } diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index d38f0df5..5e5b7c77 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -93,11 +93,11 @@ void MeanwhileAccount::connectWithPassword(const TQString &password) } TQObject::connect(m_session, - TQT_SIGNAL(sessionStateChange(Kopete::OnlineStatus)), - this, TQT_SLOT(slotSessionStateChange(Kopete::OnlineStatus))); + TQ_SIGNAL(sessionStateChange(Kopete::OnlineStatus)), + this, TQ_SLOT(slotSessionStateChange(Kopete::OnlineStatus))); TQObject::connect(m_session, - TQT_SIGNAL(serverNotification(const TQString &)), - this, TQT_SLOT(slotServerNotification(const TQString&))); + TQ_SIGNAL(serverNotification(const TQString &)), + this, TQ_SLOT(slotServerNotification(const TQString&))); } @@ -139,7 +139,7 @@ TDEActionMenu * MeanwhileAccount::actionMenu() #if 0 menu->insert(new TDEAction(i18n("&Change Status Message"), TQString(), 0, - this, TQT_SLOT(meanwhileChangeStatus()), this, + this, TQ_SLOT(meanwhileChangeStatus()), this, "meanwhileChangeStatus")); //infoPlugin->addCustomMenus(theMenu); #endif diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 44b10bbc..e1b29d69 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -37,8 +37,8 @@ MeanwhileAddContactPage::MeanwhileAddContactPage( static_cast(_account); if (account->infoPlugin->canProvideMeanwhileId()) { - TQObject::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), - TQT_SLOT(slotFindUser())); + TQObject::connect(theDialog->btnFindUser, TQ_SIGNAL(clicked()), + TQ_SLOT(slotFindUser())); } else theDialog->btnFindUser->setDisabled(true); diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index c6505493..de18d58b 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -76,14 +76,14 @@ Kopete::ChatSession* MeanwhileContact::manager(CanCreateFlags canCreate) create(account()->myself(), contacts, protocol()); connect(m_msgManager, - TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - this, TQT_SLOT(sendMessage(Kopete::Message&))); + TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + this, TQ_SLOT(sendMessage(Kopete::Message&))); - connect(m_msgManager, TQT_SIGNAL(myselfTyping(bool)), - this, TQT_SLOT(slotSendTyping(bool))); + connect(m_msgManager, TQ_SIGNAL(myselfTyping(bool)), + this, TQ_SLOT(slotSendTyping(bool))); - connect(m_msgManager, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotChatSessionDestroyed())); return m_msgManager; } diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 4e2c90ee..86650563 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -106,8 +106,8 @@ MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( slotSetServer2Default(); } - TQObject::connect(btnServerDefaults, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSetServer2Default())); + TQObject::connect(btnServerDefaults, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSetServer2Default())); show(); } diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index bacf49c6..2003957e 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -207,10 +207,10 @@ void MeanwhileSession::connect(TQString password) socket = sock; /* we want to receive signals when there is data to read */ sock->enableRead(true); - TQObject::connect(sock, TQT_SIGNAL(readyRead()), this, - TQT_SLOT(slotSocketDataAvailable())); - TQObject::connect(sock, TQT_SIGNAL(closed(int)), this, - TQT_SLOT(slotSocketClosed(int))); + TQObject::connect(sock, TQ_SIGNAL(readyRead()), this, + TQ_SLOT(slotSocketDataAvailable())); + TQObject::connect(sock, TQ_SIGNAL(closed(int)), this, + TQ_SLOT(slotSocketClosed(int))); /* set login details */ mwSession_setProperty(session, mwSession_AUTH_USER_ID, @@ -694,8 +694,8 @@ void MeanwhileSession::handleSessionIOClose() if (socket == 0L) return; - TQObject::disconnect(socket, TQT_SIGNAL(closed(int)), - this, TQT_SLOT(slotSocketClosed(int))); + TQObject::disconnect(socket, TQ_SIGNAL(closed(int)), + this, TQ_SLOT(slotSocketClosed(int))); socket->flush(); socket->closeNow(); diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index 70d43a14..4c352de2 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -493,8 +493,8 @@ void Dispatcher::dispatch(const P2P::Message& message) transfer->m_ackSessionIdentifier = message.header.identifier; transfer->m_ackUniqueIdentifier = message.header.ackSessionIdentifier; - TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(accepted(Kopete::Transfer*, const TQString&)), transfer, TQT_SLOT(slotTransferAccepted(Kopete::Transfer*, const TQString&))); - TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQT_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&))); + TQObject::connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(accepted(Kopete::Transfer*, const TQString&)), transfer, TQ_SLOT(slotTransferAccepted(Kopete::Transfer*, const TQString&))); + TQObject::connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQ_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&))); // Show the file transfer accept/decline dialog. Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString(), sessionId); @@ -542,7 +542,7 @@ void Dispatcher::dispatch(const P2P::Message& message) m_sessions.insert(sessionId.toUInt(), current); // Acknowledge the session request. current->acknowledge(message); - TQTimer::singleShot(0,current, TQT_SLOT(askIncommingInvitation()) ); + TQTimer::singleShot(0,current, TQ_SLOT(askIncommingInvitation()) ); #endif } } diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index 0da4a04c..ed5377f2 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -65,7 +65,7 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ if(sessionId!=m_sessionId) return; - TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); + TQObject::connect(transfer , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort())); m_transfer = transfer; TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); @@ -243,8 +243,8 @@ void IncomingTransfer::processMessage(const Message& message) m_listener = new TDEServerSocket("", ""); m_listener->setResolutionEnabled(true); // Create the callback that will try to accept incoming connections. - TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(slotAccept())); - TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int))); + TQObject::connect(m_listener, TQ_SIGNAL(readyAccept()), 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(1); kdDebug(14140) << k_funcinfo << (isListening ? "listening" : "not listening") << endl; @@ -349,11 +349,11 @@ void IncomingTransfer::slotAccept() m_socket->enableWrite(false); // Create the callback that will try to read bytes from the accepted socket. - TQObject::connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketRead())); + TQObject::connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketRead())); // Create the callback that will try to handle the socket close event. - TQObject::connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed())); + TQObject::connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed())); // Create the callback that will try to handle the socket error event. - TQObject::connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + TQObject::connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); } void IncomingTransfer::slotSocketRead() diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 444c2710..8ff345f6 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -73,16 +73,16 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch setMyself( new MSNContact( this, accountId(), Kopete::ContactList::self()->myself() ) ); //myself()->setOnlineStatus( MSNProtocol::protocol()->FLN ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), - TQT_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), - TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), + TQ_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRemoved( Kopete::Group * ) ), + TQ_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQ_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); - m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); - m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQ_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQ_SLOT( slotChangePublicName() ), this, "renameAction" ); + m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQ_SLOT( slotStartChat() ), this, "startChatAction" ); TDEConfigGroup *config=configGroup(); @@ -200,36 +200,36 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port ) m_notifySocket = new MSNNotifySocket( this, accountId() , m_password); m_notifySocket->setUseHttpMethod( useHttpMethod() ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupAdded( const TQString&, const TQString& ) ), - TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRenamed( const TQString&, const TQString& ) ), - TQT_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupListed( const TQString&, const TQString& ) ), - TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRemoved( const TQString& ) ), - TQT_SLOT( slotGroupRemoved( const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ), - TQT_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ), - TQT_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( startChat( const TQString&, const TQString& ) ), - TQT_SLOT( slotCreateChat( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( socketClosed() ), - TQT_SLOT( slotNotifySocketClosed() ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( newContactList() ), - TQT_SLOT( slotNewContactList() ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( receivedNotificationServer(const TQString&, uint ) ), - TQT_SLOT(createNotificationServer(const TQString&, uint ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( hotmailSeted( bool ) ), - m_openInboxAction, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), - TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupAdded( const TQString&, const TQString& ) ), + TQ_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupRenamed( const TQString&, const TQString& ) ), + TQ_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupListed( const TQString&, const TQString& ) ), + TQ_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupRemoved( const TQString& ) ), + TQ_SLOT( slotGroupRemoved( const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ), + TQ_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ), + TQ_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( startChat( const TQString&, const TQString& ) ), + TQ_SLOT( slotCreateChat( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( socketClosed() ), + TQ_SLOT( slotNotifySocketClosed() ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( newContactList() ), + TQ_SLOT( slotNewContactList() ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( receivedNotificationServer(const TQString&, uint ) ), + TQ_SLOT(createNotificationServer(const TQString&, uint ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( hotmailSeted( bool ) ), + m_openInboxAction, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( errorMessage(int, const TQString& ) ), + TQ_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); m_notifySocket->setStatus( m_connectstatus ); m_notifySocket->connect(host, port); @@ -269,7 +269,7 @@ TDEActionMenu * MSNAccount::actionMenu() #if !defined NDEBUG TDEActionMenu *debugMenu = new TDEActionMenu( "Debug", m_actionMenu ); debugMenu->insert( new TDEAction( i18n( "Send Raw C&ommand..." ), 0, - this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); + this, TQ_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert( debugMenu ); #endif @@ -1012,8 +1012,8 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( handle,nick,this, Kopete::UI::ContactAddedNotifyDialog::InfoButton ); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), - this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)), + this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } } diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 794c4562..2dd5c219 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -66,43 +66,43 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac setInstance(protocol->instance()); - connect( this, TQT_SIGNAL( messageSent( Kopete::Message&, + connect( this, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), - this, TQT_SLOT( slotMessageSent( Kopete::Message&, + this, TQ_SLOT( slotMessageSent( Kopete::Message&, Kopete::ChatSession* ) ) ); - connect( this, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) , - protocol, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) ); + connect( this, TQ_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) , + protocol, TQ_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) ); m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" ); - connect ( m_actionInvite->popupMenu() , TQT_SIGNAL( aboutToShow() ) , this , TQT_SLOT(slotActionInviteAboutToShow() ) ) ; + connect ( m_actionInvite->popupMenu() , TQ_SIGNAL( aboutToShow() ) , this , TQ_SLOT(slotActionInviteAboutToShow() ) ) ; #if !defined NDEBUG - new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; + new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQ_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; #endif - m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; + m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQ_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; #if MSN_WEBCAM // Invite to receive webcam action - m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; + m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQ_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; //Send webcam action - m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; + m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQ_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; #endif - new TDEAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); + new TDEAction( i18n( "Send File" ),"attach", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); MSNContact *c = static_cast( others.first() ); - (new TDEAction( i18n( "Request Display Picture" ), "image", 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); + (new TDEAction( i18n( "Request Display Picture" ), "image", 0, this, TQ_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); if ( !c->object().isEmpty() ) { - connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); + connect( c, TQ_SIGNAL( displayPictureChanged() ), this, TQ_SLOT( slotDisplayPictureChanged() ) ); m_image = new TQLabel( 0L, "kde toolbar widget" ); - new KWidgetAction( m_image, i18n( "MSN Display Picture" ), 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnDisplayPicture" ); + new KWidgetAction( m_image, i18n( "MSN Display Picture" ), 0, this, TQ_SLOT( slotRequestPicture() ), actionCollection(), "msnDisplayPicture" ); if(c->hasProperty(Kopete::Global::Properties::self()->photo().key()) ) { //if the view doesn't exist yet, we will be unable to get the size of the toolbar @@ -110,7 +110,7 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac //How to know when a our view is created? We can't. // but chances are the next created view will be for this KMM // And if it is not? never mind. the icon will just be sized 22x22 - connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); //it's viewActivated and not viewCreated because the view get his mainwindow only when it is shown. } } @@ -163,35 +163,35 @@ void MSNChatSession::createChat( const TQString &handle, m_chatService->setMsgHandle( handle ); m_chatService->connectToSwitchBoard( ID, address, auth ); - connect( m_chatService, TQT_SIGNAL( userJoined(const TQString&,const TQString&,bool)), - this, TQT_SLOT( slotUserJoined(const TQString&,const TQString&,bool) ) ); - connect( m_chatService, TQT_SIGNAL( userLeft(const TQString&,const TQString&)), - this, TQT_SLOT( slotUserLeft(const TQString&,const TQString&) ) ); - connect( m_chatService, TQT_SIGNAL( msgReceived( Kopete::Message & ) ), - this, TQT_SLOT( slotMessageReceived( Kopete::Message & ) ) ); - connect( m_chatService, TQT_SIGNAL( switchBoardClosed() ), - this, TQT_SLOT( slotSwitchBoardClosed() ) ); - connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), - this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); + connect( m_chatService, TQ_SIGNAL( userJoined(const TQString&,const TQString&,bool)), + this, TQ_SLOT( slotUserJoined(const TQString&,const TQString&,bool) ) ); + connect( m_chatService, TQ_SIGNAL( userLeft(const TQString&,const TQString&)), + this, TQ_SLOT( slotUserLeft(const TQString&,const TQString&) ) ); + connect( m_chatService, TQ_SIGNAL( msgReceived( Kopete::Message & ) ), + this, TQ_SLOT( slotMessageReceived( Kopete::Message & ) ) ); + connect( m_chatService, TQ_SIGNAL( switchBoardClosed() ), + this, TQ_SLOT( slotSwitchBoardClosed() ) ); + connect( m_chatService, TQ_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), + this, TQ_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); TDEConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if(config->readBoolEntry( "SendTypingNotification" , true) ) { - connect( this, TQT_SIGNAL( myselfTyping( bool ) ), - m_chatService, TQT_SLOT( sendTypingMsg( bool ) ) ); + connect( this, TQ_SIGNAL( myselfTyping( bool ) ), + m_chatService, TQ_SLOT( sendTypingMsg( bool ) ) ); } - connect( m_chatService, TQT_SIGNAL( msgAcknowledgement(unsigned int, bool) ), - this, TQT_SLOT( slotAcknowledgement(unsigned int, bool) ) ); - connect( m_chatService, TQT_SIGNAL( invitation( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotInvitation( const TQString&, const TQString& ) ) ); - connect( m_chatService, TQT_SIGNAL( nudgeReceived(const TQString&) ), - this, TQT_SLOT( slotNudgeReceived(const TQString&) ) ); - connect( m_chatService, TQT_SIGNAL( errorMessage(int, const TQString& ) ), static_cast(myself()->account()), TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); + connect( m_chatService, TQ_SIGNAL( msgAcknowledgement(unsigned int, bool) ), + this, TQ_SLOT( slotAcknowledgement(unsigned int, bool) ) ); + connect( m_chatService, TQ_SIGNAL( invitation( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotInvitation( const TQString&, const TQString& ) ) ); + connect( m_chatService, TQ_SIGNAL( nudgeReceived(const TQString&) ), + this, TQ_SLOT( slotNudgeReceived(const TQString&) ) ); + connect( m_chatService, TQ_SIGNAL( errorMessage(int, const TQString& ) ), static_cast(myself()->account()), TQ_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); if(!m_timeoutTimer) { m_timeoutTimer=new TQTimer(this); - connect( m_timeoutTimer , TQT_SIGNAL(timeout()), this , TQT_SLOT(slotConnectionTimeout() ) ); + connect( m_timeoutTimer , TQ_SIGNAL(timeout()), this , TQ_SLOT(slotConnectionTimeout() ) ); } m_timeoutTimer->start(20000,true); } @@ -319,12 +319,12 @@ void MSNChatSession::slotActionInviteAboutToShow() if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { TDEAction *a=new KopeteContactAction( it.current(), this, - TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); + TQ_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); m_actionInvite->insert( a ); m_inviteactions.append( a ) ; } } - TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); + TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQ_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); m_actionInvite->insert( b ); m_inviteactions.append( b ) ; } @@ -443,7 +443,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) if( msg.contains(MSNFileTransferSocket::applicationID()) ) { MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this); - connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); + connect(MFTS, TQ_SIGNAL( done(MSNInvitation*) ) , this , TQ_SLOT( invitationDone(MSNInvitation*) )); m_invitations.insert( cookie , MFTS); MFTS->parseInvitation(msg); setCanBeDeleted(false); @@ -499,7 +499,7 @@ void MSNChatSession::sendFile(const TQString &fileLocation, const TQString &/*fi void MSNChatSession::initInvitation(MSNInvitation* invitation) { - connect(invitation->object(), TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); + connect(invitation->object(), TQ_SIGNAL( done(MSNInvitation*) ) , this , TQ_SLOT( invitationDone(MSNInvitation*) )); m_invitations.insert( invitation->cookie() , invitation); if(m_chatService) @@ -552,7 +552,7 @@ void MSNChatSession::slotDisplayPictureChanged() if(w) { //We connected that in the constructor. we don't need to keep this slot active. - disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + disconnect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); TQPtrListIterator it=w->toolBarIterator() ; TDEAction *imgAction=actionCollection()->action("msnDisplayPicture"); @@ -563,8 +563,8 @@ void MSNChatSession::slotDisplayPictureChanged() { sz=tb->iconSize(); //ipdate if the size of the toolbar change. - disconnect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); - connect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); + disconnect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); + connect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); break; } ++it; @@ -693,7 +693,7 @@ void MSNChatSession::startChatSession() if(!m_timeoutTimer) { m_timeoutTimer=new TQTimer(this); - connect( m_timeoutTimer , TQT_SIGNAL(timeout()), this , TQT_SLOT(slotConnectionTimeout() ) ); + connect( m_timeoutTimer , TQ_SIGNAL(timeout()), this , TQ_SLOT(slotConnectionTimeout() ) ); } m_timeoutTimer->start(20000, true); } diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 6867cf6c..54230558 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -133,22 +133,22 @@ TQPtrList *MSNContact::customContextMenuActions() TQString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" ); if( !actionBlock ) { - actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ), + actionBlock = new TDEAction( label, "msn_blocked",0, this, TQ_SLOT( slotBlockUser() ), this, "actionBlock" ); //show profile - actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ), + actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQ_SLOT( slotShowProfile() ), this, "actionShowProfile" ); // Send mail (only available if it is an hotmail account) - actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ), + actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQ_SLOT( slotSendMail() ), this, "actionSendMail" ); // Invite to receive webcam - actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; + actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQ_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; //Send webcam action - actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; + actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQ_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; } else actionBlock->setText( label ); @@ -203,7 +203,7 @@ void MSNContact::slotUserInfo() info->m_phm->setText(m_phoneMobile); info->m_reversed->setChecked(m_reversed); - connect( info->m_reversed, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(slotUserInfoDialogReversedToggled())); + connect( info->m_reversed, TQ_SIGNAL(toggled(bool)) , this, TQ_SLOT(slotUserInfoDialogReversedToggled())); infoDialog->setMainWidget(info); infoDialog->setCaption(nick); @@ -680,7 +680,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) delete f; //let the time to TDEIO to copy the file - connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() )); + connect(j, TQ_SIGNAL(result(TDEIO::Job *)) , this, TQ_SLOT(slotEmitDisplayPictureChanged() )); } void MSNContact::slotEmitDisplayPictureChanged() 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" <setAddress(TQString::number(port)); kdDebug(14140) << "MSNFileTransferSocket::listen: about to listen"<listen(1); kdDebug(14140) << "MSNFileTransferSocket::listen: result: "<< listenResult <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 { diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index ad4e2b6d..c29e6d8c 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -64,8 +64,8 @@ MSNNotifySocket::MSNNotifySocket( MSNAccount *account, const TQString& /*msnId*/ m_account = account; m_password=password; - TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), - this, TQT_SLOT( slotReadMessage( const TQByteArray & ) ) ); + TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), + this, TQ_SLOT( slotReadMessage( const TQByteArray & ) ) ); m_keepaliveTimer = 0L; m_isLogged = false; } @@ -288,9 +288,9 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString { m_secureLoginHandler = new MSNSecureLoginHandler(m_account->accountId(), m_password, data.section( ' ' , 2 , 2 )); - TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginFailed()), this, TQT_SLOT(sslLoginFailed())); - TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginBadPassword()), this, TQT_SLOT(sslLoginIncorrect())); - TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginSuccesful(TQString )), this, TQT_SLOT(sslLoginSucceeded(TQString ))); + TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginFailed()), this, TQ_SLOT(sslLoginFailed())); + TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginBadPassword()), this, TQ_SLOT(sslLoginIncorrect())); + TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginSuccesful(TQString )), this, TQ_SLOT(sslLoginSucceeded(TQString ))); m_secureLoginHandler->login(); } @@ -724,7 +724,7 @@ bool MSNNotifySocket::setUseHttpMethod(bool useHttp) else { if( !m_keepaliveTimer ) { m_keepaliveTimer = new TQTimer( this, "m_keepaliveTimer" ); - TQObject::connect( m_keepaliveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSendKeepAlive() ) ); + TQObject::connect( m_keepaliveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSendKeepAlive() ) ); } } @@ -755,7 +755,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) // If there are new email message available, raise the unread email event. TQObject::connect(KNotification::event( "msn_mail", i18n( "You have one unread message in your MSN inbox.", "You have %n unread messages in your MSN inbox.", mailCount ), 0 , 0 , i18n( "Open Inbox..." ) ), - TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); } } else if(msg.contains("text/x-msmsgsactivemailnotification")) @@ -777,7 +777,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) //TODO: it is also possible to get the subject (but warning about the encoding) TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m), 0 , 0 , i18n( "Open Inbox..." ) ), - TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); } else if(msg.contains("text/x-msmsgsprofile")) { @@ -912,8 +912,8 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") ) { KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions); - TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int))); - TQObject::connect(notification, TQT_SIGNAL(closed()), this, TQT_SLOT(slotMSNAlertUnwanted())); + TQObject::connect(notification, TQ_SIGNAL(activated(unsigned int)), this, TQ_SLOT(slotMSNAlertLink(unsigned int))); + TQObject::connect(notification, TQ_SIGNAL(closed()), this, TQ_SLOT(slotMSNAlertUnwanted())); } } // end for each MSG tag } diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index 936b88fc..4bc58277 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -45,7 +45,7 @@ void MSNSecureLoginHandler::login() getLoginServer->addMetaData("cache", "reload"); getLoginServer->addMetaData("PropagateHttpHeader", "true"); - connect(getLoginServer, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(TDEIO::Job* ))); + connect(getLoginServer, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotLoginServerReceived(TDEIO::Job* ))); } void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob) @@ -86,7 +86,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob) authJob->addMetaData("cookies", "manual"); authJob->addMetaData("cache", "reload"); - connect(authJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotTweenerReceived(TDEIO::Job* ))); + connect(authJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotTweenerReceived(TDEIO::Job* ))); } else { diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 167c9974..e090bdaf 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -112,12 +112,12 @@ void MSNSocket::connect( const TQString &server, uint port ) // non-empty, so disable it until we have actual data in the queue m_socket->enableWrite( false ); - TQObject::connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotDataReceived() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( slotReadyWrite() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( slotHostFound() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotConnectionSuccess() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotSocketError( int ) ) ); - TQObject::connect( m_socket, TQT_SIGNAL( closed( ) ), this, TQT_SLOT( slotSocketClosed( ) ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotDataReceived() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( slotReadyWrite() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( slotHostFound() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotConnectionSuccess() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotSocketError( int ) ) ); + TQObject::connect( m_socket, TQ_SIGNAL( closed( ) ), this, TQ_SLOT( slotSocketClosed( ) ) ); if(m_useHttp) { @@ -125,7 +125,7 @@ void MSNSocket::connect( const TQString &server, uint port ) { m_timer = new TQTimer(this, "Http poll timer"); // Connect the slot HttpPoll with the timer timeout signal. - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHttpPoll())); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHttpPoll())); } } @@ -429,7 +429,7 @@ void MSNSocket::slotReadLine() if ( m_buffer.size() >= 3 && ( m_buffer.data()[ 0 ] == '\0' || m_buffer.data()[ 0 ]== '\1' ) ) { bytesReceived( m_buffer.take( 3 ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotReadLine() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReadLine() ) ); return; } @@ -451,7 +451,7 @@ void MSNSocket::slotReadLine() // Don't block the GUI while parsing data, only do a single line! // (Done before parseLine() to prevent a potential crash) - TQTimer::singleShot( 0, this, TQT_SLOT( slotReadLine() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReadLine() ) ); parseLine( command ); // WARNING: At this point 'this' can be deleted (when disconnecting) @@ -938,10 +938,10 @@ bool MSNSocket::accept( TDEServerSocket *server ) m_socket->enableRead( true ); m_socket->enableWrite( true ); - TQObject::connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotDataReceived() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( slotReadyWrite() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( closed() ), this, TQT_SLOT( slotSocketClosed() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotSocketError( int ) ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotDataReceived() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( slotReadyWrite() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotSocketClosed() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotSocketError( int ) ) ); doneConnect(); return true; diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index e74e728f..e60c01aa 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -96,14 +96,14 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T TQString server = address.left( address.find( ":" ) ); uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt(); - TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), - this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) ); + TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), + this, TQ_SLOT(slotReadMessage( const TQByteArray & ) ) ); - TQObject::connect( this, TQT_SIGNAL( onlineStatusChanged( MSNSocket::OnlineStatus ) ), - this, TQT_SLOT( slotOnlineStatusChanged( MSNSocket::OnlineStatus ) ) ); + TQObject::connect( this, TQ_SIGNAL( onlineStatusChanged( MSNSocket::OnlineStatus ) ), + this, TQ_SLOT( slotOnlineStatusChanged( MSNSocket::OnlineStatus ) ) ); - TQObject::connect( this, TQT_SIGNAL( socketClosed( ) ), - this, TQT_SLOT( slotSocketClosed( ) ) ); + TQObject::connect( this, TQ_SIGNAL( socketClosed( ) ), + this, TQ_SLOT( slotSocketClosed( ) ) ); connect( server, port ); } @@ -408,7 +408,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!m_emoticonTimer) //to be sure no message will be lost, we will appends message to { // the queue in 15 secondes even if we have not received emoticons m_emoticonTimer=new TQTimer(this); - TQObject::connect(m_emoticonTimer , TQT_SIGNAL(timeout()) , this, TQT_SLOT(cleanQueue())); + TQObject::connect(m_emoticonTimer , TQ_SIGNAL(timeout()) , this, TQ_SLOT(cleanQueue())); m_emoticonTimer->start( 15000 , true ); } } @@ -828,7 +828,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { m_keepAliveNb=20; m_keepAlive=new TQTimer(this); - TQObject::connect(m_keepAlive, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotKeepAliveTimer())); + TQObject::connect(m_keepAlive, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotKeepAliveTimer())); m_keepAlive->start(50*1000); } @@ -878,7 +878,7 @@ void MSNSwitchBoardSocket::slotOnlineStatusChanged( MSNSocket::OnlineStatus stat { m_keepAliveNb=20; m_keepAlive=new TQTimer(this); - TQObject::connect(m_keepAlive, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotKeepAliveTimer())); + TQObject::connect(m_keepAlive, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotKeepAliveTimer())); m_keepAlive->start(50*1000); } } @@ -1090,11 +1090,11 @@ Dispatcher* MSNSwitchBoardSocket::PeerDispatcher() } m_dispatcher = new Dispatcher(this, m_account->accountId(),ip ); -// TQObject::connect(this, TQT_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQT_SLOT(slotReadMessage(const TQByteArray&))); -// TQObject::connect(m_dispatcher, TQT_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQT_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool))); - TQObject::connect(m_dispatcher, TQT_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQT_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64))); - TQObject::connect(m_dispatcher, TQT_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQT_SLOT(slotEmoticonReceived( KTempFile *, const TQString&))); - TQObject::connect(this, TQT_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQT_SLOT(messageAcknowledged(unsigned int, bool))); +// TQObject::connect(this, TQ_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQ_SLOT(slotReadMessage(const TQByteArray&))); +// TQObject::connect(m_dispatcher, TQ_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQ_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool))); + TQObject::connect(m_dispatcher, TQ_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQ_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64))); + TQObject::connect(m_dispatcher, TQ_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQ_SLOT(slotEmoticonReceived( KTempFile *, const TQString&))); + TQObject::connect(this, TQ_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQ_SLOT(messageAcknowledged(unsigned int, bool))); m_dispatcher->m_pictureUrl = m_account->pictureUrl(); } return m_dispatcher; diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index 5d66c495..037cd093 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -246,7 +246,7 @@ void OutgoingTransfer::processMessage(const Message& message) m_transfer = Kopete::TransferManager::transferManager()->addTransfer(contact, m_file->name(), m_file->size(), m_recipient, Kopete::FileTransferInfo::Outgoing); - TQObject::connect(m_transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); + TQObject::connect(m_transfer , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort())); m_state = Negotiation; @@ -345,10 +345,10 @@ void OutgoingTransfer::connectToEndpoint(const TQString& hostName) // when we are ready to sent data. // NOTE readyWrite consumes too much cpu usage. m_socket->enableWrite(false); - TQObject::connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotRead())); - TQObject::connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry&)), this, TQT_SLOT(slotConnected())); - TQObject::connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); - TQObject::connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed())); + TQObject::connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotRead())); + TQObject::connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry&)), this, TQ_SLOT(slotConnected())); + TQObject::connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); + TQObject::connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed())); // Try to connect to the endpoint. m_socket->connect(); } @@ -363,7 +363,7 @@ void OutgoingTransfer::slotConnected() // Not all data was written, close the socket. m_socket->closeNow(); // Schedule the data to be sent through the existing session. - TQTimer::singleShot(2000, this, TQT_SLOT(slotSendData())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotSendData())); return; } @@ -418,7 +418,7 @@ void OutgoingTransfer::slotSocketError(int) { // Otherwise, send the data through the session. m_identifier -= 1; - TQTimer::singleShot(2000, this, TQT_SLOT(slotSendData())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotSendData())); } } diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 57b1f356..4f22ea8a 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -72,7 +72,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans if (bridge != 0l) { - TQObject::connect(bridge, TQT_SIGNAL(readyRead(const TQByteArray&)), TQT_SLOT(slotOnReceive(const TQByteArray&))); + TQObject::connect(bridge, TQ_SIGNAL(readyRead(const TQByteArray&)), TQ_SLOT(slotOnReceive(const TQByteArray&))); } return 0l; @@ -81,7 +81,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans void Transport::setDefaultBridge(MSNSwitchBoardSocket* mss) { mDefaultBridge = mss; - TQObject::connect((MSNSwitchBoardSocket*)mDefaultBridge, TQT_SIGNAL(messageReceived(const TQString&, const TQByteArray&)), TQT_SLOT(slotOnReceive(const TQString&, const TQByteArray&))); + TQObject::connect((MSNSwitchBoardSocket*)mDefaultBridge, TQ_SIGNAL(messageReceived(const TQString&, const TQByteArray&)), TQ_SLOT(slotOnReceive(const TQString&, const TQByteArray&))); } //END @@ -171,8 +171,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M { mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this); mSocket->setBlocking(false); - TQObject::connect(mSocket, TQT_SIGNAL(connected(const KResolverEntry&)), TQT_SLOT(slotOnSocketConnect())); - TQObject::connect(mSocket, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotOnError(int))); + TQObject::connect(mSocket, TQ_SIGNAL(connected(const KResolverEntry&)), TQ_SLOT(slotOnSocketConnect())); + TQObject::connect(mSocket, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotOnError(int))); mConnected = false; } @@ -199,7 +199,7 @@ void TcpTransportBridge::slotOnConnect() KStreamSocket *socket = static_cast(mSocket); socket->setTimeout(5000); - TQObject::connect(socket, TQT_SIGNAL(timeOut()), TQT_SLOT(slotOnSocketConnectTimeout())); + TQObject::connect(socket, TQ_SIGNAL(timeOut()), TQ_SLOT(slotOnSocketConnectTimeout())); mSocket->connect(); } @@ -239,8 +239,8 @@ void TcpTransportBridge::slotOnSocketConnect() << mSocket->localAddress().toString() << endl; mConnected = true; - TQObject::connect(mSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotOnSocketReceive())); - TQObject::connect(mSocket, TQT_SIGNAL(closed()), TQT_SLOT(slotOnSocketClose())); + TQObject::connect(mSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotOnSocketReceive())); + TQObject::connect(mSocket, TQ_SIGNAL(closed()), TQ_SLOT(slotOnSocketClose())); mVerified = true; TQString foo = "foo\0"; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 37cc1dd8..600f0f15 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -174,11 +174,11 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui->m_phones->setDisabled( true ); } - connect( d->ui->m_allowButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAllow() ) ); - connect( d->ui->m_blockButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBlock() ) ); - connect( d->ui->m_selectImage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectImage() ) ); - connect( d->ui->m_RLButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowReverseList() ) ); - connect( d->ui->buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister())); + connect( d->ui->m_allowButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAllow() ) ); + connect( d->ui->m_blockButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBlock() ) ); + connect( d->ui->m_selectImage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectImage() ) ); + connect( d->ui->m_RLButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowReverseList() ) ); + connect( d->ui->buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister())); TQWidget::setTabOrder( d->ui->m_login, d->ui->m_password->mRemembered ); TQWidget::setTabOrder( d->ui->m_password->mRemembered, d->ui->m_password->mPassword ); TQWidget::setTabOrder( d->ui->m_password->mPassword, d->ui->m_autologin ); 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; diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index d7a49e09..311f12a3 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -36,12 +36,12 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co setEscapeButton( KDialogBase::Close ); /* - TQObject::connect( contact, TQT_SIGNAL( signalReceivedWebcamImage( const TQPixmap& ) ), - this, TQT_SLOT( newImage( const TQPixmap& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( signalReceivedWebcamImage( const TQPixmap& ) ), + this, TQ_SLOT( newImage( const TQPixmap& ) ) ); */ - TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) ); + TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) ); /* - TQObject::connect( contact, TQT_SIGNAL( webcamClosed( int ) ), this, TQT_SLOT( webcamClosed( int ) ) ); + TQObject::connect( contact, TQ_SIGNAL( webcamClosed( int ) ), this, TQ_SLOT( webcamClosed( int ) ) ); */ TQFrame* page = plainPage(); if ( page ) diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 82b9a29c..4a34b369 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -95,8 +95,8 @@ Kopete::ChatSession* AIMMyselfContact::manager( Kopete::Contact::CanCreateFlags session = new AIMChatSession( this, chatMembers, account()->protocol(), exchange, room ); session->setEngine( m_acct->engine() ); - connect( session, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), - this, TQT_SLOT( sendMessage( Kopete::Message&, Kopete::ChatSession* ) ) ); + connect( session, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), + this, TQ_SLOT( sendMessage( Kopete::Message&, Kopete::ChatSession* ) ) ); m_chatRoomSessions.append( session ); } return session; @@ -214,20 +214,20 @@ AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char m_joinChatDialog = 0; m_visibilityDialog = 0; TQObject::connect( Kopete::ContactList::self(), - TQT_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), + TQ_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), this, - TQT_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); + TQ_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); - TQObject::connect( engine(), TQT_SIGNAL( chatRoomConnected( WORD, const TQString& ) ), - this, TQT_SLOT( connectedToChatRoom( WORD, const TQString& ) ) ); + TQObject::connect( engine(), TQ_SIGNAL( chatRoomConnected( WORD, const TQString& ) ), + this, TQ_SLOT( connectedToChatRoom( WORD, const TQString& ) ) ); - TQObject::connect( engine(), TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SLOT( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + TQObject::connect( engine(), TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SLOT( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - TQObject::connect( engine(), TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SLOT( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + TQObject::connect( engine(), TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SLOT( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - TQObject::connect( this, TQT_SIGNAL( buddyIconChanged() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( this, TQ_SIGNAL( buddyIconChanged() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); } @@ -309,30 +309,30 @@ TDEActionMenu* AIMAccount::actionMenu() i18n( "%2 <%1>" ).arg( accountId(), accountNick )); mActionMenu->insert( new TDEAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, - TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); + TQ_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); TDEAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, - TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); + TQ_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); mActionAway->setEnabled( isConnected() ); mActionMenu->insert( mActionAway ); TDEAction* mActionOffline = new TDEAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, - TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); + TQ_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); mActionMenu->insert( mActionOffline ); mActionMenu->popupMenu()->insertSeparator(); TDEAction* m_joinChatAction = new TDEAction( i18n( "Join Chat..." ), TQString(), 0, this, - TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); + TQ_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); mActionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, - this, TQT_SLOT( slotSetVisiblility() ), this, + this, TQ_SLOT( slotSetVisiblility() ), this, "AIMAccount::mActionSetVisibility") ); mActionMenu->insert( m_joinChatAction ); TDEAction* m_editInfoAction = new TDEAction( i18n( "Edit User Info..." ), "identity", 0, - this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); + this, TQ_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); mActionMenu->insert( m_editInfoAction ); @@ -415,10 +415,10 @@ void AIMAccount::slotGlobalIdentityChanged( const TQString& key, const TQVariant void AIMAccount::slotBuddyIconChanged() { // need to disconnect because we could end up with many connections - TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); if ( !engine()->isActive() ) { - TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); return; } @@ -520,8 +520,8 @@ void AIMAccount::slotJoinChat() if ( !m_joinChatDialog ) { m_joinChatDialog = new AIMJoinChatUI( this, false, Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_joinChatDialog, TQT_SIGNAL( closing( int ) ), - this, TQT_SLOT( joinChatDialogClosed( int ) ) ); + TQObject::connect( m_joinChatDialog, TQ_SIGNAL( closing( int ) ), + this, TQ_SLOT( joinChatDialogClosed( int ) ) ); TQValueList list = engine()->chatExchangeList(); m_joinChatDialog->setExchangeList( list ); m_joinChatDialog->show(); @@ -794,8 +794,8 @@ void AIMAccount::slotSetVisiblility() if ( !m_visibilityDialog ) { m_visibilityDialog = new OscarVisibilityDialog( engine(), Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_visibilityDialog, TQT_SIGNAL( closing() ), - this, TQT_SLOT( slotVisibilityDialogClosed() ) ); + TQObject::connect( m_visibilityDialog, TQ_SIGNAL( closing() ), + this, TQ_SLOT( slotVisibilityDialogClosed() ) ); //add all contacts; OscarVisibilityDialog::ContactMap contactMap; diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 12eb4bd2..0d42c8ce 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -58,21 +58,21 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: // Set the last autoresponse time to the current time yesterday m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), - this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOffline( const TQString& ) ), - this, TQT_SLOT( userOffline( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), - this, TQT_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), - this, TQT_SLOT( updateProfile( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), - this, TQT_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), - this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ), - this, TQT_SLOT( requestBuddyIcon() ) ); - TQObject::connect( this, TQT_SIGNAL( featuresUpdated() ), this, TQT_SLOT( updateFeatures() ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), + this, TQ_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOffline( const TQString& ) ), + this, TQ_SLOT( userOffline( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), + this, TQ_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), + this, TQ_SLOT( updateProfile( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQ_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), + this, TQ_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( iconServerConnected() ), + this, TQ_SLOT( requestBuddyIcon() ) ); + TQObject::connect( this, TQ_SIGNAL( featuresUpdated() ), this, TQ_SLOT( updateFeatures() ) ); } AIMContact::~AIMContact() @@ -90,12 +90,12 @@ TQPtrList *AIMContact::customContextMenuActions() TQPtrList *actionCollection = new TQPtrList(); if ( !m_warnUserAction ) { - m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); + m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQ_SLOT( warnUser() ), this, "warnAction" ); } m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, - this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); + this, TQ_SLOT(slotVisibleTo()), this, "actionVisibleTo"); m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, - this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); + this, TQ_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); @@ -162,7 +162,7 @@ void AIMContact::slotUserInfo() m_infoDialog = new AIMUserInfoDialog( this, static_cast( account() ), false, Kopete::UI::Global::mainWidget(), 0 ); if( !m_infoDialog ) return; - connect( m_infoDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfoDialog() ) ); + connect( m_infoDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfoDialog() ) ); m_infoDialog->show(); if ( mAccount->isConnected() ) { @@ -240,7 +240,7 @@ void AIMContact::userInfoUpdated( const TQString& contact, const UserDetails& de int time = ( TDEApplication::random() % 10 ) * 1000; kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in " << time/1000 << " seconds" << endl; - TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) ); + TQTimer::singleShot( time, this, TQ_SLOT( requestBuddyIcon() ) ); } OscarContact::userInfoUpdated( contact, details ); diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 667a926d..36a79613 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -41,8 +41,8 @@ AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account, bool modal, setMainWidget( m_joinUI ); - TQObject::connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( joinChat() ) ); - TQObject::connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( closeClicked() ) ); + TQObject::connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( joinChat() ) ); + TQObject::connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( closeClicked() ) ); } AIMJoinChatUI::~AIMJoinChatUI() diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 46d6db03..561eef41 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -50,10 +50,10 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool mMainWidget = new AIMUserInfoWidget(this, "aimuserinfowidget"); setMainWidget(mMainWidget); - TQObject::connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSaveClicked())); - TQObject::connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUpdateClicked())); - TQObject::connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCloseClicked())); - TQObject::connect(c, TQT_SIGNAL(updatedProfile()), this, TQT_SLOT(slotUpdateProfile())); + TQObject::connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSaveClicked())); + TQObject::connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUpdateClicked())); + TQObject::connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCloseClicked())); + TQObject::connect(c, TQ_SIGNAL(updatedProfile()), this, TQ_SLOT(slotUpdateProfile())); mMainWidget->txtScreenName->setText( c->contactId() ); @@ -100,11 +100,11 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool userInfoView->setTextFormat(AutoText); userInfoView->setNotifyClick(true); TQObject::connect( - userInfoView, TQT_SIGNAL(urlClick(const TQString&)), - this, TQT_SLOT(slotUrlClicked(const TQString&))); + userInfoView, TQ_SIGNAL(urlClick(const TQString&)), + this, TQ_SLOT(slotUrlClicked(const TQString&))); TQObject::connect( - userInfoView, TQT_SIGNAL(mailClick(const TQString&, const TQString&)), - this, TQT_SLOT(slotMailClicked(const TQString&, const TQString&))); + userInfoView, TQ_SIGNAL(mailClick(const TQString&, const TQString&)), + this, TQ_SLOT(slotMailClicked(const TQString&, const TQString&))); showButton(Cancel, false); setButtonText(Ok, i18n("&Close")); setEscapeButton(Ok); @@ -115,7 +115,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool // Update the user view to indicate that we're requesting the user's profile userInfoView->setText(i18n("Requesting User Profile, please wait...")); } - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateProfile())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateProfile())); } } diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 8ea32a3b..7a8a499e 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -80,7 +80,7 @@ AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol, // Global Identity mGui->mGlobalIdentity->setChecked( account->configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) ); } - TQObject::connect( mGui->buttonRegister, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenRegister() ) ); + TQObject::connect( mGui->buttonRegister, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenRegister() ) ); /* Set tab order to password custom widget correctly */ TQWidget::setTabOrder( mGui->edtAccountId, mGui->mPasswordWidget->mRemembered ); diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index f5c6b9ea..01892598 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -43,9 +43,9 @@ ICQMyselfContact::ICQMyselfContact( ICQAccount *acct ) : OscarMyselfContact( acct ) { - TQObject::connect( acct->engine(), TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( fetchShortInfo() ) ); - TQObject::connect( acct->engine(), TQT_SIGNAL( receivedIcqShortInfo( const TQString& ) ), - this, TQT_SLOT( receivedShortInfo( const TQString& ) ) ); + TQObject::connect( acct->engine(), TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( fetchShortInfo() ) ); + TQObject::connect( acct->engine(), TQ_SIGNAL( receivedIcqShortInfo( const TQString& ) ), + this, TQ_SLOT( receivedShortInfo( const TQString& ) ) ); } void ICQMyselfContact::userInfoUpdated() @@ -88,10 +88,10 @@ ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char mHideIP = configGroup()->readBoolEntry( "HideIP", true ); mInitialStatusMessage = TQString(); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), - this, TQT_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), + this, TQ_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); - TQObject::connect( this, TQT_SIGNAL( buddyIconChanged() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( this, TQ_SIGNAL( buddyIconChanged() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); //setIgnoreUnknownContacts(pluginData(protocol(), "IgnoreUnknownContacts").toUInt() == 1); @@ -129,15 +129,15 @@ TDEActionMenu* ICQAccount::actionMenu() TDEToggleAction* actionInvisible = new TDEToggleAction( i18n( "In&visible" ), ICQ::Presence( presence().type(), ICQ::Presence::Invisible ).toOnlineStatus().iconFor( this ), - 0, this, TQT_SLOT( slotToggleInvisible() ), this ); + 0, this, TQ_SLOT( slotToggleInvisible() ), this ); actionInvisible->setChecked( presence().visibility() == ICQ::Presence::Invisible ); actionMenu->insert( actionInvisible ); actionMenu->popupMenu()->insertSeparator(); actionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, - this, TQT_SLOT( slotSetVisiblility() ), this, + this, TQ_SLOT( slotSetVisiblility() ), this, "ICQAccount::mActionSetVisibility") ); - //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); + //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQ_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); return actionMenu; } @@ -231,8 +231,8 @@ void ICQAccount::slotSetVisiblility() if ( !m_visibilityDialog ) { m_visibilityDialog = new OscarVisibilityDialog( engine(), Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_visibilityDialog, TQT_SIGNAL( closing() ), - this, TQT_SLOT( slotVisibilityDialogClosed() ) ); + TQObject::connect( m_visibilityDialog, TQ_SIGNAL( closing() ), + this, TQ_SLOT( slotVisibilityDialogClosed() ) ); //add all contacts; OscarVisibilityDialog::ContactMap contactMap; @@ -417,10 +417,10 @@ void ICQAccount::slotGlobalIdentityChanged( const TQString& key, const TQVariant void ICQAccount::slotBuddyIconChanged() { // need to disconnect because we could end up with many connections - TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); if ( !engine()->isActive() ) { - TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); return; } diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 01c0e43d..2758d2c4 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -66,28 +66,28 @@ ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaC else setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loggedIn() ) ); - //TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( userOnline( const TQString&, UserDetails ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOffline( const TQString& ) ), this, TQT_SLOT( userOffline( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotGotAuthRequest( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ), - this, TQT_SLOT( slotGotAuthReply(const TQString&, const TQString&, bool ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedIcqShortInfo( const TQString& ) ), - this, TQT_SLOT( receivedShortInfo( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedIcqLongInfo( const TQString& ) ), - this, TQT_SLOT( receivedLongInfo( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), - this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), - this, TQT_SLOT( receivedStatusMessage( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const Oscar::Message& ) ), - this, TQT_SLOT( receivedStatusMessage( const Oscar::Message& ) ) ); - TQObject::connect( this, TQT_SIGNAL( featuresUpdated() ), this, TQT_SLOT( updateFeatures() ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ), - this, TQT_SLOT( requestBuddyIcon() ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), - this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( loggedIn() ) ); + //TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOnline( const TQString& ) ), this, TQ_SLOT( userOnline( const TQString&, UserDetails ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOffline( const TQString& ) ), this, TQ_SLOT( userOffline( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotGotAuthRequest( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ), + this, TQ_SLOT( slotGotAuthReply(const TQString&, const TQString&, bool ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedIcqShortInfo( const TQString& ) ), + this, TQ_SLOT( receivedShortInfo( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedIcqLongInfo( const TQString& ) ), + this, TQ_SLOT( receivedLongInfo( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), + this, TQ_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), + this, TQ_SLOT( receivedStatusMessage( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const Oscar::Message& ) ), + this, TQ_SLOT( receivedStatusMessage( const Oscar::Message& ) ) ); + TQObject::connect( this, TQ_SIGNAL( featuresUpdated() ), this, TQ_SLOT( updateFeatures() ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( iconServerConnected() ), + this, TQ_SLOT( requestBuddyIcon() ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), + this, TQ_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); } @@ -193,7 +193,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de int time = ( TDEApplication::random() % 10 ) * 1000; kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in " << time/1000 << " seconds" << endl; - TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) ); + TQTimer::singleShot( time, this, TQ_SLOT( requestBuddyIcon() ) ); } } } @@ -237,7 +237,7 @@ void ICQContact::loggedIn() m_requestingNickname = true; int time = ( TDEApplication::random() % 20 ) * 1000; kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating nickname in " << time/1000 << " seconds" << endl; - TQTimer::singleShot( time, this, TQT_SLOT( requestShortInfo() ) ); + TQTimer::singleShot( time, this, TQ_SLOT( requestShortInfo() ) ); } } @@ -298,7 +298,7 @@ void ICQContact::slotGotAuthRequest( const TQString& contact, const TQString& re ICQAuthReplyDialog *replyDialog = new ICQAuthReplyDialog(); - connect( replyDialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotAuthReplyDialogOkClicked() ) ); + connect( replyDialog, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotAuthReplyDialogOkClicked() ) ); replyDialog->setUser( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ); replyDialog->setRequestReason( reason ); replyDialog->setModal( TRUE ); @@ -685,12 +685,12 @@ TQPtrList *ICQContact::customContextMenuActions() if(actionReadAwayMessage==0) { actionReadAwayMessage = new TDEAction(awTxt, awIcn, 0, - this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); + this, TQ_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); */ actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail-reply-sender", 0, - this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth"); + this, TQ_SLOT(slotRequestAuth()), this, "actionRequestAuth"); actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail-forward", 0, - this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth"); + this, TQ_SLOT(slotSendAuth()), this, "actionSendAuth"); /* } else @@ -701,11 +701,11 @@ TQPtrList *ICQContact::customContextMenuActions() */ m_actionIgnore = new TDEToggleAction(i18n("&Ignore"), "", 0, - this, TQT_SLOT(slotIgnore()), this, "actionIgnore"); + this, TQ_SLOT(slotIgnore()), this, "actionIgnore"); m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, - this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); + this, TQ_SLOT(slotVisibleTo()), this, "actionVisibleTo"); m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, - this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); + this, TQ_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); if ( m_ssiItem.waitingAuth() ) @@ -717,7 +717,7 @@ TQPtrList *ICQContact::customContextMenuActions() m_selectEncoding = new TDEAction( i18n( "Select Encoding..." ), "charset", 0, - this, TQT_SLOT( changeContactEncoding() ), this, "changeEncoding" ); + this, TQ_SLOT( changeContactEncoding() ), this, "changeEncoding" ); /* actionReadAwayMessage->setEnabled(status != OSCAR_OFFLINE && status != OSCAR_ONLINE); @@ -748,7 +748,7 @@ TQPtrList *ICQContact::customContextMenuActions() void ICQContact::slotUserInfo() { m_infoWidget = new ICQUserInfoWidget( Kopete::UI::Global::mainWidget(), "icq info" ); - TQObject::connect( m_infoWidget, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfoDialog() ) ); + TQObject::connect( m_infoWidget, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfoDialog() ) ); m_infoWidget->setContact( this ); m_infoWidget->show(); if ( account()->isConnected() ) @@ -768,8 +768,8 @@ void ICQContact::changeContactEncoding() return; m_oesd = new OscarEncodingSelectionDialog( Kopete::UI::Global::mainWidget(), property(mProtocol->contactEncoding).value().toInt() ); - connect( m_oesd, TQT_SIGNAL( closing( int ) ), - this, TQT_SLOT( changeEncodingDialogClosed( int ) ) ); + connect( m_oesd, TQ_SIGNAL( closing( int ) ), + this, TQ_SLOT( changeEncodingDialogClosed( int ) ) ); m_oesd->show(); } @@ -827,7 +827,7 @@ void ICQContact::slotReadAwayMessage() awayMessageDialog = new ICQReadAway(this, 0L, "awayMessageDialog"); if(!awayMessageDialog) return; - TQObject::connect(awayMessageDialog, TQT_SIGNAL(closing()), this, TQT_SLOT(slotCloseAwayMessageDialog())); + TQObject::connect(awayMessageDialog, TQ_SIGNAL(closing()), this, TQ_SLOT(slotCloseAwayMessageDialog())); awayMessageDialog->show(); } else diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index 8686c8d8..361e13d2 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -47,19 +47,19 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) awayMessageBrowser->setText(mContact->awayMessage()); TQObject::connect( - awayMessageBrowser, TQT_SIGNAL(urlClick(const TQString&)), - this, TQT_SLOT(slotUrlClicked(const TQString&))); + awayMessageBrowser, TQ_SIGNAL(urlClick(const TQString&)), + this, TQ_SLOT(slotUrlClicked(const TQString&))); TQObject::connect( - awayMessageBrowser, TQT_SIGNAL(mailClick(const TQString&, const TQString&)), - this, TQT_SLOT(slotMailClicked(const TQString&, const TQString&))); + awayMessageBrowser, TQ_SIGNAL(mailClick(const TQString&, const TQString&)), + this, TQ_SLOT(slotMailClicked(const TQString&, const TQString&))); - connect(this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(slotFetchAwayMessage())); - connect(this, TQT_SIGNAL(closeClicked()), - this, TQT_SLOT(slotCloseClicked())); + connect(this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(slotFetchAwayMessage())); + connect(this, TQ_SIGNAL(closeClicked()), + this, TQ_SLOT(slotCloseClicked())); - connect(c, TQT_SIGNAL(awayMessageChanged()), - this, TQT_SLOT(slotAwayMessageChanged())); + connect(c, TQ_SIGNAL(awayMessageChanged()), + this, TQ_SLOT(slotAwayMessageChanged())); slotFetchAwayMessage(); } diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 687de1b2..022b99a5 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -48,7 +48,7 @@ ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *parent, const (new TQVBoxLayout(this))->setAutoAdd(true); addUI = new icqAddUI(this); - connect( addUI->searchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showSearchDialog() ) ); + connect( addUI->searchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showSearchDialog() ) ); } ICQAddContactPage::~ICQAddContactPage() @@ -109,7 +109,7 @@ void ICQAddContactPage::showSearchDialog() { m_searchDialog = new ICQSearchDialog( mAccount, this, "icqSearchDialog" ); m_searchDialog->show(); - connect( m_searchDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( searchDialogDestroyed() ) ); + connect( m_searchDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( searchDialogDestroyed() ) ); } } diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index e3b40b3b..17865d36 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -99,7 +99,7 @@ ICQEditAccountWidget::ICQEditAccountWidget(ICQProtocol *protocol, 4 ); } - TQObject::connect(mAccountSettings->buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister())); + TQObject::connect(mAccountSettings->buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister())); /* Set tab order to password custom widget correctly */ TQWidget::setTabOrder( mAccountSettings->edtAccountId, mAccountSettings->mPasswordWidget->mRemembered ); diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index 9a212447..ec1e7e55 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -47,14 +47,14 @@ ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* parent, const c m_account = account; m_searchUI = new ICQSearchBase( this, name ); setMainWidget( m_searchUI ); - connect( m_searchUI->searchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startSearch() ) ); - connect( m_searchUI->searchResults, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( resultSelectionChanged() ) ); - connect( m_searchUI->addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addContact() ) ); - connect( m_searchUI->clearButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clearResults() ) ); - connect( m_searchUI->stopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSearch() ) ); - connect( m_searchUI->closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeDialog() ) ); - connect( m_searchUI->userInfoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( userInfo() ) ); - connect( m_searchUI->newSearchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newSearch() ) ); + connect( m_searchUI->searchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startSearch() ) ); + connect( m_searchUI->searchResults, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( resultSelectionChanged() ) ); + connect( m_searchUI->addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addContact() ) ); + connect( m_searchUI->clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clearResults() ) ); + connect( m_searchUI->stopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSearch() ) ); + connect( m_searchUI->closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeDialog() ) ); + connect( m_searchUI->userInfoButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( userInfo() ) ); + connect( m_searchUI->newSearchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newSearch() ) ); ICQProtocol *p = ICQProtocol::protocol(); p->fillComboFromTable( m_searchUI->gender, p->genders() ); @@ -91,10 +91,10 @@ void ICQSearchDialog::startSearch() m_searchUI->searchButton->setEnabled( false ); m_searchUI->newSearchButton->setEnabled( false ); - connect( m_account->engine(), TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), - this, TQT_SLOT( newResult( const ICQSearchResult& ) ) ); - connect( m_account->engine(), TQT_SIGNAL( endOfSearch( int ) ), - this, TQT_SLOT( searchFinished( int ) ) ); + connect( m_account->engine(), TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), + this, TQ_SLOT( newResult( const ICQSearchResult& ) ) ); + connect( m_account->engine(), TQ_SIGNAL( endOfSearch( int ) ), + this, TQ_SLOT( searchFinished( int ) ) ); const TQWidget* currentPage = m_searchUI->tabWidget3->currentPage(); @@ -159,10 +159,10 @@ void ICQSearchDialog::startSearch() void ICQSearchDialog::stopSearch() { - disconnect( m_account->engine(), TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), - this, TQT_SLOT( newResult( const ICQSearchResult& ) ) ); - disconnect( m_account->engine(), TQT_SIGNAL( endOfSearch( int ) ), - this, TQT_SLOT( searchFinished( int ) ) ); + disconnect( m_account->engine(), TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), + this, TQ_SLOT( newResult( const ICQSearchResult& ) ) ); + disconnect( m_account->engine(), TQ_SIGNAL( endOfSearch( int ) ), + this, TQ_SLOT( searchFinished( int ) ) ); m_searchUI->stopButton->setEnabled( false ); m_searchUI->searchButton->setEnabled( true ); @@ -203,7 +203,7 @@ void ICQSearchDialog::userInfo() NULL); m_infoWidget = new ICQUserInfoWidget( Kopete::UI::Global::mainWidget(), "icq info" ); - TQObject::connect( m_infoWidget, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfo() ) ); + TQObject::connect( m_infoWidget, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfo() ) ); m_infoWidget->setContact( m_contact ); m_infoWidget->setModal(true); diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 4126a3ec..aa793b62 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -78,16 +78,16 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) void ICQUserInfoWidget::setContact( ICQContact* contact ) { m_contact = contact; - TQObject::connect( contact, TQT_SIGNAL( haveBasicInfo( const ICQGeneralUserInfo& ) ), - this, TQT_SLOT( fillBasicInfo( const ICQGeneralUserInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveWorkInfo( const ICQWorkUserInfo& ) ), - this, TQT_SLOT( fillWorkInfo( const ICQWorkUserInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveEmailInfo( const ICQEmailInfo& ) ), - this, TQT_SLOT( fillEmailInfo( const ICQEmailInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveMoreInfo( const ICQMoreUserInfo& ) ), - this, TQT_SLOT( fillMoreInfo( const ICQMoreUserInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveInterestInfo( const ICQInterestInfo& ) ), - this, TQT_SLOT( fillInterestInfo( const ICQInterestInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveBasicInfo( const ICQGeneralUserInfo& ) ), + this, TQ_SLOT( fillBasicInfo( const ICQGeneralUserInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveWorkInfo( const ICQWorkUserInfo& ) ), + this, TQ_SLOT( fillWorkInfo( const ICQWorkUserInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveEmailInfo( const ICQEmailInfo& ) ), + this, TQ_SLOT( fillEmailInfo( const ICQEmailInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveMoreInfo( const ICQMoreUserInfo& ) ), + this, TQ_SLOT( fillMoreInfo( const ICQMoreUserInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveInterestInfo( const ICQInterestInfo& ) ), + this, TQ_SLOT( fillInterestInfo( const ICQInterestInfo& ) ) ); } void ICQUserInfoWidget::fillBasicInfo( const ICQGeneralUserInfo& ui ) 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& ) ), - this, TQT_SLOT( setChatExchangeList( const TQValueList& ) ) ); + TQObject::connect( cnst, TQ_SIGNAL( haveChatExchanges( const TQValueList& ) ), + this, TQ_SLOT( setChatExchangeList( const TQValueList& ) ) ); 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; } diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 6bb0edb9..683d92b2 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -113,19 +113,19 @@ OscarAccount::OscarAccount(Kopete::Protocol *parent, const TQString &accountID, d->engine->setCodecProvider( d ); d->olnscDialog = 0L; - TQObject::connect( d->engine, TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loginActions() ) ); - TQObject::connect( d->engine, TQT_SIGNAL( messageReceived( const Oscar::Message& ) ), - this, TQT_SLOT( messageReceived(const Oscar::Message& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( socketError( int, const TQString& ) ), - this, TQT_SLOT( slotSocketError( int, const TQString& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( taskError( const Oscar::SNAC&, int, bool ) ), - this, TQT_SLOT( slotTaskError( const Oscar::SNAC&, int, bool ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( userStartedTyping( const TQString& ) ), - this, TQT_SLOT( userStartedTyping( const TQString& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( userStoppedTyping( const TQString& ) ), - this, TQT_SLOT( userStoppedTyping( const TQString& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( iconNeedsUploading() ), - this, TQT_SLOT( slotSendBuddyIcon() ) ); + TQObject::connect( d->engine, TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( loginActions() ) ); + TQObject::connect( d->engine, TQ_SIGNAL( messageReceived( const Oscar::Message& ) ), + this, TQ_SLOT( messageReceived(const Oscar::Message& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( socketError( int, const TQString& ) ), + this, TQ_SLOT( slotSocketError( int, const TQString& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( taskError( const Oscar::SNAC&, int, bool ) ), + this, TQ_SLOT( slotTaskError( const Oscar::SNAC&, int, bool ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( userStartedTyping( const TQString& ) ), + this, TQ_SLOT( userStartedTyping( const TQString& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( userStoppedTyping( const TQString& ) ), + this, TQ_SLOT( userStoppedTyping( const TQString& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( iconNeedsUploading() ), + this, TQ_SLOT( slotSendBuddyIcon() ) ); } OscarAccount::~OscarAccount() @@ -144,18 +144,18 @@ void OscarAccount::logOff( Kopete::Account::DisconnectReason reason ) kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "accountId='" << accountId() << "'" << endl; //disconnect the signals Kopete::ContactList* kcl = Kopete::ContactList::self(); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRemoved( Kopete::Group* ) ), - this, TQT_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( contactAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( groupAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( groupUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( contactUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRemoved( Kopete::Group* ) ), + this, TQ_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( contactAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( groupAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( groupUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( contactUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); d->engine->close(); myself()->setOnlineStatus( Kopete::OnlineStatus::Offline ); @@ -198,10 +198,10 @@ void OscarAccount::processSSIList() { //disconnect signals so we don't attempt to add things to SSI! Kopete::ContactList* kcl = Kopete::ContactList::self(); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRemoved( Kopete::Group* ) ), - this, TQT_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRemoved( Kopete::Group* ) ), + this, TQ_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; @@ -248,18 +248,18 @@ void OscarAccount::processSSIList() addContact( ( *bit ).name(), TQString(), group, Kopete::Account::DontChangeKABC ); } - TQObject::connect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); - TQObject::connect( kcl, TQT_SIGNAL( groupRemoved( Kopete::Group* ) ), - this, TQT_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( contactAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( groupAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( groupUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( contactUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); + TQObject::connect( kcl, TQ_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); + TQObject::connect( kcl, TQ_SIGNAL( groupRemoved( Kopete::Group* ) ), + this, TQ_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( contactAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( groupAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( groupUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( contactUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); //TODO: check the kopete contact list and handle non server side contacts appropriately. TQDict nonServerContacts = contacts(); @@ -280,8 +280,8 @@ void OscarAccount::processSSIList() if ( !nonServerContactList.isEmpty() && showMissingContactsDialog ) { d->olnscDialog = new OscarListNonServerContacts( Kopete::UI::Global::mainWidget() ); - TQObject::connect( d->olnscDialog, TQT_SIGNAL( closing() ), - this, TQT_SLOT( nonServerAddContactDialogClosed() ) ); + TQObject::connect( d->olnscDialog, TQ_SIGNAL( closing() ), + this, TQ_SLOT( nonServerAddContactDialogClosed() ) ); d->olnscDialog->addContacts( nonServerContactList ); d->olnscDialog->show(); } @@ -781,7 +781,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) void OscarAccount::slotSendBuddyIcon() { //need to disconnect because we could end up with many connections - TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotSendBuddyIcon() ) ); + TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotSendBuddyIcon() ) ); TQString photoPath = myself()->property( Kopete::Global::Properties::self()->photo() ).value().toString(); if ( photoPath.isEmpty() ) return; @@ -794,8 +794,8 @@ void OscarAccount::slotSendBuddyIcon() if ( !engine()->hasIconConnection() ) { //will send icon when we connect to icon server - TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), - this, TQT_SLOT( slotSendBuddyIcon() ) ); + TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), + this, TQ_SLOT( slotSendBuddyIcon() ) ); return; } TQByteArray imageData = iconFile.readAll(); diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index 512b65ff..45874477 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -51,7 +51,7 @@ OscarContact::OscarContact( Kopete::Account* account, const TQString& name, mName = name; mMsgManager = 0L; m_ssiItem = ssiItem; - connect( this, TQT_SIGNAL( updatedSSI() ), this, TQT_SLOT( updateSSIItem() ) ); + connect( this, TQ_SIGNAL( updatedSSI() ), this, TQ_SLOT( updateSSIItem() ) ); } OscarContact::~OscarContact() @@ -105,15 +105,15 @@ Kopete::ChatSession* OscarContact::manager( CanCreateFlags canCreate ) mMsgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), theContact, protocol()); // This is for when the user types a message and presses send - connect(mMsgManager, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession * ) ), - this, TQT_SLOT( slotSendMsg( Kopete::Message&, Kopete::ChatSession * ) ) ); + connect(mMsgManager, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession * ) ), + this, TQ_SLOT( slotSendMsg( Kopete::Message&, Kopete::ChatSession * ) ) ); // For when the message manager is destroyed - connect(mMsgManager, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( chatSessionDestroyed() ) ); + connect(mMsgManager, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( chatSessionDestroyed() ) ); - connect(mMsgManager, TQT_SIGNAL( myselfTyping( bool ) ), - this, TQT_SLOT( slotTyping( bool ) ) ); + connect(mMsgManager, TQ_SIGNAL( myselfTyping( bool ) ), + this, TQ_SLOT( slotTyping( bool ) ) ); } return mMsgManager; } diff --git a/kopete/protocols/oscar/oscarmyselfcontact.cpp b/kopete/protocols/oscar/oscarmyselfcontact.cpp index e5f1cd9e..78a01433 100644 --- a/kopete/protocols/oscar/oscarmyselfcontact.cpp +++ b/kopete/protocols/oscar/oscarmyselfcontact.cpp @@ -27,7 +27,7 @@ OscarMyselfContact::OscarMyselfContact( OscarAccount* account ) : Kopete::Contact( account, account->accountId(), Kopete::ContactList::self()->myself() ) { - TQObject::connect( account->engine(), TQT_SIGNAL( haveOwnInfo() ), this, TQT_SLOT( userInfoUpdated() ) ); + TQObject::connect( account->engine(), TQ_SIGNAL( haveOwnInfo() ), this, TQ_SLOT( userInfoUpdated() ) ); } OscarMyselfContact::~OscarMyselfContact() diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 16149c18..6da4b0e0 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -71,10 +71,10 @@ bool OscarVersionUpdater::update( unsigned int stamp ) mTransferJob = TDEIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; - connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), - this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); - connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( result ( TDEIO::Job* ) ), + this, TQ_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); } return isUpdating; } diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index 235693e1..c82d0a86 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -32,14 +32,14 @@ OscarVisibilityDialog::OscarVisibilityDialog( Client* client, TQWidget* parent ) m_visibilityUI = new OscarVisibilityBase( this ); setMainWidget( m_visibilityUI ); - TQObject::connect(m_visibilityUI->visibleAdd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddToVisible())); - TQObject::connect(m_visibilityUI->visibleRemove, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveFromVisible())); - TQObject::connect(m_visibilityUI->invisibleAdd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddToInvisible())); - TQObject::connect(m_visibilityUI->invisibleRemove, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveFromInvisible())); + TQObject::connect(m_visibilityUI->visibleAdd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddToVisible())); + TQObject::connect(m_visibilityUI->visibleRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveFromVisible())); + TQObject::connect(m_visibilityUI->invisibleAdd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddToInvisible())); + TQObject::connect(m_visibilityUI->invisibleRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveFromInvisible())); } void OscarVisibilityDialog::addContacts( const ContactMap& contacts ) diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index 085b9cd5..fc532ffd 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -305,7 +305,7 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, s.find("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); - connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); + connect( _readNotifier, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated())); return; // found OK, return } } diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 1a8a510a..c3902d4f 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -80,9 +80,9 @@ void SMSClient::send(const Kopete::Message& msg) *p << provider + ":" + nr; *p << message; - TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*))); - TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendFinished(TDEProcess*))); + TQObject::connect(p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); p->start(TDEProcess::Block, TDEProcess::AllOutput); } diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 73eb71db..0d22fd4f 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -67,8 +67,8 @@ void SMSSend::send(const Kopete::Message& msg) m_provider = new SMSSendProvider(provider, prefix, m_account, this); - TQObject::connect( m_provider, TQT_SIGNAL(messageSent(const Kopete::Message &)), this, TQT_SIGNAL(messageSent(const Kopete::Message &))); - TQObject::connect( m_provider, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), this, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &))); + TQObject::connect( m_provider, TQ_SIGNAL(messageSent(const Kopete::Message &)), this, TQ_SIGNAL(messageSent(const Kopete::Message &))); + TQObject::connect( m_provider, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), this, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &))); m_provider->send(msg); } @@ -108,13 +108,13 @@ void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) } } - TQObject::connect (prefWidget->program, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(loadProviders(const TQString&))); + TQObject::connect (prefWidget->program, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(loadProviders(const TQString&))); prefWidget->program->setURL(prefix); - TQObject::connect(prefWidget->provider, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(setOptions(const TQString &))); + TQObject::connect(prefWidget->provider, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(setOptions(const TQString &))); prefWidget->show(); } diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 3ca0b419..24ea8bdc 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -244,9 +244,9 @@ void SMSSendProvider::send(const Kopete::Message& msg) *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; - connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *))); - connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); -// connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); + connect( p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendFinished(TDEProcess *))); + connect( p, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); +// connect( p, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 2e596025..eddf3508 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -46,12 +46,12 @@ SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const ch if( theService ) { - TQObject::connect (theService, TQT_SIGNAL(messageSent(const Kopete::Message &)), - this, TQT_SLOT(slotSendingSuccess(const Kopete::Message &))); - TQObject::connect (theService, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), - this, TQT_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &))); - TQObject::connect (theService, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected())); - TQObject::connect (theService, TQT_SIGNAL(disconnected()), this, TQT_SLOT(slotDisconnected())); + TQObject::connect (theService, TQ_SIGNAL(messageSent(const Kopete::Message &)), + this, TQ_SLOT(slotSendingSuccess(const Kopete::Message &))); + TQObject::connect (theService, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), + this, TQ_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &))); + TQObject::connect (theService, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected())); + TQObject::connect (theService, TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotDisconnected())); } } diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index 2a1afa09..d67bd9be 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -79,9 +79,9 @@ Kopete::ChatSession* SMSContact::manager( Kopete::Contact::CanCreateFlags canCre TQPtrList contacts; contacts.append(this); m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol()); - connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - account(), TQT_SLOT(slotSendMessage(Kopete::Message&))); - connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + account(), TQ_SLOT(slotSendMessage(Kopete::Message&))); + connect(m_msgManager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed())); return m_msgManager; } } @@ -123,7 +123,7 @@ TQPtrList* SMSContact::customContextMenuActions() { TQPtrList *m_actionCollection = new TQPtrList(); if( !m_actionPrefs ) - m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs"); + m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQ_SLOT(userPrefs()), this, "userPrefs"); m_actionCollection->append( m_actionPrefs ); diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index 11771f9e..5994534d 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -63,10 +63,10 @@ SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Accoun preferencesDialog->serviceName->insertStringList(ServiceLoader::services()); - connect (preferencesDialog->serviceName, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(setServicePreferences(const TQString &))); - connect (preferencesDialog->descButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(showDescription())); + connect (preferencesDialog->serviceName, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(setServicePreferences(const TQString &))); + connect (preferencesDialog->descButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(showDescription())); for (int i=0; i < preferencesDialog->serviceName->count(); i++) @@ -118,7 +118,7 @@ void SMSEditAccountWidget::setServicePreferences(const TQString& serviceName) if (service == 0L) return; - connect (this, TQT_SIGNAL(saved()), service, TQT_SLOT(savePreferences())); + connect (this, TQ_SIGNAL(saved()), service, TQ_SLOT(savePreferences())); delete middleFrameLayout; middleFrameLayout = new TQGridLayout(preferencesDialog->middleFrame, 1, 2, 0, 6, "middleFrameLayout"); diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index 267f452b..810b8a6b 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -51,7 +51,7 @@ TDEActionMenu* TestbedAccount::actionMenu() TDEAction *action; - action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo"); + action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQ_SLOT (slotShowVideo ()), this, "actionShowVideo"); mActionMenu->insert(action); action->setEnabled( isConnected() ); @@ -90,8 +90,8 @@ void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ ) { kdDebug ( 14210 ) << k_funcinfo << endl; myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline ); - TQObject::connect ( m_server, TQT_SIGNAL ( messageReceived( const TQString & ) ), - this, TQT_SLOT ( receivedMessage( const TQString & ) ) ); + TQObject::connect ( m_server, TQ_SIGNAL ( messageReceived( const TQString & ) ), + this, TQ_SLOT ( receivedMessage( const TQString & ) ) ); } void TestbedAccount::disconnect() diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index b53c4adb..7195f7bc 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -74,9 +74,9 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags ) TQPtrList contacts; contacts.append(this); m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol()); - connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - this, TQT_SLOT( sendMessage( Kopete::Message& ) ) ); - connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + this, TQ_SLOT( sendMessage( Kopete::Message& ) ) ); + connect(m_msgManager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed())); return m_msgManager; } } @@ -87,7 +87,7 @@ TQPtrList *TestbedContact::customContextMenuActions() //OBSOLETE //FIXME!!! this function is obsolete, we should use XMLGUI instead /*m_actionCollection = new TDEActionCollection( this, "userColl" ); m_actionPrefs = new TDEAction(i18n( "&Contact Settings" ), 0, this, - TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" ); + TQ_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" ); return m_actionCollection;*/ return 0L; diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp index 9a4116ca..40f724f1 100644 --- a/kopete/protocols/testbed/testbedfakeserver.cpp +++ b/kopete/protocols/testbed/testbedfakeserver.cpp @@ -40,7 +40,7 @@ void TestbedFakeServer::sendMessage( TQString contactId, TQString message ) TQString messageId = contactId + TQString::fromLatin1(": "); TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message ); m_incomingMessages.append( msg ); - TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) ); + TQTimer::singleShot( 1000, msg, TQ_SLOT( deliver() ) ); // This removes any delivered messages purgeMessages(); diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index 6022d8cb..df8a8a1a 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -34,7 +34,7 @@ TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * setInitialSize( TQSize(320,290), false ); setEscapeButton( KDialogBase::Close ); -// TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) ); +// TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) ); TQWidget *page = plainPage(); setMainWidget(page); @@ -59,7 +59,7 @@ kdDebug() << "Just captured 1st frame" << endl; mPixmap=TQPixmap(320,240,-1, TQPixmap::DefaultOptim); if (mPixmap.convertFromImage(mImage,0) == true) mImageContainer->updatePixmap(mPixmap); - connect(&qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateImage()) ); + connect(&qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateImage()) ); qtimer.start(0,FALSE); } diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 497f13fe..138f2957 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -36,10 +36,10 @@ WinPopupLib::WinPopupLib(const TQString &smbClient,int groupFreq) : smbClientBin(smbClient), groupCheckFreq(groupFreq) { - connect(&updateGroupDataTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateGroupData())); + connect(&updateGroupDataTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateGroupData())); updateGroupDataTimer.start(1, true); - TQTimer::singleShot(1, this, TQT_SLOT(slotStartDirLister())); + TQTimer::singleShot(1, this, TQ_SLOT(slotStartDirLister())); } WinPopupLib::~WinPopupLib() @@ -51,8 +51,8 @@ void WinPopupLib::slotStartDirLister() if (checkMessageDir()) { dirLister = new KDirLister(); dirLister->setAutoUpdate(true); - connect(dirLister, TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewMessages(const KFileItemList &))); - connect(dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotListCompleted())); + connect(dirLister, TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewMessages(const KFileItemList &))); + connect(dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotListCompleted())); dirLister->openURL(KURL::fromPathOrURL(WP_POPUP_DIR)); } } @@ -162,8 +162,8 @@ void WinPopupLib::startReadProcess(const TQString &Host) KProcIO *reader = new KProcIO; *reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-"; - connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *))); - connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *))); + connect(reader, TQ_SIGNAL(readReady(KProcIO *)), this, TQ_SLOT(slotReadProcessReady(KProcIO *))); + connect(reader, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotReadProcessExited(TDEProcess *))); if (!reader->start(TDEProcess::NotifyOnExit, true)) { // still to come @@ -250,7 +250,7 @@ void WinPopupLib::slotReadProcessExited(TDEProcess *r) void WinPopupLib::slotListCompleted() { /// only to check received messages during start up, then we use newItems. GF - disconnect(dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotListCompleted())); + disconnect(dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotListCompleted())); readMessages(dirLister->items()); } @@ -331,7 +331,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) *sender << smbClientBin << "-M" << Destination; *sender << "-N" << "-"; - connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *))); + connect(sender, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendProcessExited(TDEProcess *))); if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) { sender->writeStdin(Body.local8Bit(), Body.local8Bit().length()); diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 75788a2b..695147a2 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -165,12 +165,12 @@ TDEActionMenu* WPAccount::actionMenu() if (mProtocol) { TDEAction *goOnline = new TDEAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0, - this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable"); + this, TQ_SLOT(connect()), theActionMenu, "actionGoAvailable"); goOnline->setEnabled(isConnected() && isAway()); theActionMenu->insert(goOnline); TDEAction *goAway = new TDEAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0, - this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway"); + this, TQ_SLOT(goAway()), theActionMenu, "actionGoAway"); goAway->setEnabled(isConnected() && !isAway()); theActionMenu->insert(goAway); @@ -178,7 +178,7 @@ TDEActionMenu* WPAccount::actionMenu() theActionMenu->popupMenu()->insertSeparator(); theActionMenu->insert(new TDEAction(i18n("Properties"), 0, - this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties")); + this, TQ_SLOT(editAccount()), theActionMenu, "actionAccountProperties")); } diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index 133d9b54..1d08ba8f 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -42,8 +42,8 @@ WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char * (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new WPAddContactBase(this); - connect(theDialog->mHostGroup, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSelected(const TQString &))); - connect(theDialog->mRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateGroups())); + connect(theDialog->mHostGroup, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSelected(const TQString &))); + connect(theDialog->mRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpdateGroups())); theDialog->show(); theAccount = newAccount; diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index b8718de6..29517745 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -51,7 +51,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons // Initialise and start the periodical checking for contact's status setOnlineStatus(static_cast(protocol())->WPOffline); - connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); + connect(&checkStatus, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckStatus())); checkStatus.start(1000, false); } @@ -77,9 +77,9 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr m_manager = Kopete::ChatSessionManager::self()->create( account()->myself(), singleContact, protocol() ); - connect(m_manager, TQT_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), this, TQT_SLOT(slotSendMessage(Kopete::Message &))); - connect(m_manager, TQT_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), m_manager, TQT_SLOT(appendMessage(Kopete::Message &))); - connect(m_manager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_manager, TQ_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), this, TQ_SLOT(slotSendMessage(Kopete::Message &))); + connect(m_manager, TQ_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), m_manager, TQ_SLOT(appendMessage(Kopete::Message &))); + connect(m_manager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed())); } return m_manager; @@ -111,7 +111,7 @@ void WPContact::slotUserInfo() if (!m_infoDialog) { m_infoDialog = new WPUserInfo( this, static_cast( account() ) ); if (!m_infoDialog) return; - connect( m_infoDialog, TQT_SIGNAL( closing() ), this, TQT_SLOT( slotCloseUserInfoDialog() ) ); + connect( m_infoDialog, TQ_SIGNAL( closing() ), this, TQ_SLOT( slotCloseUserInfoDialog() ) ); m_infoDialog->show(); } else { m_infoDialog->raise(); diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 3b2cba49..a418d7e7 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -67,8 +67,8 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & readConfig(); popupClient = new WinPopupLib(smbClientBin, groupCheckFreq); - TQObject::connect(popupClient, TQT_SIGNAL(signalNewMessage(const TQString &, const TQDateTime &, const TQString &)), - this, TQT_SLOT(slotReceivedMessage(const TQString &, const TQDateTime &, const TQString &))); + TQObject::connect(popupClient, TQ_SIGNAL(signalNewMessage(const TQString &, const TQDateTime &, const TQString &)), + this, TQ_SLOT(slotReceivedMessage(const TQString &, const TQDateTime &, const TQString &))); } // Destructor diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 2809763d..32fc6837 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -50,7 +50,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa m_mainWidget->sOS->setText(i18n("Looking")); m_mainWidget->sServer->setText(i18n("Looking")); - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCloseClicked() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCloseClicked() ) ); startDetailsProcess(m_contact->contactId()); } @@ -65,8 +65,8 @@ void WPUserInfo::startDetailsProcess(const TQString &host) KProcIO *details = new KProcIO; *details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-"; - connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *))); - connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *))); + connect(details, TQ_SIGNAL(readReady(KProcIO *)), this, TQ_SLOT(slotDetailsProcessReady(KProcIO *))); + connect(details, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotDetailsProcessExited(TDEProcess *))); if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { slotDetailsProcessExited(details); 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() diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 7e853fec..2b28f986 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -215,10 +215,10 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); TDEIO::Job* job = TDEIO::get(tokenUrl, true, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*))); } void LoginTask::handleAuthSixteenStage1Data(TDEIO::Job* job, const TQByteArray& data) @@ -295,10 +295,10 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) TQString fullUrl = YahooLoginUrl.arg(token); KURL loginUrl(fullUrl); TDEIO::Job* job = TDEIO::get(loginUrl, true, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*))); } void LoginTask::handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data) diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index b81d5b29..e8b3ff09 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -46,8 +46,8 @@ void ModifyYABTask::onGo() { kdDebug(YAHOO_RAW_DEBUG) ; m_socket = new TDEBufferedSocket( "address.yahoo.com", TQString::number(80) ); - connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); - connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); + connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( connectSucceeded() ) ); + connect( m_socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( connectFailed(int) ) ); m_socket->connect(); } @@ -123,7 +123,7 @@ void ModifyYABTask::connectSucceeded() return; } - connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); } void ModifyYABTask::slotRead() diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index d56666cd..7572ede8 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -58,8 +58,8 @@ void ReceiveFileTask::onGo() return; } m_transferJob = TDEIO::get( m_remoteUrl, false, false ); - TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); delete t; break; case FileTransfer7Accept: @@ -196,8 +196,8 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) m_transferJob = TDEIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false ); - TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") .arg(client()->tCookie()).arg(client()->yCookie()) ); diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp index 714b0960..1820e95f 100644 --- a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp +++ b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp @@ -111,7 +111,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/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index e50f420a..6b54f789 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -177,8 +177,8 @@ void SendFileTask::parseTransferAccept(const Transfer *transfer) m_socket = new KStreamSocket( m_relayHost, TQString::number(80) ); m_socket->setBlocking( true ); - connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); - connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); + connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( connectSucceeded() ) ); + connect( m_socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( connectFailed(int) ) ); m_socket->connect(); @@ -232,7 +232,7 @@ void SendFileTask::connectSucceeded() } else { - connect( m_socket, TQT_SIGNAL(readyWrite()), this, TQT_SLOT(transmitData()) ); + connect( m_socket, TQ_SIGNAL(readyWrite()), this, TQ_SLOT(transmitData()) ); m_socket->enableWrite( true ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 2fcc1d7e..fb8e13b7 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -65,9 +65,9 @@ void SendPictureTask::initiateUpload() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_socket = new TDEBufferedSocket( "filetransfer.msg.yahoo.com", TQString::number(80) ); - connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); - connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); - connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readResult() ) ); + connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( connectSucceeded() ) ); + connect( m_socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( connectFailed(int) ) ); + connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( readResult() ) ); m_socket->connect(); } diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index 9ae7861b..8efeb924 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -47,7 +47,7 @@ Task::Task(Task *parent) d->transfer = 0; d->client = parent->client(); //d->id = client()->genUniqueId(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) @@ -56,7 +56,7 @@ Task::Task(Client *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() @@ -172,7 +172,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/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp index efcd63cf..31a5b99f 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp @@ -13,12 +13,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc myConnector->setOptHostPort( "scs.msg.yahoo.com", 5050 ); 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/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp index 5e9b04a5..8bd11f64 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp @@ -33,7 +33,7 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) // notify when the transport layer is connected myClient = new Client(); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } @@ -50,7 +50,7 @@ void LoginTest::slotDoTest() // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; - connect( myClient, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myClient, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient->start( server, 5050, "duncanmacvicar", "**********" ); myClient->connectToServer( myClientStream, server, true ); } diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index abfab0dc..b4c74f89 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -111,9 +111,9 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t ) KStreamSocket *socket = new KStreamSocket( info.server, TQString::number(5100) ); socketMap[socket] = info; socket->enableRead( true ); - connect( socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage1Established() ) ); - connect( socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); - connect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + connect( socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage1Established() ) ); + connect( socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); + connect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); socket->connect(); } @@ -124,8 +124,8 @@ void WebcamTask::slotConnectionStage1Established() if( !socket ) return; kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection Stage1 to the user " << socketMap[socket].sender << " established." << endl; - disconnect( socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage1Established() ) ); - disconnect( socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); + disconnect( socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage1Established() ) ); + disconnect( socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); socketMap[socket].status = ConnectedStage1; @@ -157,8 +157,8 @@ void WebcamTask::slotConnectionStage2Established() return; kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection Stage2 to the user " << socketMap[socket].sender << " established." << endl; - disconnect( socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage2Established() ) ); - disconnect( socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); + disconnect( socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage2Established() ) ); + disconnect( socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); socketMap[socket].status = ConnectedStage2; TQByteArray buffer; @@ -211,7 +211,7 @@ void WebcamTask::slotRead() switch( socketMap[socket].status ) { case ConnectedStage1: - disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + disconnect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); connectStage2( socket ); break; case ConnectedStage2: @@ -255,13 +255,13 @@ void WebcamTask::connectStage2( KStreamSocket *socket ) newSocket = new KStreamSocket( server, TQString::number(5100) ); socketMap[newSocket] = socketMap[socket]; newSocket->enableRead( true ); - connect( newSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage2Established() ) ); - connect( newSocket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); - connect( newSocket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + connect( newSocket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage2Established() ) ); + connect( newSocket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); + connect( newSocket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); if( socketMap[newSocket].direction == Outgoing ) { newSocket->enableWrite( true ); - connect( newSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( transmitWebcamImage() ) ); + connect( newSocket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( transmitWebcamImage() ) ); } newSocket->connect(); @@ -635,7 +635,7 @@ void WebcamTask::sendEmptyWebcamImage() pictureBuffer.resize( 0 ); transmissionPending = true; - TQTimer::singleShot( 1000, this, TQT_SLOT(sendEmptyWebcamImage()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(sendEmptyWebcamImage()) ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index c48a2549..d5b4eaa2 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -101,8 +101,8 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); - connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); - connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void YABTask::slotData( TDEIO::Job* /*job*/, const TQByteArray &info ) diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 569a4e45..1dc3f84c 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -49,8 +49,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch ext = ext.right( ext.length() - ext.findRev( "." ) ); transfer = TDEIO::get( url, false, false ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); m_jobs[transfer].url = url; m_jobs[transfer].who = who; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index d49ea2ff..6dccf375 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -36,11 +36,11 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent ) 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/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 9e5d7cd1..210ed95d 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -98,8 +98,8 @@ void YahooChatTask::getYahooChatCategories() transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); } void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) @@ -114,8 +114,8 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); m_jobs[ transfer ].category = category; } diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index c5427d3e..8ef1b642 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -109,13 +109,13 @@ ClientStream::ClientStream(Connector *conn, TQObject *parent) d->mode = Client; 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() @@ -327,11 +327,11 @@ void ClientStream::cr_connected() kdDebug(YAHOO_RAW_DEBUG) ; 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))); TQByteArray spare = d->bs->read(); @@ -399,7 +399,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/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index 43061f61..5200bad6 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -34,8 +34,8 @@ KNetworkConnector::KNetworkConnector( TQObject *parent ) 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 = 5510; } diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index de4687ec..aa9b4bcf 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -66,7 +66,7 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); - TQObject::connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSaveAndCloseClicked())); + TQObject::connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSaveAndCloseClicked())); } void YahooUserInfoDialog::setAccountConnected( bool isOnline ) diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index ce3d9536..4e585bba 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -34,7 +34,7 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare setInitialSize( TQSize(320,290), false ); setEscapeButton( KDialogBase::Close ); - TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) ); + TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) ); contactName = contactId; TQWidget *page = plainPage(); diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index f5c2e26b..28d73f06 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -83,21 +83,21 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con // FIXME //m_openInboxAction = new TDEAction( TDEIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); //, "m_openInboxAction" ); - //TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) ); + //TQObject::connect(m_openInboxAction, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotOpenInbox() ) ); //m_openYABAction = new TDEAction( TDEIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); //, "m_openYABAction" ); - //TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) ); + //TQObject::connect(m_openYABAction, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotOpenYAB() ) ); //m_editOwnYABEntry = new TDEAction( TDEIcon("document-properties"), i18n( "&Edit my contact details..."), this ); //, "m_editOwnYABEntry" ); - //TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) ); + //TQObject::connect(m_editOwnYABEntry, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotEditOwnYABEntry() ) ); //m_joinChatAction = new TDEAction( TDEIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); //, "m_joinChatAction" ); - //TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) ); + //TQObject::connect(m_joinChatAction, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotJoinChatRoom() ) ); - m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); - m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); - m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQ_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQ_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); + m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQ_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); + m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQ_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); @@ -229,290 +229,290 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) if ( sct == MakeConnections ) { - TQObject::connect(m_session, TQT_SIGNAL(loggedIn( int, const TQString &)), - this, TQT_SLOT(slotLoginResponse(int, const TQString &)) ); + TQObject::connect(m_session, TQ_SIGNAL(loggedIn( int, const TQString &)), + this, TQ_SLOT(slotLoginResponse(int, const TQString &)) ); - TQObject::connect(m_session, TQT_SIGNAL(disconnected()), - this, TQT_SLOT(slotDisconnected()) ); + TQObject::connect(m_session, TQ_SIGNAL(disconnected()), + this, TQ_SLOT(slotDisconnected()) ); - TQObject::connect(m_session, TQT_SIGNAL(loginFailed()), - this, TQT_SLOT(slotLoginFailed()) ); + TQObject::connect(m_session, TQ_SIGNAL(loginFailed()), + this, TQ_SLOT(slotLoginFailed()) ); - TQObject::connect(m_session, TQT_SIGNAL(error(int)), - this, TQT_SLOT(slotError(int))); + TQObject::connect(m_session, TQ_SIGNAL(error(int)), + this, TQ_SLOT(slotError(int))); - TQObject::connect(m_session, TQT_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); + TQObject::connect(m_session, TQ_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); - TQObject::connect(m_session, TQT_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); + TQObject::connect(m_session, TQ_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); - TQObject::connect(m_session, TQT_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); + TQObject::connect(m_session, TQ_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); - TQObject::connect(m_session, TQT_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); + TQObject::connect(m_session, TQ_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); - TQObject::connect(m_session, TQT_SIGNAL(authorizationAccepted( const TQString & )), - this, TQT_SLOT(slotAuthorizationAccepted( const TQString & )) ); + TQObject::connect(m_session, TQ_SIGNAL(authorizationAccepted( const TQString & )), + this, TQ_SLOT(slotAuthorizationAccepted( const TQString & )) ); - TQObject::connect(m_session, TQT_SIGNAL(authorizationRejected( const TQString &, const TQString & )), - this, TQT_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); + TQObject::connect(m_session, TQ_SIGNAL(authorizationRejected( const TQString &, const TQString & )), + this, TQ_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); - TQObject::connect(m_session, TQT_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), - this, TQT_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); + TQObject::connect(m_session, TQ_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), + this, TQ_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); - TQObject::connect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), - this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); + TQObject::connect(m_session, TQ_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), + this, TQ_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + TQObject::connect(m_session, TQ_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), + this, TQ_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); - TQObject::connect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), - this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); + TQObject::connect(m_session, TQ_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), + this, TQ_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); - TQObject::connect(m_session, TQT_SIGNAL(gotBuzz(const TQString&, long)), - this, TQT_SLOT(slotGotBuzz(const TQString &, long))); + TQObject::connect(m_session, TQ_SIGNAL(gotBuzz(const TQString&, long)), + this, TQ_SLOT(slotGotBuzz(const TQString &, long))); - TQObject::connect(m_session, TQT_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, + TQObject::connect(m_session, TQ_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, const TQString&, const TQStringList&) ), this, - TQT_SLOT( slotGotConfInvite( const TQString&, const TQString&, + TQ_SLOT( slotGotConfInvite( const TQString&, const TQString&, const TQString&, const TQStringList& ) ) ); - TQObject::connect(m_session, TQT_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), + TQObject::connect(m_session, TQ_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString &)) ); + TQ_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString &)) ); - TQObject::connect(m_session , TQT_SIGNAL(confUserJoined( const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); + TQObject::connect(m_session , TQ_SIGNAL(confUserJoined( const TQString &, const TQString &)), this, + TQ_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); - TQObject::connect(m_session , TQT_SIGNAL(confUserLeft( const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); + TQObject::connect(m_session , TQ_SIGNAL(confUserLeft( const TQString &, const TQString &)), this, + TQ_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); - TQObject::connect(m_session , TQT_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); + TQObject::connect(m_session , TQ_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, + TQ_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); TQObject::connect(m_session, - TQT_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap &)), + TQ_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap &)), this, - TQT_SLOT(slotGotFile(const TQString&, const TQString&, long, const TQString&, const TQString&, unsigned long, const TQPixmap &))); + TQ_SLOT(slotGotFile(const TQString&, const TQString&, long, const TQString&, const TQString&, unsigned long, const TQPixmap &))); - TQObject::connect(m_session, TQT_SIGNAL(fileTransferComplete(unsigned int)), this, - TQT_SLOT(slotFileTransferComplete(unsigned int)) ); + TQObject::connect(m_session, TQ_SIGNAL(fileTransferComplete(unsigned int)), this, + TQ_SLOT(slotFileTransferComplete(unsigned int)) ); - TQObject::connect(m_session, TQT_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, - TQT_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); + TQObject::connect(m_session, TQ_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, + TQ_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); - TQObject::connect(m_session, TQT_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, - TQT_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); + TQObject::connect(m_session, TQ_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, + TQ_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); - TQObject::connect(m_session, TQT_SIGNAL(typingNotify(const TQString &, int)), this , - TQT_SLOT(slotTypingNotify(const TQString &, int))); + TQObject::connect(m_session, TQ_SIGNAL(typingNotify(const TQString &, int)), this , + TQ_SLOT(slotTypingNotify(const TQString &, int))); -// TQObject::connect(m_session, TQT_SIGNAL(gameNotify(const TQString &, int)), this, -// TQT_SLOT(slotGameNotify( const TQString &, int))); +// TQObject::connect(m_session, TQ_SIGNAL(gameNotify(const TQString &, int)), this, +// TQ_SLOT(slotGameNotify( const TQString &, int))); - TQObject::connect(m_session, TQT_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, - TQT_SLOT(slotMailNotify(const TQString &, const TQString&, int))); + TQObject::connect(m_session, TQ_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, + TQ_SLOT(slotMailNotify(const TQString &, const TQString&, int))); - TQObject::connect(m_session, TQT_SIGNAL(systemMessage(const TQString&)), this, - TQT_SLOT(slotSystemMessage(const TQString &))); + TQObject::connect(m_session, TQ_SIGNAL(systemMessage(const TQString&)), this, + TQ_SLOT(slotSystemMessage(const TQString &))); -// TQObject::connect(m_session, TQT_SIGNAL(gotIdentities(const TQStringList &)), this, -// TQT_SLOT(slotGotIdentities( const TQStringList&))); +// TQObject::connect(m_session, TQ_SIGNAL(gotIdentities(const TQStringList &)), this, +// TQ_SLOT(slotGotIdentities( const TQStringList&))); - TQObject::connect(m_session, TQT_SIGNAL(gotWebcamInvite(const TQString&)), this, TQT_SLOT(slotGotWebcamInvite(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(gotWebcamInvite(const TQString&)), this, TQ_SLOT(slotGotWebcamInvite(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamNotAvailable(const TQString&)), this, TQT_SLOT(slotWebcamNotAvailable(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamNotAvailable(const TQString&)), this, TQ_SLOT(slotWebcamNotAvailable(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQT_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); + TQObject::connect(m_session, TQ_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQ_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); - TQObject::connect(m_session, TQT_SIGNAL(webcamClosed(const TQString&, int )), this, TQT_SLOT(slotWebcamClosed(const TQString&, int ))); + TQObject::connect(m_session, TQ_SIGNAL(webcamClosed(const TQString&, int )), this, TQ_SLOT(slotWebcamClosed(const TQString&, int ))); - TQObject::connect(m_session, TQT_SIGNAL(webcamPaused(const TQString&)), this, TQT_SLOT(slotWebcamPaused(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamPaused(const TQString&)), this, TQ_SLOT(slotWebcamPaused(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamReadyForTransmission()), this, TQT_SLOT(slotWebcamReadyForTransmission())); + TQObject::connect(m_session, TQ_SIGNAL(webcamReadyForTransmission()), this, TQ_SLOT(slotWebcamReadyForTransmission())); - TQObject::connect(m_session, TQT_SIGNAL(webcamStopTransmission()), this, TQT_SLOT(slotWebcamStopTransmission())); + TQObject::connect(m_session, TQ_SIGNAL(webcamStopTransmission()), this, TQ_SLOT(slotWebcamStopTransmission())); - TQObject::connect(m_session, TQT_SIGNAL(webcamViewerJoined(const TQString&)), this, TQT_SLOT(slotWebcamViewerJoined(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamViewerJoined(const TQString&)), this, TQ_SLOT(slotWebcamViewerJoined(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamViewerLeft(const TQString&)), this, TQT_SLOT(slotWebcamViewerLeft(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamViewerLeft(const TQString&)), this, TQ_SLOT(slotWebcamViewerLeft(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamViewerRequest(const TQString&)), this, TQT_SLOT(slotWebcamViewerRequest( const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamViewerRequest(const TQString&)), this, TQ_SLOT(slotWebcamViewerRequest( const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(pictureStatusNotify( const TQString&, int )), TQT_SLOT(slotPictureStatusNotify( const TQString&, int))); + TQObject::connect(m_session, TQ_SIGNAL(pictureStatusNotify( const TQString&, int )), TQ_SLOT(slotPictureStatusNotify( const TQString&, int))); - TQObject::connect(m_session, TQT_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int)), this, TQT_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &, int)) ); + TQObject::connect(m_session, TQ_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int)), this, TQ_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &, int)) ); - TQObject::connect(m_session, TQT_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQT_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); + TQObject::connect(m_session, TQ_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQ_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); - TQObject::connect(m_session, TQT_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQT_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); + TQObject::connect(m_session, TQ_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQ_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); - TQObject::connect(m_session, TQT_SIGNAL(pictureRequest(const TQString&)), this, TQT_SLOT(slotGotBuddyIconRequest(const TQString&)) ); + TQObject::connect(m_session, TQ_SIGNAL(pictureRequest(const TQString&)), this, TQ_SLOT(slotGotBuddyIconRequest(const TQString&)) ); - TQObject::connect(m_session, TQT_SIGNAL(pictureUploaded( const TQString &, int)), this, TQT_SLOT(slotBuddyIconChanged(const TQString&, int))); + TQObject::connect(m_session, TQ_SIGNAL(pictureUploaded( const TQString &, int)), this, TQ_SLOT(slotBuddyIconChanged(const TQString&, int))); - TQObject::connect(m_session, TQT_SIGNAL(gotYABEntry( YABEntry * )), this, TQT_SLOT(slotGotYABEntry( YABEntry * ))); + TQObject::connect(m_session, TQ_SIGNAL(gotYABEntry( YABEntry * )), this, TQ_SLOT(slotGotYABEntry( YABEntry * ))); - TQObject::connect(m_session, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQT_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); + TQObject::connect(m_session, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQ_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); - TQObject::connect(m_session, TQT_SIGNAL(gotYABRevision( long, bool )), this, TQT_SLOT(slotGotYABRevision( long , bool )) ); + TQObject::connect(m_session, TQ_SIGNAL(gotYABRevision( long, bool )), this, TQ_SLOT(slotGotYABRevision( long , bool )) ); - TQObject::connect(m_session, TQT_SIGNAL(chatRoomJoined(int,int,TQString,TQString)), this, TQT_SLOT(slotChatJoined(int,int,TQString,TQString))); + TQObject::connect(m_session, TQ_SIGNAL(chatRoomJoined(int,int,TQString,TQString)), this, TQ_SLOT(slotChatJoined(int,int,TQString,TQString))); - TQObject::connect(m_session, TQT_SIGNAL(chatBuddyHasJoined(TQString,TQString,bool)), this, TQT_SLOT(slotChatBuddyHasJoined(TQString,TQString,bool))); + TQObject::connect(m_session, TQ_SIGNAL(chatBuddyHasJoined(TQString,TQString,bool)), this, TQ_SLOT(slotChatBuddyHasJoined(TQString,TQString,bool))); - TQObject::connect(m_session, TQT_SIGNAL(chatBuddyHasLeft(TQString,TQString)), this, TQT_SLOT(slotChatBuddyHasLeft(TQString,TQString))); + TQObject::connect(m_session, TQ_SIGNAL(chatBuddyHasLeft(TQString,TQString)), this, TQ_SLOT(slotChatBuddyHasLeft(TQString,TQString))); - TQObject::connect(m_session, TQT_SIGNAL(chatMessageReceived(TQString,TQString,TQString)), this, TQT_SLOT(slotChatMessageReceived(TQString,TQString,TQString))); + TQObject::connect(m_session, TQ_SIGNAL(chatMessageReceived(TQString,TQString,TQString)), this, TQ_SLOT(slotChatMessageReceived(TQString,TQString,TQString))); } if ( sct == DeleteConnections ) { - TQObject::disconnect(m_session, TQT_SIGNAL(loggedIn(int, const TQString &)), - this, TQT_SLOT(slotLoginResponse(int, const TQString &)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(loggedIn(int, const TQString &)), + this, TQ_SLOT(slotLoginResponse(int, const TQString &)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(disconnected()), - this, TQT_SLOT(slotDisconnected()) ); + TQObject::disconnect(m_session, TQ_SIGNAL(disconnected()), + this, TQ_SLOT(slotDisconnected()) ); - TQObject::disconnect(m_session, TQT_SIGNAL(loginFailed()), - this, TQT_SLOT(slotLoginFailed()) ); + TQObject::disconnect(m_session, TQ_SIGNAL(loginFailed()), + this, TQ_SLOT(slotLoginFailed()) ); - TQObject::disconnect(m_session, TQT_SIGNAL(error(int)), - this, TQT_SLOT(slotError(int))); + TQObject::disconnect(m_session, TQ_SIGNAL(error(int)), + this, TQ_SLOT(slotError(int))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); - TQObject::disconnect(m_session, TQT_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(authorizationAccepted( const TQString &)), - this, TQT_SLOT(slotAuthorizationAccepted( const TQString &)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(authorizationAccepted( const TQString &)), + this, TQ_SLOT(slotAuthorizationAccepted( const TQString &)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(authorizationRejected( const TQString &, const TQString &)), - this, TQT_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); + TQObject::disconnect(m_session, TQ_SIGNAL(authorizationRejected( const TQString &, const TQString &)), + this, TQ_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); - TQObject::disconnect(m_session, TQT_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), - this, TQT_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); + TQObject::disconnect(m_session, TQ_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), + this, TQ_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); - TQObject::disconnect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), - this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); + TQObject::disconnect(m_session, TQ_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), + this, TQ_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), + this, TQ_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), - this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), + this, TQ_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotBuzz(const TQString&, long)), - this, TQT_SLOT(slotGotBuzz(const TQString &, long))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotBuzz(const TQString&, long)), + this, TQ_SLOT(slotGotBuzz(const TQString &, long))); TQObject::disconnect(m_session, - TQT_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, + TQ_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, const TQString&, const TQStringList&) ), this, - TQT_SLOT( slotGotConfInvite( const TQString&, const TQString&, + TQ_SLOT( slotGotConfInvite( const TQString&, const TQString&, const TQString&, const TQStringList&) ) ); TQObject::disconnect(m_session, - TQT_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), + TQ_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString& ) ) ); + TQ_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString& ) ) ); - TQObject::disconnect(m_session , TQT_SIGNAL(confUserJoined( const TQString &, const TQString &)), - this, TQT_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); + TQObject::disconnect(m_session , TQ_SIGNAL(confUserJoined( const TQString &, const TQString &)), + this, TQ_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); - TQObject::disconnect(m_session , TQT_SIGNAL(confUserLeft( const TQString &, const TQString &)), - this, TQT_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); + TQObject::disconnect(m_session , TQ_SIGNAL(confUserLeft( const TQString &, const TQString &)), + this, TQ_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); - TQObject::disconnect(m_session , TQT_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); + TQObject::disconnect(m_session , TQ_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, + TQ_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); TQObject::disconnect(m_session, - TQT_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, + TQ_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap &)), this, - TQT_SLOT(slotGotFile(const TQString&, const TQString&, + TQ_SLOT(slotGotFile(const TQString&, const TQString&, long, const TQString&, const TQString&, unsigned long, const TQPixmap &))); - TQObject::disconnect(m_session, TQT_SIGNAL(fileTransferComplete(unsigned int)), this, - TQT_SLOT(slotFileTransferComplete(unsigned int)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(fileTransferComplete(unsigned int)), this, + TQ_SLOT(slotFileTransferComplete(unsigned int)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, - TQT_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, + TQ_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, - TQT_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, + TQ_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(typingNotify(const TQString &, int)), this , - TQT_SLOT(slotTypingNotify(const TQString &, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(typingNotify(const TQString &, int)), this , + TQ_SLOT(slotTypingNotify(const TQString &, int))); -// TQObject::disconnect(m_session, TQT_SIGNAL(gameNotify(const TQString &, int)), this, -// TQT_SLOT(slotGameNotify( const TQString &, int))); +// TQObject::disconnect(m_session, TQ_SIGNAL(gameNotify(const TQString &, int)), this, +// TQ_SLOT(slotGameNotify( const TQString &, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, - TQT_SLOT(slotMailNotify(const TQString &, const TQString&, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, + TQ_SLOT(slotMailNotify(const TQString &, const TQString&, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(systemMessage(const TQString&)), this, - TQT_SLOT(slotSystemMessage(const TQString &))); + TQObject::disconnect(m_session, TQ_SIGNAL(systemMessage(const TQString&)), this, + TQ_SLOT(slotSystemMessage(const TQString &))); -// TQObject::disconnect(m_session, TQT_SIGNAL(gotIdentities(const TQStringList &)), this, -// TQT_SLOT(slotGotIdentities( const TQStringList&))); +// TQObject::disconnect(m_session, TQ_SIGNAL(gotIdentities(const TQStringList &)), this, +// TQ_SLOT(slotGotIdentities( const TQStringList&))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotWebcamInvite(const TQString&)), this, TQT_SLOT(slotGotWebcamInvite(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotWebcamInvite(const TQString&)), this, TQ_SLOT(slotGotWebcamInvite(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamNotAvailable(const TQString&)), this, TQT_SLOT(slotWebcamNotAvailable(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamNotAvailable(const TQString&)), this, TQ_SLOT(slotWebcamNotAvailable(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQT_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQ_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamClosed(const TQString&, int )), this, TQT_SLOT(slotWebcamClosed(const TQString&, int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamClosed(const TQString&, int )), this, TQ_SLOT(slotWebcamClosed(const TQString&, int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamPaused(const TQString&)), this, TQT_SLOT(slotWebcamPaused(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamPaused(const TQString&)), this, TQ_SLOT(slotWebcamPaused(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamReadyForTransmission()), this, TQT_SLOT(slotWebcamReadyForTransmission())); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamReadyForTransmission()), this, TQ_SLOT(slotWebcamReadyForTransmission())); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamStopTransmission()), this, TQT_SLOT(slotWebcamStopTransmission())); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamStopTransmission()), this, TQ_SLOT(slotWebcamStopTransmission())); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamViewerJoined(const TQString&)), this, TQT_SLOT(slotWebcamViewerJoined(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamViewerJoined(const TQString&)), this, TQ_SLOT(slotWebcamViewerJoined(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamViewerLeft(const TQString&)), this, TQT_SLOT(slotWebcamViewerLeft(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamViewerLeft(const TQString&)), this, TQ_SLOT(slotWebcamViewerLeft(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamViewerRequest(const TQString&)), this, TQT_SLOT(slotWebcamViewerRequest( const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamViewerRequest(const TQString&)), this, TQ_SLOT(slotWebcamViewerRequest( const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int )), this, TQT_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &,int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int )), this, TQ_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &,int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQT_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQ_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureRequest(const TQString&)), this, TQT_SLOT(slotGotBuddyIconRequest(const TQString&)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureRequest(const TQString&)), this, TQ_SLOT(slotGotBuddyIconRequest(const TQString&)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureUploaded( const TQString &, int )), this, TQT_SLOT(slotBuddyIconChanged(const TQString&, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureUploaded( const TQString &, int )), this, TQ_SLOT(slotBuddyIconChanged(const TQString&, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureStatusNotify( const TQString&, int )), this, TQT_SLOT(slotPictureStatusNotify( const TQString&, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureStatusNotify( const TQString&, int )), this, TQ_SLOT(slotPictureStatusNotify( const TQString&, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQT_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQ_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotYABEntry( YABEntry * )), this, TQT_SLOT(slotGotYABEntry( YABEntry * ))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotYABEntry( YABEntry * )), this, TQ_SLOT(slotGotYABEntry( YABEntry * ))); - TQObject::disconnect(m_session, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQT_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); + TQObject::disconnect(m_session, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQ_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotYABRevision( long, bool )), this, TQT_SLOT(slotGotYABRevision( long , bool )) ); + TQObject::disconnect(m_session, TQ_SIGNAL(gotYABRevision( long, bool )), this, TQ_SLOT(slotGotYABRevision( long , bool )) ); - TQObject::disconnect(m_session, TQT_SIGNAL(chatRoomJoined(int,int,const TQString&,const TQString&)), this, TQT_SLOT(slotChatJoined(int,int,const TQString&,const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatRoomJoined(int,int,const TQString&,const TQString&)), this, TQ_SLOT(slotChatJoined(int,int,const TQString&,const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(chatBuddyHasJoined(const TQString&,const TQString&,bool)), this, TQT_SLOT(slotChatBuddyHasJoined(const TQString&,const TQString&,bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatBuddyHasJoined(const TQString&,const TQString&,bool)), this, TQ_SLOT(slotChatBuddyHasJoined(const TQString&,const TQString&,bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(chatBuddyHasLeft(const TQString&,const TQString&)), this, TQT_SLOT(slotChatBuddyHasLeft(const TQString&,const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatBuddyHasLeft(const TQString&,const TQString&)), this, TQ_SLOT(slotChatBuddyHasLeft(const TQString&,const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(chatMessageReceived(const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(slotChatMessageReceived(const TQString&,const TQString&,const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatMessageReceived(const TQString&,const TQString&,const TQString&)), this, TQ_SLOT(slotChatMessageReceived(const TQString&,const TQString&,const TQString&))); } } @@ -698,7 +698,7 @@ void YahooAccount::sendFile( YahooContact *to, const KURL &url ) url.fileName(), file.size(), to->userId(), Kopete::FileTransferInfo::Outgoing ); m_session->sendFile( transfer->info().transferId(), to->userId(), TQString(), url ); - TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) ); + TQObject::connect( transfer, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFileTransferResult( TDEIO::Job * )) ); m_fileTransfers.insert( transfer->info().transferId(), transfer ); } @@ -921,8 +921,8 @@ void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQSt // actions |= Kopete::AddedInfoEvent::AddAction; //Kopete::AddedInfoEvent* event = new Kopete::AddedInfoEvent( user, this ); - //TQObject::connect( event, TQT_SIGNAL(actionActivated(uint)), - // this, TQT_SLOT(slotAddedInfoEventActionActivated(uint)) ); + //TQObject::connect( event, TQ_SIGNAL(actionActivated(uint)), + // this, TQ_SLOT(slotAddedInfoEventActionActivated(uint)) ); //event->showActions( actions ); //event->sendEvent(); @@ -933,8 +933,8 @@ void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQSt Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( user,TQString(),this, hideFlags ); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), - this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)), + this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } @@ -1237,7 +1237,7 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo YahooConferenceChatSession *session = new YahooConferenceChatSession( room, protocol(), myself(), others ); m_conferences[room] = session; - TQObject::connect( session, TQT_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQT_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); + TQObject::connect( session, TQ_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQ_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); for ( TQStringList::ConstIterator it = myMembers.constBegin(); it != myMembers.constEnd(); ++it ) { @@ -1287,8 +1287,8 @@ void YahooAccount::prepareConference( const TQString &who ) } YahooInviteListImpl *dlg = new YahooInviteListImpl( Kopete::UI::Global::mainWidget() ); - TQObject::connect( dlg, TQT_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), - this, TQT_SLOT( slotInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); + TQObject::connect( dlg, TQ_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), + this, TQ_SLOT( slotInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); dlg->setRoom( room ); dlg->fillFriendList( buddies ); dlg->addInvitees( TQStringList( who ) ); @@ -1305,7 +1305,7 @@ kdDebug(YAHOO_GEN_DEBUG) << "Inviting " << members << " to the conference " << r YahooConferenceChatSession *session = new YahooConferenceChatSession( room, protocol(), myself(), others ); m_conferences[room] = session; - TQObject::connect( session, TQT_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQT_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); + TQObject::connect( session, TQ_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQ_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); session->joined( static_cast< YahooContact *>(myself()) ); session->view( true )->raise( false ); @@ -1478,7 +1478,7 @@ void YahooAccount::slotGotYABEntry( YABEntry *entry ) dlg->setData( *entry ); dlg->setAccountConnected( isConnected() ); dlg->show(); - TQObject::connect( dlg, TQT_SIGNAL(saveYABEntry( YABEntry & )), this, TQT_SLOT(slotSaveYABEntry( YABEntry & ))); + TQObject::connect( dlg, TQ_SIGNAL(saveYABEntry( YABEntry & )), this, TQ_SLOT(slotSaveYABEntry( YABEntry & ))); delete entry; } } @@ -1511,10 +1511,10 @@ void YahooAccount::slotGotFile( const TQString & who, const TQString & url , l if( m_pendingFileTransfers.empty() ) { - TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), - this, TQT_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), - this, TQT_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); + TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), + this, TQ_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), + this, TQ_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); } m_pendingFileTransfers.append( url ); } @@ -1541,14 +1541,14 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName ); m_fileTransfers.insert( transfer->info().transferId(), transfer ); - TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) ); + TQObject::connect( transfer, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFileTransferResult( TDEIO::Job * )) ); if( m_pendingFileTransfers.empty() ) { - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), - this, TQT_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), - this, TQT_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), + this, TQ_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), + this, TQ_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); } } @@ -1562,10 +1562,10 @@ void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info if( m_pendingFileTransfers.empty() ) { - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), - this, TQT_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), - this, TQT_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), + this, TQ_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), + this, TQ_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); } } @@ -1644,7 +1644,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec { TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", "You have %n unread messages in your Yahoo inbox.", cnt ), TQPixmap() , 0 ), - TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; } @@ -1652,7 +1652,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec { kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl; TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox.

Subject: %2").arg( from ).arg( subject ), - TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQPixmap() , 0 ), TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; } @@ -1859,7 +1859,7 @@ void YahooAccount::slotWebcamReadyForTransmission() if( !m_webcam ) { m_webcam = new YahooWebcam( this ); - TQObject::connect( m_webcam, TQT_SIGNAL(webcamClosing()), this, TQT_SLOT(slotOutgoingWebcamClosing()) ); + TQObject::connect( m_webcam, TQ_SIGNAL(webcamClosing()), this, TQ_SLOT(slotOutgoingWebcamClosing()) ); } m_webcam->startTransmission(); @@ -1988,12 +1988,12 @@ void YahooAccount::slotJoinChatRoom() /* YahooChatSelectorDialog *chatDialog = new YahooChatSelectorDialog( Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_session, TQT_SIGNAL(gotYahooChatCategories( const TQDomDocument & )), chatDialog, - TQT_SLOT(slotSetChatCategories( const TQDomDocument & )) ); - TQObject::connect( m_session, TQT_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )), - chatDialog, TQT_SLOT(slotSetChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) ); - TQObject::connect( chatDialog, TQT_SIGNAL(chatCategorySelected( const Yahoo::ChatCategory & )), - this, TQT_SLOT(slotChatCategorySelected( const Yahoo::ChatCategory & ) ) ); + TQObject::connect( m_session, TQ_SIGNAL(gotYahooChatCategories( const TQDomDocument & )), chatDialog, + TQ_SLOT(slotSetChatCategories( const TQDomDocument & )) ); + TQObject::connect( m_session, TQ_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )), + chatDialog, TQ_SLOT(slotSetChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) ); + TQObject::connect( chatDialog, TQ_SIGNAL(chatCategorySelected( const Yahoo::ChatCategory & )), + this, TQ_SLOT(slotChatCategorySelected( const Yahoo::ChatCategory & ) ) ); m_session->getYahooChatCategories(); if( chatDialog->exec() == TQDialog::Accepted ) @@ -2028,8 +2028,8 @@ void YahooAccount::slotChatJoined( int roomId, int categoryId, const TQString &c if( !m_chatChatSession ) { m_chatChatSession = new YahooChatChatSession( protocol(), myself(), others ); - TQObject::connect( m_chatChatSession, TQT_SIGNAL(closing(Kopete::ChatSession *)), this, - TQT_SLOT(slotLeavChat()) ); + TQObject::connect( m_chatChatSession, TQ_SIGNAL(closing(Kopete::ChatSession *)), this, + TQ_SLOT(slotLeavChat()) ); } m_chatChatSession->removeAllContacts(); m_chatChatSession->setHandle( handle ); diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 6f2ab25d..d6e7fbf1 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -53,19 +53,19 @@ YahooChatSession::YahooChatSession( Kopete::Protocol *protocol, const Kopete::Co setInstance(protocol->instance()); // Add Actions - new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; - new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; - new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; - new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; - new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); + new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQ_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; + new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQ_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; + new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQ_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; + new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQ_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; + new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); YahooContact *c = static_cast( others.first() ); - connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); + connect( c, TQ_SIGNAL( displayPictureChanged() ), this, TQ_SLOT( slotDisplayPictureChanged() ) ); m_image = new TQLabel( 0L, "tde toolbar widget" ); - new KWidgetAction( m_image, i18n( "Yahoo Display Picture" ), 0, this, TQT_SLOT( slotDisplayPictureChanged() ), actionCollection(), "yahooDisplayPicture" ); + new KWidgetAction( m_image, i18n( "Yahoo Display Picture" ), 0, this, TQ_SLOT( slotDisplayPictureChanged() ), actionCollection(), "yahooDisplayPicture" ); if(c->hasProperty(Kopete::Global::Properties::self()->photo().key()) ) { - connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); } else { @@ -131,7 +131,7 @@ void YahooChatSession::slotDisplayPictureChanged() if(w) { //We connected that in the constructor. we don't need to keep this slot active. - disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + disconnect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); TQPtrListIterator it=w->toolBarIterator() ; TDEAction *imgAction=actionCollection()->action("yahooDisplayPicture"); @@ -142,8 +142,8 @@ void YahooChatSession::slotDisplayPictureChanged() { sz=tb->iconSize(); //ipdate if the size of the toolbar change. - disconnect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); - connect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); + disconnect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); + connect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); break; } ++it; diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 3060ed48..0b473fd5 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -42,12 +42,12 @@ YahooConferenceChatSession::YahooConferenceChatSession( const TQString & yahooRo Kopete::ChatSessionManager::self()->registerChatSession( this ); setInstance(protocol->instance()); - connect ( this, TQT_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect ( this, TQ_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); m_yahooRoom = yahooRoom; - m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); + m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQ_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); setXMLFile("yahooconferenceui.rc"); } @@ -100,8 +100,8 @@ void YahooConferenceChatSession::slotInviteOthers() } YahooInviteListImpl *dlg = new YahooInviteListImpl( Kopete::UI::Global::mainWidget() ); - TQObject::connect( dlg, TQT_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), - account(), TQT_SLOT( slotAddInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); + TQObject::connect( dlg, TQ_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), + account(), TQ_SLOT( slotAddInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); dlg->setRoom( m_yahooRoom ); dlg->fillFriendList( buddies ); for( TQPtrList::ConstIterator it = members().begin(); it != members().end(); it++ ) diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 4f93ea3a..3b3f2b85 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -206,11 +206,11 @@ Kopete::ChatSession *YahooContact::manager( Kopete::Contact::CanCreateFlags canC Kopete::ContactPtrList m_them; m_them.append( this ); m_manager = new YahooChatSession( protocol(), account()->myself(), m_them ); - connect( m_manager, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotChatSessionDestroyed() ) ); - connect( m_manager, TQT_SIGNAL( messageSent ( Kopete::Message&, Kopete::ChatSession* ) ), this, TQT_SLOT( slotSendMessage( Kopete::Message& ) ) ); - connect( m_manager, TQT_SIGNAL( myselfTyping( bool) ), this, TQT_SLOT( slotTyping( bool ) ) ); - connect( m_account, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), m_manager, TQT_SLOT( receivedTypingMsg( const TQString&, bool ) ) ); - connect( this, TQT_SIGNAL(displayPictureChanged()), m_manager, TQT_SLOT(slotDisplayPictureChanged())); + connect( m_manager, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotChatSessionDestroyed() ) ); + connect( m_manager, TQ_SIGNAL( messageSent ( Kopete::Message&, Kopete::ChatSession* ) ), this, TQ_SLOT( slotSendMessage( Kopete::Message& ) ) ); + connect( m_manager, TQ_SIGNAL( myselfTyping( bool) ), this, TQ_SLOT( slotTyping( bool ) ) ); + connect( m_account, TQ_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), m_manager, TQ_SLOT( receivedTypingMsg( const TQString&, bool ) ) ); + connect( this, TQ_SIGNAL(displayPictureChanged()), m_manager, TQ_SLOT(slotDisplayPictureChanged())); } return m_manager; @@ -342,7 +342,7 @@ void YahooContact::slotSendMessage( Kopete::Message &message ) void YahooContact::sendFile( const KURL &sourceURL, const TQString &fileName, uint fileSize ) { Kopete::TransferManager::transferManager()->sendFile( sourceURL, fileName, fileSize, - false, this, TQT_SLOT(slotSendFile( const KURL & )) ); + false, this, TQ_SLOT(slotSendFile( const KURL & )) ); } void YahooContact::slotTyping(bool isTyping_ ) @@ -367,7 +367,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_webcamAction ) { m_webcamAction = new TDEAction( i18n( "View &Webcam" ), "webcamreceive", TDEShortcut(), - this, TQT_SLOT( requestWebcam() ), this, "view_webcam" ); + this, TQ_SLOT( requestWebcam() ), this, "view_webcam" ); } if ( isReachable() ) m_webcamAction->setEnabled( true ); @@ -378,7 +378,7 @@ TQPtrList *YahooContact::customContextMenuActions() if( !m_inviteWebcamAction ) { m_inviteWebcamAction = new TDEAction( i18n( "Invite to view your Webcam" ), "webcamsend", TDEShortcut(), - this, TQT_SLOT( inviteWebcam() ), this, "invite_webcam" ); + this, TQ_SLOT( inviteWebcam() ), this, "invite_webcam" ); } if ( isReachable() ) m_inviteWebcamAction->setEnabled( true ); @@ -388,7 +388,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_buzzAction ) { - m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); + m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQ_SLOT( buzzContact() ), this, "buzz_contact"); } if ( isReachable() ) m_buzzAction->setEnabled( true ); @@ -398,7 +398,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_stealthAction ) { - m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); + m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQ_SLOT( stealthContact() ), this, "stealth_contact"); } if ( isReachable() ) m_stealthAction->setEnabled( true ); @@ -408,7 +408,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_inviteConferenceAction ) { - m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); + m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQ_SLOT( inviteConference() ), this, "invite_conference"); } if ( isReachable() ) m_inviteConferenceAction->setEnabled( true ); @@ -418,7 +418,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_profileAction ) { - m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); + m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQ_SLOT( slotUserProfile() ), this, "profile_contact"); } m_profileAction->setEnabled( true ); actionCollection->append( m_profileAction ); @@ -440,7 +440,7 @@ void YahooContact::slotUserInfo() dlg->setData( *m_YABEntry ); dlg->setAccountConnected( m_account->isConnected() ); dlg->show(); - TQObject::connect( dlg, TQT_SIGNAL(saveYABEntry( YABEntry & )), m_account, TQT_SLOT(slotSaveYABEntry( YABEntry & ))); + TQObject::connect( dlg, TQ_SIGNAL(saveYABEntry( YABEntry & )), m_account, TQ_SLOT(slotSaveYABEntry( YABEntry & ))); } void YahooContact::slotUserProfile() @@ -639,19 +639,19 @@ void YahooContact::initWebcamViewer() if ( !m_webcamDialog ) { m_webcamDialog = new YahooWebcamDialog( userId(), Kopete::UI::Global::mainWidget() ); -// TQObject::connect( m_webcamDialog, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( closeWebcamDialog() ) ); +// TQObject::connect( m_webcamDialog, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( closeWebcamDialog() ) ); - TQObject::connect( this, TQT_SIGNAL( signalWebcamClosed( int ) ), - m_webcamDialog, TQT_SLOT( webcamClosed( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( signalWebcamClosed( int ) ), + m_webcamDialog, TQ_SLOT( webcamClosed( int ) ) ); - TQObject::connect( this, TQT_SIGNAL( signalWebcamPaused() ), - m_webcamDialog, TQT_SLOT( webcamPaused() ) ); + TQObject::connect( this, TQ_SIGNAL( signalWebcamPaused() ), + m_webcamDialog, TQ_SLOT( webcamPaused() ) ); - TQObject::connect( this, TQT_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), - m_webcamDialog, TQT_SLOT( newImage( const TQPixmap& ) ) ); + TQObject::connect( this, TQ_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), + m_webcamDialog, TQ_SLOT( newImage( const TQPixmap& ) ) ); - TQObject::connect( m_webcamDialog, TQT_SIGNAL ( closingWebcamDialog ( ) ), - this, TQT_SLOT ( closeWebcamDialog ( ) ) ); + TQObject::connect( m_webcamDialog, TQ_SIGNAL ( closingWebcamDialog ( ) ), + this, TQ_SLOT ( closeWebcamDialog ( ) ) ); } m_webcamDialog->show(); } @@ -673,17 +673,17 @@ void YahooContact::requestWebcam() void YahooContact::closeWebcamDialog() { - TQObject::disconnect( this, TQT_SIGNAL( signalWebcamClosed( int ) ), - m_webcamDialog, TQT_SLOT( webcamClosed( int ) ) ); + TQObject::disconnect( this, TQ_SIGNAL( signalWebcamClosed( int ) ), + m_webcamDialog, TQ_SLOT( webcamClosed( int ) ) ); - TQObject::disconnect( this, TQT_SIGNAL( signalWebcamPaused() ), - m_webcamDialog, TQT_SLOT( webcamPaused( ) ) ); + TQObject::disconnect( this, TQ_SIGNAL( signalWebcamPaused() ), + m_webcamDialog, TQ_SLOT( webcamPaused( ) ) ); - TQObject::disconnect( this, TQT_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), - m_webcamDialog, TQT_SLOT( newImage( const TQPixmap& ) ) ); + TQObject::disconnect( this, TQ_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), + m_webcamDialog, TQ_SLOT( newImage( const TQPixmap& ) ) ); - TQObject::disconnect( m_webcamDialog, TQT_SIGNAL ( closingWebcamDialog ( ) ), - this, TQT_SLOT ( closeWebcamDialog ( ) ) ); + TQObject::disconnect( m_webcamDialog, TQ_SIGNAL ( closingWebcamDialog ( ) ), + this, TQ_SLOT ( closeWebcamDialog ( ) ) ); if( m_receivingWebcam ) m_account->yahooSession()->closeWebcam( contactId() ); m_webcamDialog->delayedDestruct(); diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index 3f66da83..2e6de47c 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -76,7 +76,7 @@ YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *the bool sendPicture = account()->configGroup()->readBoolEntry("sendPicture", false); optionSendBuddyIcon->setChecked( sendPicture ); buttonSelectPicture->setEnabled( sendPicture ); - connect( optionSendBuddyIcon, TQT_SIGNAL( toggled( bool ) ), buttonSelectPicture, TQT_SLOT( setEnabled( bool ) ) ); + connect( optionSendBuddyIcon, TQ_SIGNAL( toggled( bool ) ), buttonSelectPicture, TQ_SLOT( setEnabled( bool ) ) ); editPictureUrl->setText( iconUrl ); if( !iconUrl.isEmpty() ) m_Picture->setPixmap( KURL( iconUrl ).path() ); @@ -86,8 +86,8 @@ YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *the mGlobalIdentity->setChecked( account()->configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) ); } - TQObject::connect(buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister())); - TQObject::connect(buttonSelectPicture, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectPicture())); + TQObject::connect(buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister())); + TQObject::connect(buttonSelectPicture, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectPicture())); optionSendBuddyIcon->setEnabled( account() ); diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index be369973..d2ccb943 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -59,8 +59,8 @@ void YahooVerifyAccount::setUrl( KURL url ) mFile = new KTempFile( locateLocal( "tmp", url.fileName() ) ); mFile->setAutoDelete( true ); TDEIO::TransferJob *transfer = TDEIO::get( url, false, false ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); } void YahooVerifyAccount::slotData( TDEIO::Job */*job*/, const TQByteArray& data ) diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp index 51d7b1bf..9e13bc3c 100644 --- a/kopete/protocols/yahoo/yahoowebcam.cpp +++ b/kopete/protocols/yahoo/yahoowebcam.cpp @@ -35,13 +35,13 @@ YahooWebcam::YahooWebcam( YahooAccount *account ) : TQObject( 0, "yahoo_webcam" m_img = new TQImage(); m_sendTimer = new TQTimer( this ); - connect( m_sendTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sendImage()) ); + connect( m_sendTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sendImage()) ); m_updateTimer = new TQTimer( this ); - connect( m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateImage()) ); + connect( m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateImage()) ); theDialog = new YahooWebcamDialog( "YahooWebcam" ); - connect( theDialog, TQT_SIGNAL(closingWebcamDialog()), this, TQT_SLOT(webcamDialogClosing()) ); + connect( theDialog, TQ_SIGNAL(closingWebcamDialog()), this, TQ_SLOT(webcamDialogClosing()) ); m_devicePool = Kopete::AV::VideoDevicePool::self(); m_devicePool->open(); -- cgit v1.2.1