From 829b015f6e55dafa7e4bedc6d456518db51bbe0d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:48:01 +0900 Subject: [PATCH] Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro (cherry picked from commit ca120c61e6281a9f8b89be860a7e975b5384bd07) --- kalarm/lib/spinbox.cpp | 2 +- kmail/headerlistquicksearch.cpp | 2 +- kmail/kmedit.cpp | 2 +- knode/kncomposer.cpp | 2 +- knode/kngroupdialog.cpp | 6 +++--- knode/kngroupselectdialog.cpp | 4 ++-- knotes/knote.cpp | 6 +++--- knotes/knotesapp.cpp | 2 +- korganizer/kdatenavigator.cpp | 2 +- korganizer/koagenda.cpp | 18 +++++++++--------- korganizer/koattendeeeditor.cpp | 2 +- korganizer/koeditorfreebusy.cpp | 2 +- korganizer/multiagendaview.cpp | 6 +++--- korn/kornaccountcfgimpl.cpp | 6 +++--- libtdepim/addresseelineedit.cpp | 6 +++--- libtdepim/kdateedit.cpp | 2 +- libtdepim/kincidencechooser.cpp | 2 +- libtdepim/overlaywidget.cpp | 2 +- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 3a2cffc4..b250b9aa 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -201,7 +201,7 @@ void SpinBox::updateDisplay() */ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) { - if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(editor())) + if (obj == editor()) { int step = 0; bool shift = false; diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index eeb8d797..86027863 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -112,7 +112,7 @@ HeaderListQuickSearch::~HeaderListQuickSearch() bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) { - if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mStatusCombo) ) { + if ( watched == mStatusCombo ) { KMMainWidget *mainWidget = 0; // Travel up the parents list until we find the main widget diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 1fe54648..62cbf6d5 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -412,7 +412,7 @@ void KMEdit::spellerReady( KSpell *spell ) bool KMEdit::eventFilter(TQObject*o, TQEvent* e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) KCursor::autoHideEventFilter(o, e); if (e->type() == TQEvent::KeyPress) diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index a1d09317..43b772e5 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -2011,7 +2011,7 @@ KNComposer::Editor::~Editor() //----------------------------------------------------------------------------- bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) KCursor::autoHideEventFilter(o, e); if (e->type() == TQEvent::KeyPress) diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 8c9a1746..254000f5 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -177,17 +177,17 @@ void KNGroupDialog::setButtonDirection(arrowButton b, arrowDirection d) void KNGroupDialog::slotItemSelected(TQListViewItem *it) { - const TQObject *s=TQT_TQOBJECT(const_cast(sender())); + const TQObject *s=sender(); - if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(subView)) { + if(s==subView) { unsubView->clearSelection(); groupView->clearSelection(); arrowBtn2->setEnabled(false); arrowBtn1->setEnabled(true); setButtonDirection(btn1, left); } - else if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(unsubView)) { + else if(s==unsubView) { subView->clearSelection(); groupView->clearSelection(); arrowBtn1->setEnabled(false); diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 3d137b8a..07f118c8 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -114,9 +114,9 @@ TQString KNGroupSelectDialog::selectedGroups()const void KNGroupSelectDialog::slotItemSelected(TQListViewItem *it) { - const TQObject *s=TQT_TQOBJECT(const_cast(sender())); + const TQObject *s=sender(); - if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(groupView)) { + if(s==groupView) { selView->clearSelection(); arrowBtn2->setEnabled(false); if(it) diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 2a78d718..b73ce29e 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -1339,7 +1339,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return true; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_label) ) + if ( o == m_label ) { TQMouseEvent *e = (TQMouseEvent *)ev; @@ -1379,7 +1379,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return false; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editor) ) { + if ( o == m_editor ) { if ( ev->type() == TQEvent::FocusOut ) { TQFocusEvent *fe = TQT_TQFOCUSEVENT(ev); if ( fe->reason() != TQFocusEvent::Popup && @@ -1398,7 +1398,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) return false; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editor->viewport()) ) + if ( o == m_editor->viewport() ) { if ( m_edit_menu && ev->type() == TQEvent::MouseButtonPress && diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 4590e704..9ad877ff 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -509,7 +509,7 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e ) void KNotesApp::slotShowNote() { // tell the WM to give this note focus - showNote( TQString::fromUtf8( TQT_TQOBJECT(const_cast(sender()))->name() ) ); + showNote( TQString::fromUtf8( sender()->name() ) ); } void KNotesApp::slotWalkThroughNotes() diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 230c992d..918b8958 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -288,7 +288,7 @@ bool KDateNavigator::eventFilter( TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::MouseButtonPress ) { int i; for( i = 0; i < 6; ++i ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mWeeknos[ i ]) ) { + if ( o == mWeeknos[ i ] ) { TQDate weekstart = mDayMatrix->getDate( i * 7 ); emit weekClicked( weekstart ); break; diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index b242c306..7ced83b3 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -396,7 +396,7 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event ) case ( TQEvent::Leave ): if ( !mActionItem ) setCursor( arrowCursor ); - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) ) + if ( object == viewport() ) emit leaveAgenda(); return true; @@ -422,7 +422,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de ) { #ifndef KORG_NODND TQPoint viewportPos; - if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) { + if ( object != viewport() && object != this ) { viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() ); } else { viewportPos = de->pos(); @@ -462,7 +462,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de ) // FIXME: This is a bad hack, as the viewportToContents seems to be off by // 2000 (which is the left upper corner of the viewport). It works correctly // for agendaItems. - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) { + if ( object == this ) { pos = viewportPos + TQPoint( contentsX(), contentsY() ); } else { pos = viewportToContents( viewportPos ); @@ -565,7 +565,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) TQPoint viewportPos; bool accepted=false; if ( ( e->state() & ShiftButton) == ShiftButton ) { - if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) { + if ( object != viewport() ) { viewportPos = ( (TQWidget *) object )->mapToParent( e->pos() ); } else { viewportPos = e->pos(); @@ -579,7 +579,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) } if ( ( e->state() & ControlButton ) == ControlButton ){ - if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) { + if ( object != viewport() ) { viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() ); } else { viewportPos = e->pos(); @@ -597,7 +597,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) { TQPoint viewportPos; - if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) { + if (object != viewport()) { viewportPos = ((TQWidget *)object)->mapToParent(me->pos()); } else { viewportPos = me->pos(); @@ -606,7 +606,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) switch (me->type()) { case TQEvent::MouseButtonPress: // kdDebug(5850) << "koagenda: filtered button press" << endl; - if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) { + if (object != viewport()) { if (me->button() == Qt::RightButton) { mClickedItem = dynamic_cast(object); if (mClickedItem) { @@ -683,7 +683,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) // avoid an offset of a few pixels. Don't ask me why... TQPoint indicatorPos = gridToContents(contentsToGrid( viewportToContents( viewportPos ))); - if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) { + if (object != viewport()) { KOAgendaItem *moveItem = dynamic_cast(object); if (moveItem && !moveItem->incidence()->isReadOnly() ) { if (!mActionItem) @@ -722,7 +722,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) break; } case TQEvent::MouseButtonDblClick: - if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport())) { + if (object == viewport()) { selectItem(0); TQPairp = mCalendarView->viewSubResourceCalendar(); emit newEventSignal( p.first, p.second ); diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index d95618c8..8d831e07 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -537,7 +537,7 @@ void KOAttendeeEditor::declineForMe() bool KOAttendeeEditor::eventFilter(TQObject *watched, TQEvent *ev) { - if ( watched && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mNameEdit) && ev->type() == TQEvent::FocusIn && + if ( watched && watched == mNameEdit && ev->type() == TQEvent::FocusIn && currentAttendee() == 0 ) { addNewAttendee(); } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 88c5414b..7eec3b71 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -983,7 +983,7 @@ void KOEditorFreeBusy::slotOrganizerChanged(const TQString & newOrganizer) bool KOEditorFreeBusy::eventFilter( TQObject *watched, TQEvent *event ) { - if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mGanttView->timeHeaderWidget()) && + if ( watched == mGanttView->timeHeaderWidget() && event->type() >= TQEvent::MouseButtonPress && event->type() <= TQEvent::MouseMove ) { return true; } else { diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index f36109dc..63c559bf 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -464,12 +464,12 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize()) || event->type() == TQEvent::MouseButtonRelease ) { FOREACH_VIEW( agenda ) { - if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) ) + if ( agenda->splitter() == obj->parent() ) mLastMovedSplitter = agenda->splitter(); } - if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->parent()) ) + if ( mLeftSplitter == obj->parent() ) mLastMovedSplitter = mLeftSplitter; - else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->parent()) ) + else if ( mRightSplitter == obj->parent() ) mLastMovedSplitter = mRightSplitter; TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) ); } diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index 7b57d1f6..a6193e2e 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -205,14 +205,14 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) grid->setMargin( 15 ); for( input = _accountinput->first(); input; input = _accountinput->next() ) { - if( input->leftWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->leftWidget()->parent()) ) + if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->parent() ) { grid->addWidget( input->leftWidget(), counter, 0 ); - if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->parent()) ) + if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() ) grid->addWidget( input->rightWidget(), counter, 1 ); ++counter; } else { - if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->parent()) ) + if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->parent() ) { grid->addWidget( input->rightWidget(), counter, 1 ); ++counter; diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 1af06c84..06efda39 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -1037,7 +1037,7 @@ int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int we bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(completionBox()) ) { + if ( obj == completionBox() ) { if ( e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonRelease || @@ -1070,7 +1070,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) } } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) && + if ( ( obj == this ) && ( e->type() == TQEvent::AccelOverride ) ) { TQKeyEvent *ke = TQT_TQKEYEVENT( e ); if ( ke->key() == Key_Up || ke->key() == Key_Down || ke->key() == Key_Tab ) { @@ -1078,7 +1078,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) return true; } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) && + if ( ( obj == this ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::KeyRelease ) && completionBox()->isVisible() ) { TQKeyEvent *ke = TQT_TQKEYEVENT( e ); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 392e53ee..e76a8907 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -246,7 +246,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) { - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(lineEdit()) ) { + if ( object == lineEdit() ) { // We only process the focus out event if the text has changed // since we got focus if ( (event->type() == TQEvent::FocusOut) && mTextChanged ) { diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 8bb72d5c..19d8355b 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1() void KIncidenceChooser::detailsDialogClosed() { - KDialogBase* dialog = static_cast( TQT_TQWIDGET( const_cast(sender()) ) ); + KDialogBase* dialog = static_cast(TQT_TQWIDGET(const_cast(sender()))) ; if ( dialog == mTbL ) mShowDetails1->setText( i18n( "Show details..." ) ); else diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp index 7c72883c..067e2d71 100644 --- a/libtdepim/overlaywidget.cpp +++ b/libtdepim/overlaywidget.cpp @@ -76,7 +76,7 @@ void OverlayWidget::setAlignWidget( TQWidget * w ) bool OverlayWidget::eventFilter( TQObject* o, TQEvent* e) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mAlignWidget) && + if ( o == mAlignWidget && ( e->type() == TQEvent::Move || e->type() == TQEvent::Resize ) ) { reposition(); }