From b6cc37b113df5b25e7c10176aad2e9482045e6f9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:41:34 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- ksquirrel/ksquirrel.cpp | 2 +- ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp | 2 +- ksquirrel/sq_filedetailview.cpp | 2 +- ksquirrel/sq_fileiconviewbase.cpp | 2 +- ksquirrel/sq_glview.cpp | 2 +- ksquirrel/sq_glwidget_stuff.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index 5c14ee3..a6030e5 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -227,7 +227,7 @@ void KSquirrel::slotOptions() bool KSquirrel::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mainPage) && e->type() == TQEvent::Show) + if(o == mainPage && e->type() == TQEvent::Show) { // delayed init, hehe... if(waitForShow) diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp index 40ce9ee..9389557 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -996,7 +996,7 @@ void SQ_GLWidget::initAccelsAndMenu() void SQ_GLWidget::slotAccelActivated() { - TDEAction *accel = static_cast(TQT_TQOBJECT(const_cast(sender()))); + TDEAction *accel = static_cast(TQT_TQOBJECT(sender())); TDEShortcut ks = accel->shortcut(); diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp index ce086a5..617cb8f 100644 --- a/ksquirrel/sq_filedetailview.cpp +++ b/ksquirrel/sq_filedetailview.cpp @@ -97,7 +97,7 @@ void SQ_FileDetailView::slotShowToolTip(TQListViewItem *item) bool SQ_FileDetailView::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if(o == viewport() || o == this) { int type = e->type(); diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/ksquirrel/sq_fileiconviewbase.cpp index 6bbbf2f..01433b8 100644 --- a/ksquirrel/sq_fileiconviewbase.cpp +++ b/ksquirrel/sq_fileiconviewbase.cpp @@ -81,7 +81,7 @@ void SQ_FileIconViewBase::slotShowToolTip(TQIconViewItem *item) bool SQ_FileIconViewBase::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if(o == viewport() || o == this) { int type = e->type(); diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp index 8b603d2..24d9343 100644 --- a/ksquirrel/sq_glview.cpp +++ b/ksquirrel/sq_glview.cpp @@ -150,7 +150,7 @@ void SQ_GLView::closeEvent(TQCloseEvent *e) bool SQ_GLView::eventFilter(TQObject *watched, TQEvent *e) { - if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(this)) + if(watched == this) { // stop animation, if SQ_GLView is hidden (animation becomes useless) if(/*e->type() == TQEvent::WindowDeactivate || */e->type() == TQEvent::Hide) diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp index 40ce9ee..9389557 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -996,7 +996,7 @@ void SQ_GLWidget::initAccelsAndMenu() void SQ_GLWidget::slotAccelActivated() { - TDEAction *accel = static_cast(TQT_TQOBJECT(const_cast(sender()))); + TDEAction *accel = static_cast(TQT_TQOBJECT(sender())); TDEShortcut ks = accel->shortcut(); -- cgit v1.2.1