diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-12 18:47:26 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-18 17:09:32 +0900 |
commit | 09e466f879ed6e5b17980110eec2cc8db1b4f914 (patch) | |
tree | cbe99eab52f3be3b60af8104d9809da63f9ab6f2 /tdeui/qxembed.cpp | |
parent | 34a191d96f3f9223b8c71da76ad6d8f3c2c9863d (diff) | |
download | tdelibs-09e466f879ed6e5b17980110eec2cc8db1b4f914.tar.gz tdelibs-09e466f879ed6e5b17980110eec2cc8db1b4f914.zip |
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 48b07a0ff120e8b4479bcac912d8a8f043e22ae4)
Diffstat (limited to 'tdeui/qxembed.cpp')
-rw-r--r-- | tdeui/qxembed.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 6ba25fff7..9a31d68e1 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -310,7 +310,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // active and has just been given the Qt focus (L0614) or // because the widget already had the Qt focus and just became // active (L0615). - if ( TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) && + if ( tqApp->focusWidget() == o && ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) { TQFocusEvent* fe = (TQFocusEvent*) e; if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse || @@ -344,7 +344,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::KeyPress: - if (TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) && + if (tqApp->focusWidget() == o && ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) { // L0620: The following code replaces the Qt code that // handles focus focus changes with the tab key. See the @@ -810,7 +810,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::WindowActivate: - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) { + if ( o == topLevelWidget() ) { // L1310: Qt thinks the application window has just been activated. // Make sure the X11 focus is on the focus proxy window. See L0686. if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) @@ -826,7 +826,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::WindowDeactivate: - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) { + if ( o == topLevelWidget() ) { if (d->xplain) // L1321: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -838,9 +838,9 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) case TQEvent::Move: { TQWidget* pos = this; - while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(topLevelWidget())) + while( pos != o && pos != topLevelWidget()) pos = pos->parentWidget(); - if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { + if( pos == o ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. TQPoint globalPos = mapToGlobal(TQPoint(0,0)); |