From a7ea84c97639f635d798348432f355e3ac496a1d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:44:08 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- kivio/kiviopart/kivio_stackbar.cpp | 2 +- kivio/kiviopart/ui/kivio_birdeye_panel.cpp | 10 +++++----- kivio/kiviopart/ui/kivio_layer_panel.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kivio') diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 64fa96bf..94b37ae3 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -45,7 +45,7 @@ KivioStackBar::~KivioStackBar() void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) { - if (TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this)) { + if (w->parent() != this) { w->reparent(this,TQPoint(0,0)); } diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 0d5fc9d1..ba1e9cd5 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -84,21 +84,21 @@ void KivioBirdEyePanel::slotUpdateView(KivioPage* page) bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Show) { + if (o == canvas && ev->type() == TQEvent::Show) { updateView(); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Resize) { + if (o == canvas && ev->type() == TQEvent::Resize) { m_buffer->resize(canvas->size()); slotUpdateView(m_pView->activePage()); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Paint) { + if (o == canvas && ev->type() == TQEvent::Paint) { updateView(); return true; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseMove) { + if (o == canvas && ev->type() == TQEvent::MouseMove) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); if (me->state() == Qt::LeftButton) handleMouseMoveAction(me->pos()); @@ -109,7 +109,7 @@ bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) return true; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseButtonPress) { + if (o == canvas && ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); if (me->button() == Qt::LeftButton) handleMousePress(me->pos()); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 8e5d9fc4..f1cccd78 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -98,7 +98,7 @@ KivioLayerPanel::~KivioLayerPanel() bool KivioLayerPanel::eventFilter(TQObject* o, TQEvent* ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(list) && (ev->type() == TQEvent::LayoutHint || ev->type() == TQEvent::Resize)) { + if (o == list && (ev->type() == TQEvent::LayoutHint || ev->type() == TQEvent::Resize)) { int s = list->width() - 2*(list->margin() + list->lineWidth()); s -= list->header()->sectionSize(0); s -= list->header()->sectionSize(1); -- cgit v1.2.1