From 2ceb4caa0bdb7828fdc87dca7b5a719279e23398 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:48:13 +0900 Subject: [PATCH] Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- kbabel/commonui/projectprefwidgets.cpp | 4 ++-- kbabel/kbabeldict/dictchooser.cpp | 2 +- kbabel/kbabeldict/kbabeldictbox.cpp | 4 ++-- kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp | 2 +- kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp | 2 +- kompare/libdiff2/komparemodellist.cpp | 4 ++-- scheck/scheck.cpp | 2 +- tdecachegrind/tdecachegrind/toplevel.cpp | 2 +- umbrello/umbrello/codegenerators/cppcodegenerationform.cpp | 2 +- umbrello/umbrello/dialogs/codegenerationoptionspage.cpp | 2 +- umbrello/umbrello/kplayerslideraction.cpp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 8ecc12db..2b5becb3 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -571,12 +571,12 @@ bool IdentityPreferences::eventFilter(TQObject *o, TQEvent *e) TQString mail=url.path(); bool handled=false; - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_mailEdit)) + if(o == _mailEdit) { handled=true; _mailEdit->setText(mail); } - else if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_listEdit)) + else if(o == _listEdit) { handled=true; _listEdit->setText(mail); diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index ae3f506a..bcd1fcbc 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -261,7 +261,7 @@ bool DictChooser::eventFilter(TQObject *object, TQEvent *event) { if(event->type() == TQEvent::FocusIn) { - if(TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(selectedBox)) + if(object==selectedBox) { int i = selectedBox->currentItem(); selectedBox->setSelected(i,true); diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 5abd7215..bb0b108c 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -1534,7 +1534,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal) void KBabelDictBox::destroyConfigDialog() { - const TQObject *obj = TQT_TQOBJECT(const_cast(sender())); + const TQObject *obj = sender(); if(obj && obj->inherits("KDialogBase")) { KDialogBase *dialog = (KDialogBase*)obj; @@ -1616,7 +1616,7 @@ bool KBabelDictBox::eventFilter(TQObject *o, TQEvent *e) return true; } } - else if(e->type() == TQEvent::Resize && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(resultListView)) + else if(e->type() == TQEvent::Resize && o == resultListView) { if(resultListView->height() < 2) { diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index abf21ae2..9d1f6440 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -1204,7 +1204,7 @@ void PoCompendium::registerData() void PoCompendium::removeData() { - const TQObject *s=TQT_TQOBJECT(const_cast(sender())); + const TQObject *s=sender(); if(s && s->inherits("CompendiumData")) { const CompendiumData *d=static_cast(s); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 7d7450f3..6ce92e84 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -965,7 +965,7 @@ void TmxCompendium::registerData() void TmxCompendium::removeData() { - const TQObject *s=TQT_TQOBJECT(const_cast(sender())); + const TQObject *s=sender(); if(s && s->inherits("TmxCompendiumData")) { const TmxCompendiumData *d=static_cast(s); diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 11171ade..7691536c 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -633,7 +633,7 @@ void KompareModelList::slotSelectionChanged( const Diff2::DiffModel* model, cons // This method will signal all the other objects about a change in selection, // it will emit setSelection( const DiffModel*, const Difference* ) to all who are connected kdDebug(8101) << "KompareModelList::slotSelectionChanged( " << model << ", " << diff << " )" << endl; - kdDebug(8101) << "Sender is : " << TQT_TQOBJECT(const_cast(sender()))->className() << endl; + kdDebug(8101) << "Sender is : " << sender()->className() << endl; // kdDebug(8101) << kdBacktrace() << endl; m_selectedModel = const_cast(model); @@ -668,7 +668,7 @@ void KompareModelList::slotSelectionChanged( const Diff2::Difference* diff ) // This method will emit setSelection( const Difference* ) to whomever is listening // when for instance in kompareview the selection has changed kdDebug(8101) << "KompareModelList::slotSelectionChanged( " << diff << " )" << endl; - kdDebug(8101) << "Sender is : " << TQT_TQOBJECT(const_cast(sender()))->className() << endl; + kdDebug(8101) << "Sender is : " << sender()->className() << endl; m_selectedDifference = const_cast(diff); diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 9dc2fa4a..ee8a8331 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -2629,7 +2629,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat button->repaint( false ); } else if ( (event->type() == TQEvent::Leave) && - (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { + (object == hoverWidget) ) { hoverWidget = 0L; button->repaint( false ); } diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp index e83457fd..82bdb8c3 100644 --- a/tdecachegrind/tdecachegrind/toplevel.cpp +++ b/tdecachegrind/tdecachegrind/toplevel.cpp @@ -1469,7 +1469,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i) // no need to select same item a 2nd time... if (_traceItemDelayed == i) return; _traceItemDelayed = i; - _lastSender = TQT_TQOBJECT(const_cast(sender())); + _lastSender = sender(); kdDebug() << "Selected " << (i ? i->prettyName() : "(none)") << endl; diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp index 136f57bc..3a251802 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp @@ -70,7 +70,7 @@ CPPCodeGenerationForm::~CPPCodeGenerationForm() void CPPCodeGenerationForm::browseClicked() { - TQString button = TQT_TQOBJECT(const_cast(sender()))->name(); + TQString button = sender()->name(); TQString file = KFileDialog::getOpenFileName( TQString(), "*.h", this, "Get Header File"); if(file.isEmpty()) diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index d0cb73f2..6aff2b8f 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -171,7 +171,7 @@ void CodeGenerationOptionsPage::setDefaults() { void CodeGenerationOptionsPage::browseClicked() { - TQString button = TQT_TQOBJECT(const_cast(sender()))->name(); + TQString button = sender()->name(); TQString dir = KFileDialog::getExistingDirectory(); if(dir.isEmpty()) return; diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 23c90b41..767aae23 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -213,7 +213,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) //Q_ASSERT (isPlugged()); //Q_ASSERT (widget -> inherits ("TDEToolBar")); KWidgetAction::unplug (widget); - if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> parent()) ) + if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) return; //TDEToolBar* toolbar = (TDEToolBar*) widget; disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));