summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-12 18:41:34 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-15 20:58:45 +0900
commit446eea7917d49d7b9b8df04220505ff2dd69d659 (patch)
tree2e762f829e4723bf4938bf323300c4418d7111fd
parent9b19488fbd3a85f6605018332fcb13bc68e5393d (diff)
downloadksquirrel-446eea7917d49d7b9b8df04220505ff2dd69d659.tar.gz
ksquirrel-446eea7917d49d7b9b8df04220505ff2dd69d659.zip
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit b6cc37b113df5b25e7c10176aad2e9482045e6f9)
-rw-r--r--ksquirrel/ksquirrel.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp2
-rw-r--r--ksquirrel/sq_filedetailview.cpp2
-rw-r--r--ksquirrel/sq_fileiconviewbase.cpp2
-rw-r--r--ksquirrel/sq_glview.cpp2
-rw-r--r--ksquirrel/sq_glwidget_stuff.cpp2
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<TDEAction *>(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME *>(sender())));
+ TDEAction *accel = static_cast<TDEAction *>(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<TDEAction *>(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME *>(sender())));
+ TDEAction *accel = static_cast<TDEAction *>(TQT_TQOBJECT(sender()));
TDEShortcut ks = accel->shortcut();