From c0f59ca3de54666e024e9d54f4742f9230319aee Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:46:09 +0900 Subject: [PATCH] Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro (cherry picked from commit 9f59252f1b1d8a5f0ab9df3850552385f61aee55) --- konq-plugins/babelfish/plugin_babelfish.cpp | 56 +++++++++---------- konq-plugins/domtreeviewer/domtreeview.cpp | 8 +-- konq-plugins/rellinks/plugin_rellinks.cpp | 2 +- konq-plugins/searchbar/searchbar.cpp | 2 +- .../sidebar/metabar/src/serviceloader.cpp | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index 834ca5c..c95dd7e 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -224,7 +224,7 @@ void PluginBabelFish::translateURL() // Select engine TDEConfig cfg( "translaterc", true ); - TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast(sender()))->name(), "babelfish" ); + TQString engine = cfg.readEntry( sender()->name(), "babelfish" ); // Get URL TDEHTMLPart *part = dynamic_cast(parent()); @@ -262,33 +262,33 @@ void PluginBabelFish::translateURL() TQString query; if( engine == "freetranslation" ) { query = "sequence=core&Submit=FREE Translation&language="; - if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_es" ) ) + if( sender()->name() == TQString( "en_es" ) ) query += "English/Spanish"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_de" ) ) + else if( sender()->name() == TQString( "en_de" ) ) query += "English/German"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_it" ) ) + else if( sender()->name() == TQString( "en_it" ) ) query += "English/Italian"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_nl" ) ) + else if( sender()->name() == TQString( "en_nl" ) ) query += "English/Dutch"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_pt" ) ) + else if( sender()->name() == TQString( "en_pt" ) ) query += "English/Portuguese"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_no" ) ) + else if( sender()->name() == TQString( "en_no" ) ) query += "English/Norwegian"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_zh" ) ) + else if( sender()->name() == TQString( "en_zh" ) ) query += "English/SimplifiedChinese"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_zhTW" ) ) + else if( sender()->name() == TQString( "en_zhTW" ) ) query += "English/TraditionalChinese"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "es_en" ) ) + else if( sender()->name() == TQString( "es_en" ) ) query += "Spanish/English"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "fr_en" ) ) + else if( sender()->name() == TQString( "fr_en" ) ) query += "French/English"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "de_en" ) ) + else if( sender()->name() == TQString( "de_en" ) ) query += "German/English"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "it_en" ) ) + else if( sender()->name() == TQString( "it_en" ) ) query += "Italian/English"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "nl_en" ) ) + else if( sender()->name() == TQString( "nl_en" ) ) query += "Dutch/English"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "pt_en" ) ) + else if( sender()->name() == TQString( "pt_en" ) ) query += "Portuguese/English"; else // Should be en_fr query += "English/French"; @@ -313,21 +313,21 @@ void PluginBabelFish::translateURL() } else if( engine == "reverso" ) { result = KURL( "http://www.reverso.net/url/frame.asp" ); query = "autotranslate=on&templates=0&x=0&y=0&directions="; - if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "de_fr" ) ) + if( sender()->name() == TQString( "de_fr" ) ) query += "524292"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "fr_en" ) ) + else if( sender()->name() == TQString( "fr_en" ) ) query += "65544"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "fr_de" ) ) + else if( sender()->name() == TQString( "fr_de" ) ) query += "262152"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "de_en" ) ) + else if( sender()->name() == TQString( "de_en" ) ) query += "65540"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_de" ) ) + else if( sender()->name() == TQString( "en_de" ) ) query += "262145"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_es" ) ) + else if( sender()->name() == TQString( "en_es" ) ) query += "2097153"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "es_en" ) ) + else if( sender()->name() == TQString( "es_en" ) ) query += "65568"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "fr_es" ) ) + else if( sender()->name() == TQString( "fr_es" ) ) query += "2097160"; else // "en_fr" query += "524289"; @@ -336,20 +336,20 @@ void PluginBabelFish::translateURL() } else if( engine == "tsail" ) { result = KURL( "http://www.t-mail.com/cgi-bin/tsail" ); query = "sail=full&lp="; - if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "zhTW_en" ) ) + if( sender()->name() == TQString( "zhTW_en" ) ) query += "tw-en"; - else if( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "en_zhTW" ) ) + else if( sender()->name() == TQString( "en_zhTW" ) ) query += "en-tw"; else { - query += TQT_TQOBJECT(const_cast(sender()))->name(); + query += sender()->name(); query[15] = '-'; } query += totrans; } else if( engine == "voila" ) { result = KURL( "http://trans.voila.fr/voila" ); query = "systran_id=Voila-fr&systran_lp="; - query += TQT_TQOBJECT(const_cast(sender()))->name(); + query += sender()->name(); if ( part->hasSelection() ) query += "&systran_charset=utf-8&systran_text="; else @@ -359,7 +359,7 @@ void PluginBabelFish::translateURL() // Using the altavista babelfish engine result = KURL( "http://babelfish.altavista.com/babelfish/tr" ); query = "lp="; - query += TQT_TQOBJECT(const_cast(sender()))->name(); + query += sender()->name(); if ( part->hasSelection() ) query += "&text="; else diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 6735ca2..55a95d0 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -140,12 +140,12 @@ bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) TQKeyEvent *ke = TQT_TQKEYEVENT(e); kdDebug(90180) << " acceloverride " << ke->key() << " o " << o->name() << endl; - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_listView)) { // DOM tree + if (o == m_listView) { // DOM tree KKey ks = mainWindow()->deleteNodeAction()->shortcut().seq(0).key(0); if (ke->key() == ks.keyCodeQt()) return true; - } else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(nodeAttributes)) { + } else if (o == nodeAttributes) { KKey ks = mainWindow()->deleteAttributeAction()->shortcut().seq(0).key(0); if (ke->key() == ks.keyCodeQt()) return true; @@ -155,14 +155,14 @@ bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) } else if (e->type() == TQEvent::FocusIn) { kdDebug(90180) << " focusin o " << o->name() << endl; - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) { + if (o != this) { focused_child = o; } } else if (e->type() == TQEvent::FocusOut) { kdDebug(90180) << " focusout o " << o->name() << endl; - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) { + if (o != this) { focused_child = 0; } diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 4be8767..8b646c3 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -199,7 +199,7 @@ bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) { if (watched == 0 || event == 0) return false; - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_view)) + if (watched == m_view) { switch (event->type()) { diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index cf2809c..0752ada 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -132,7 +132,7 @@ TQChar delimiter() bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e) { - if( TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_searchCombo->lineEdit()) && e->type() == TQEvent::KeyPress ) + if( o==m_searchCombo->lineEdit() && e->type() == TQEvent::KeyPress ) { TQKeyEvent *k = (TQKeyEvent *)e; TQString text = k->text(); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 3ff2e88..06a913a 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -188,7 +188,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int void ServiceLoader::runAction() { - KDEDesktopMimeType::Service s = services[TQT_TQOBJECT(const_cast(sender()))->name()]; + KDEDesktopMimeType::Service s = services[sender()->name()]; if(!s.isEmpty()){ KDEDesktopMimeType::executeService(urlList, s); }