From 9795d15cda9fa26bfbd90321f774014537f9675b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:47:49 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro (cherry picked from commit 6148e60759606fe8c1d7037956a38b9a4427e8b2) --- kopete/kopete/contactlist/kopetecontactlistview.cpp | 2 +- kopete/kopete/kopetewindow.cpp | 3 +-- kopete/libkopete/kopetepluginmanager.cpp | 2 +- kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp | 2 +- kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/liboscar/client.cpp | 6 ++---- 6 files changed, 7 insertions(+), 10 deletions(-) (limited to 'kopete') diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 53fad813..9678aa5a 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -1676,7 +1676,7 @@ void KopeteContactListView::slotAddContact() Kopete::ContactList::self()->selectedMetaContacts().first(); Kopete::Group *group = Kopete::ContactList::self()->selectedGroups().first(); - Kopete::Account *account = dynamic_cast( TQT_TQOBJECT(const_cast(sender()))->parent() ); + Kopete::Account *account = dynamic_cast( sender()->parent() ); if ( ( metacontact && metacontact->isTemporary() ) || (group && group->type()!=Kopete::Group::Normal ) ) diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index a3983acb..f1e0e1fd 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -968,8 +968,7 @@ void KopeteWindow::setStatusMessage( const TQString & message ) void KopeteWindow::slotBuildStatusMessageMenu() { - TQObject * senderObj = TQT_TQOBJECT(const_cast( sender() )); - m_globalStatusMessageMenu = static_cast( TQT_TQWIDGET(senderObj) ); + m_globalStatusMessageMenu = static_cast( const_cast(sender()) ); m_globalStatusMessageMenu->clear(); // pop up a menu containing the away messages, and a lineedit // see kopeteaway diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 85a0d1fe..986cd84e 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -215,7 +215,7 @@ void PluginManager::slotPluginReadyForUnload() // less clean for plugin authors // FIXME: I don't buy the above argument. Add a Kopete::Plugin::emitReadyForUnload(void), // and make readyForUnload be passed a plugin. - Richard - Plugin *plugin = dynamic_cast( TQT_TQOBJECT(const_cast( sender() ) ) ); + Plugin *plugin = dynamic_cast( const_cast( sender() ) ); kdDebug( 14010 ) << k_funcinfo << plugin->pluginId() << "ready for unload" << endl; if ( !plugin ) { diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 57dca0c0..44b10bbc 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -37,7 +37,7 @@ MeanwhileAddContactPage::MeanwhileAddContactPage( static_cast(_account); if (account->infoPlugin->canProvideMeanwhileId()) { - TQT_BASE_OBJECT_NAME::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), + TQObject::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), TQT_SLOT(slotFindUser())); } else diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 77955782..4e2c90ee 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -106,7 +106,7 @@ MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( slotSetServer2Default(); } - TQT_BASE_OBJECT_NAME::connect(btnServerDefaults, TQT_SIGNAL(clicked()), + TQObject::connect(btnServerDefaults, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetServer2Default())); show(); diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index a500028a..10fec375 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -1127,8 +1127,7 @@ void Client::requestServerRedirect( WORD family, WORD exchange, void Client::haveServerForRedirect( const TQString& host, const TQByteArray& cookie, WORD ) { //nasty sender() usage to get the task with chat room info - TQObject* o = TQT_TQOBJECT(const_cast( sender() )); - ServerRedirectTask* srt = dynamic_cast( o ); + ServerRedirectTask* srt = dynamic_cast( const_cast(sender()) ); //create a new connection and set it up int colonPos = host.find(':'); @@ -1248,8 +1247,7 @@ void Client::determineDisconnection( int code, const TQString& string ) return; //yay for the sender() hack! - TQObject* obj = TQT_TQOBJECT(const_cast( sender() )); - Connection* c = dynamic_cast( obj ); + Connection* c = dynamic_cast( const_cast(sender()) ); if ( !c ) return; -- cgit v1.2.1