From 5cfda35559d971762794b1c8e294d037c09c63f3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:46:35 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro (cherry picked from commit 0fc56f21d45249a473d20555ff3071d3b16bee54) --- konqueror/konq_combo.cpp | 2 +- konqueror/konq_frame.cpp | 4 ++-- konqueror/konq_mainwindow.cpp | 2 +- konqueror/konq_view.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'konqueror') diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index 850859b58..c1cbe734b 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -396,7 +396,7 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always // jumps to the next whitespace. TQLineEdit *edit = lineEdit(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) { + if ( o == edit ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { TQKeyEvent *e = TQT_TQKEYEVENT( ev ); diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index 0acf39b49..7a620f0fd 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -173,7 +173,7 @@ void KonqFrameStatusBar::splitFrameMenu() bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress) + if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress) { emit clicked(); update(); @@ -181,7 +181,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) splitFrameMenu(); return true; } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange ) + else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange ) { unsetPalette(); updateActiveStatus(); diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index 770678c4e..2880fad8a 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -3462,7 +3462,7 @@ void KonqMainWindow::slotClearComboHistory() bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) { if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) && - m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) ) + m_combo && m_combo->lineEdit() == obj ) { //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl; diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 9f7bef4d8..5a7ea1244 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) if ( !m_pPart ) return false; // kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl; - if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) + if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() ) { TQDragEnterEvent *ev = static_cast( e ); @@ -1277,7 +1277,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) delete children; } } - else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) + else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() ) { TQDropEvent *ev = static_cast( e ); -- cgit v1.2.1