From 5cfda35559d971762794b1c8e294d037c09c63f3 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 12 Aug 2023 18:46:35 +0900
Subject: Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0fc56f21d45249a473d20555ff3071d3b16bee54)
---
 twin/clients/b2/b2client.cpp            | 2 +-
 twin/clients/keramik/keramik.cpp        | 2 +-
 twin/clients/test/test.cpp              | 2 +-
 twin/events.cpp                         | 4 ++--
 twin/geometry.cpp                       | 2 +-
 twin/kcmtwin/twinrules/detectwidget.cpp | 2 +-
 twin/lib/kcommondecoration.cpp          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'twin')

diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 6c81660ee..49391e923 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -1179,7 +1179,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
 
 bool B2Client::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
+    if (o != widget())
 	return false;
     switch (e->type()) {
     case TQEvent::Resize:
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index ded50a9d2..446199fa7 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -1796,7 +1796,7 @@ TQSize KeramikClient::minimumSize() const
 
 bool KeramikClient::eventFilter( TQObject* o, TQEvent* e )
 {
-	if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) )
+	if ( o != widget() )
 		return false;
 
 	switch ( e->type() )
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index e01d1d98e..ebfb00df1 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -100,7 +100,7 @@ TQSize Decoration::minimumSize() const
     
 bool Decoration::eventFilter( TQObject* o, TQEvent* e )
     {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget()))
+    if( o == widget())
         {
         switch( e->type())
             {
diff --git a/twin/events.cpp b/twin/events.cpp
index c24d81c6f..e2e6b8d60 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -1079,7 +1079,7 @@ int qtToX11State( TQt::ButtonState state )
 // for the decoration window cannot be (easily) intercepted as X11 events
 bool Client::eventFilter( TQObject* o, TQEvent* e )
     {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget))
+    if (o == shadowWidget)
         {
         if (e->type() == TQEvent::MouseButtonRelease)
             {
@@ -1291,7 +1291,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
             }
         }
     if( decoration == NULL
-        || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget()))
+        || o != decoration->widget())
         return false;
     if( e->type() == TQEvent::MouseButtonPress )
         {
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 562e3cda0..2f9988e6b 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -2288,7 +2288,7 @@ class EatAllPaintEvents
     {
     protected:
         virtual bool eventFilter( TQObject* o, TQEvent* e )
-            { return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); }
+            { return e->type() == TQEvent::Paint && o != geometryTip; }
     };
 
 static EatAllPaintEvents* eater = 0;
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp
index a0f017f7d..9dbb29441 100644
--- a/twin/kcmtwin/twinrules/detectwidget.cpp
+++ b/twin/kcmtwin/twinrules/detectwidget.cpp
@@ -170,7 +170,7 @@ void DetectDialog::selectWindow()
 
 bool DetectDialog::eventFilter( TQObject* o, TQEvent* e )
     {
-    if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) )
+    if( o != grabber )
         return false;
     if( e->type() != TQEvent::MouseButtonRelease )
         return false;
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 0ada039b0..e1c74d5bc 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -844,7 +844,7 @@ void KCommonDecoration::updateWindowShape()
 
 bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e )
 {
-    if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
+    if( o != widget())
         return false;
     switch( e->type())
     {
-- 
cgit v1.2.1