From a7ea84c97639f635d798348432f355e3ac496a1d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:44:08 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- lib/kofficeui/KoPartSelectAction.cpp | 2 +- lib/kofficeui/KoTooluButton.cpp | 2 +- lib/kofficeui/ttdetoolbarbutton.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/kofficeui') diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index 2077b31d..e5aaf73c 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -64,7 +64,7 @@ void KoPartSelectAction::init() // Called when selecting a part void KoPartSelectAction::slotActionActivated() { - TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast(sender()))->name() ); + TQString servName = TQString::fromLatin1( sender()->name() ); KService::Ptr serv = KService::serviceByName( servName ); m_documentEntry = KoDocumentEntry( serv ); emit activated(); diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 0d24cd16..4ede56d9 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -809,7 +809,7 @@ void KoToolButton::drawButton(TQPainter *_painter) bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_popup) ) { + if ( o == m_popup ) { if ( e->type() == TQEvent::MouseButtonPress ) if ( hitArrow( mapFromGlobal( TQT_TQMOUSEEVENT( e )->globalPos() ) ) ) { kdDebug() << "KoToolButton::eventFilter-------------->" << endl; diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 6fed1f48..6aaab739 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -314,7 +314,7 @@ void TTDEToolBarButton::enterEvent(TQEvent *) bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if ( o == this ) if (ev->type() == TQEvent::MouseButtonPress && d->m_popup && d->m_isPopup ) { if (!d->m_isToggle) { d->m_arrowPressed = arrowPressed( mapFromGlobal(TQCursor::pos()) ); @@ -323,7 +323,7 @@ bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) } } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_popup)) { + if ( o == d->m_popup) { switch (ev->type()) { case TQEvent::Show: -- cgit v1.2.1