From e14ad764e72a351b46a7eb027da5c9eb476f532c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 21:15:30 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 2a35cd2f709b2d6418b70f3ef999f204d1c48dc0) --- src/otrguiclient.cpp | 18 +++++++++--------- src/otrlchatinterface.cpp | 2 +- src/otrplugin.cpp | 22 +++++++++++----------- src/otrpreferences.cpp | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/otrguiclient.cpp b/src/otrguiclient.cpp index 48dc193..c7a2b92 100644 --- a/src/otrguiclient.cpp +++ b/src/otrguiclient.cpp @@ -48,24 +48,24 @@ OtrGUIClient::OtrGUIClient( Kopete::ChatSession *parent, const char *name ) setInstance( OTRPlugin::plugin()->instance() ); connect( OTRPlugin::plugin(), - TQT_SIGNAL( destroyed( TQObject * ) ), this, - TQT_SLOT( deleteLater() ) + TQ_SIGNAL( destroyed( TQObject * ) ), this, + TQ_SLOT( deleteLater() ) ); - connect(this, TQT_SIGNAL( signalOtrChatsession(Kopete::ChatSession*, bool) ), OTRPlugin::plugin(), TQT_SLOT(slotEnableOtr(Kopete::ChatSession*, bool))); + connect(this, TQ_SIGNAL( signalOtrChatsession(Kopete::ChatSession*, bool) ), OTRPlugin::plugin(), TQ_SLOT(slotEnableOtr(Kopete::ChatSession*, bool))); - connect( OTRPlugin::plugin(), TQT_SIGNAL( goneSecure( Kopete::ChatSession *, int ) ), - this, TQT_SLOT( encryptionEnabled( Kopete::ChatSession *, int ) ) ); + connect( OTRPlugin::plugin(), TQ_SIGNAL( goneSecure( Kopete::ChatSession *, int ) ), + this, TQ_SLOT( encryptionEnabled( Kopete::ChatSession *, int ) ) ); - connect( this, TQT_SIGNAL( signalVerifyFingerprint( Kopete::ChatSession * ) ), OTRPlugin::plugin(), TQT_SLOT(slotVerifyFingerprint( Kopete::ChatSession * )) ); + connect( this, TQ_SIGNAL( signalVerifyFingerprint( Kopete::ChatSession * ) ), OTRPlugin::plugin(), TQ_SLOT(slotVerifyFingerprint( Kopete::ChatSession * )) ); m_manager = parent; otrActionMenu = new TDEActionMenu(i18n("OTR Settings"),"otr_disabled", actionCollection(), "otr_settings"); otrActionMenu->setDelayed( false ); - actionEnableOtr = new TDEAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQT_SLOT(slotEnableOtr()),actionCollection(), "enable_otr"); - actionDisableOtr = new TDEAction(i18n("End OTR session"), "otr_disabled",0, this,TQT_SLOT(slotDisableOtr()), actionCollection(), "disable_otr"); - actionVerifyFingerprint = new TDEAction(i18n("Authenticate Contact"), "signature",0, this,TQT_SLOT(slotVerifyFingerprint()), actionCollection(), "verify_fingerprint"); + actionEnableOtr = new TDEAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQ_SLOT(slotEnableOtr()),actionCollection(), "enable_otr"); + actionDisableOtr = new TDEAction(i18n("End OTR session"), "otr_disabled",0, this,TQ_SLOT(slotDisableOtr()), actionCollection(), "disable_otr"); + actionVerifyFingerprint = new TDEAction(i18n("Authenticate Contact"), "signature",0, this,TQ_SLOT(slotVerifyFingerprint()), actionCollection(), "verify_fingerprint"); otrActionMenu->insert(actionEnableOtr); otrActionMenu->insert(actionDisableOtr); diff --git a/src/otrlchatinterface.cpp b/src/otrlchatinterface.cpp index 74e1c92..3830a66 100644 --- a/src/otrlchatinterface.cpp +++ b/src/otrlchatinterface.cpp @@ -587,7 +587,7 @@ OtrlChatInterface::OtrlChatInterface(){ unsigned int interval = otrl_message_poll_get_default_interval(userstate); forwardSecrecyTimerStart(interval); - connect(&m_forwardSecrecyTimer, SIGNAL(timeout()), this, SLOT(otrlMessagePoll())); + connect(&m_forwardSecrecyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(otrlMessagePoll())); #endif // HAVE_LIBOTR_0400 } diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index a78cfd5..83dc502 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -68,14 +68,14 @@ OTRPlugin::OTRPlugin( TDEInstance *instance, TQObject *parent, const char *name, m_inboundHandler = new OtrMessageHandlerFactory(this); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToSend( Kopete::Message & ) ), - TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); -// connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), -// this, TQT_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToSend( Kopete::Message & ) ), + TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); +// connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ), +// this, TQ_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), - this, TQT_SLOT( slotNewChatSessionWindow( Kopete::ChatSession * ) ) ); - TQObject::connect( this, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), + this, TQ_SLOT( slotNewChatSessionWindow( Kopete::ChatSession * ) ) ); + TQObject::connect( this, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); @@ -124,8 +124,8 @@ OTRPlugin::OTRPlugin( TDEInstance *instance, TQObject *parent, const char *name, fpfingerprintsbup.close(); kdDebug() << "Waiting for accounts to update keyfile format" << endl; - connect( Kopete::AccountManager::self(), TQT_SIGNAL( accountRegistered( Kopete::Account * ) ), - this, TQT_SLOT( accountReady( Kopete::Account * ) ) ); + connect( Kopete::AccountManager::self(), TQ_SIGNAL( accountRegistered( Kopete::Account * ) ), + this, TQ_SLOT( accountReady( Kopete::Account * ) ) ); } // Checking file Permissions @@ -145,8 +145,8 @@ OTRPlugin::OTRPlugin( TDEInstance *instance, TQObject *parent, const char *name, otrPolicyMenu->setItems( policies ); otrPolicyMenu->popupMenu()->insertSeparator( 1 ); otrPolicyMenu->setEnabled( false ); - connect( otrPolicyMenu, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotSetPolicy() ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) ); + connect( otrPolicyMenu, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotSetPolicy() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactSelected( bool ) ), this, TQ_SLOT( slotSelectionChanged( bool ) ) ); setXMLFile( "otrui.rc" ); diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index b88c602..c0d1048 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -76,12 +76,12 @@ OTRPreferences::OTRPreferences(TQWidget *parent, const char* /*name*/, const TQS otrlConfInterface = new OtrlConfInterface( preferencesDialog ); - connect( preferencesDialog->btGenFingerprint, TQT_SIGNAL(clicked()), TQT_SLOT(generateFingerprint())); - connect( preferencesDialog->cbKeys, TQT_SIGNAL(activated(int)), TQT_SLOT(showPrivFingerprint(int))); - connect( preferencesDialog->btVerify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyFingerprint())); - connect( preferencesDialog->twSettings, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(fillFingerprints())); - connect( preferencesDialog->tbFingerprints, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(updateButtons(int, int))); - connect( preferencesDialog->btForget, TQT_SIGNAL( clicked() ), TQT_SLOT( forgetFingerprint() ) ); + connect( preferencesDialog->btGenFingerprint, TQ_SIGNAL(clicked()), TQ_SLOT(generateFingerprint())); + connect( preferencesDialog->cbKeys, TQ_SIGNAL(activated(int)), TQ_SLOT(showPrivFingerprint(int))); + connect( preferencesDialog->btVerify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyFingerprint())); + connect( preferencesDialog->twSettings, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(fillFingerprints())); + connect( preferencesDialog->tbFingerprints, TQ_SIGNAL(currentChanged(int, int)), TQ_SLOT(updateButtons(int, int))); + connect( preferencesDialog->btForget, TQ_SIGNAL( clicked() ), TQ_SLOT( forgetFingerprint() ) ); int index = 0; int accountnr = 0; -- cgit v1.2.3