From 8aea8afbc5fcc3bfd0d6234bf91436cbb290ed43 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Nov 2023 21:30:28 +0900 Subject: Replace 'Event' #define strings Signed-off-by: Michele Calgaro --- kdesktop/desktop.cpp | 4 ++-- kdesktop/kdiconview.cpp | 2 +- khelpcenter/view.cpp | 2 +- kicker/applets/clock/clock.cpp | 2 +- kicker/applets/lockout/lockout.cpp | 2 +- kicker/applets/systemtray/systemtrayapplet.cpp | 6 +++--- kicker/kicker/buttons/knewbutton.cpp | 2 +- kicker/kicker/core/applethandle.cpp | 4 ++-- kicker/kicker/core/container_button.cpp | 2 +- kicker/kicker/core/container_extension.cpp | 6 +++--- kicker/kicker/ui/addapplet.cpp | 4 ++-- kicker/kicker/ui/k_new_mnu.cpp | 6 +++--- kicker/libkicker/panelbutton.cpp | 6 +++--- kicker/taskbar/taskcontainer.cpp | 2 +- konqueror/konq_combo.cpp | 2 +- konqueror/konq_frame.cpp | 4 ++-- konqueror/konq_mainwindow.cpp | 2 +- konqueror/konq_view.cpp | 8 ++++---- konsole/konsole/TEWidget.cpp | 10 +++++----- konsole/konsole/konsole.cpp | 6 +++--- tdm/kfrontend/themer/tdmthemer.cpp | 8 ++++---- twin/clients/b2/b2client.cpp | 12 ++++++------ twin/clients/keramik/keramik.cpp | 10 +++++----- twin/clients/test/test.cpp | 2 +- twin/events.cpp | 10 +++++----- twin/kcmtwin/twinrules/detectwidget.cpp | 2 +- twin/lib/kcommondecoration.cpp | 10 +++++----- 27 files changed, 68 insertions(+), 68 deletions(-) diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp index 52e0d0c4a..989d07d73 100644 --- a/kdesktop/desktop.cpp +++ b/kdesktop/desktop.cpp @@ -79,13 +79,13 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); KRootWm::self()->mousePressed( me->globalPos(), me->button() ); return true; } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent *we = TQT_TQWHEELEVENT(e); + TQWheelEvent *we = static_cast(e); emit wheelRolled(we->delta()); return true; } diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp index 391fe228d..00fa59bf8 100644 --- a/kdesktop/kdiconview.cpp +++ b/kdesktop/kdiconview.cpp @@ -676,7 +676,7 @@ void KDIconView::wheelEvent( TQWheelEvent* e ) TQIconViewItem *item = findItem( e->pos() ); if ( !item ) { - TQWheelEvent *we = TQT_TQWHEELEVENT(e); + TQWheelEvent *we = static_cast(e); if ( we->state() == ControlButton ) { diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 725ce0455..f7e5940fb 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -329,7 +329,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e ) htmlDocument().links().length() == 0 ) return TDEHTMLPart::eventFilter( o, e ); - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast( e ); if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) { // If we're on the first page, it does not make sense to go back. if ( baseURL().path().endsWith( "/index.html" ) ) diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index c4fd6476a..131ce7482 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -1678,7 +1678,7 @@ bool ClockApplet::eventFilter( TQObject *o, TQEvent *e ) if (( o == _clock->widget() || o == _date || o == _dayOfWeek) && e->type() == TQEvent::MouseButtonPress ) { - mousePressEvent(TQT_TQMOUSEEVENT(e) ); + mousePressEvent(static_cast(e) ); return true; } diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index abe34c978..800c9f8a6 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -193,7 +193,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) TDEConfig *conf = config(); conf->setGroup("lockout"); - TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent *me = static_cast( e ); if( me->button() == TQt::RightButton ) { if( o == lockButton ) diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 25a6de7de..2985e1915 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -838,11 +838,11 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) TQPoint p; if (e->type() == TQEvent::ContextMenu) { - p = TQT_TQCONTEXTMENUEVENT(e)->globalPos(); + p = static_cast(e)->globalPos(); } else if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if (me->button() == TQt::RightButton) { p = me->globalPos(); @@ -855,7 +855,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), this, TQT_SLOT(configure())); - contextMenu->exec(TQT_TQCONTEXTMENUEVENT(e)->globalPos()); + contextMenu->exec(static_cast(e)->globalPos()); delete contextMenu; return true; diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 54e91b97d..adbef9dfc 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -112,7 +112,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 6e1a37eca..77c64832d 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -224,7 +224,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); + TQMouseEvent* ev = static_cast(e); if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); @@ -234,7 +234,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); + TQMouseEvent* ev = static_cast(e); if (ev->button() == TQt::RightButton) { if (!m_menuButton->isDown()) diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 529deb8b0..da1a5e4c2 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -235,7 +235,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); switch (me->button()) { case TQt::MidButton: diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 63be310d5..921ead986 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -2145,7 +2145,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { case TQEvent::MouseButtonPress: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if ( me->button() == TQt::LeftButton ) { if (inResizeArea(me->pos())) @@ -2180,7 +2180,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if ( me->button() == TQt::LeftButton ) { _is_lmb_down = false; @@ -2190,7 +2190,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseMove: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if (KickerSettings::useResizeHandle()) { KPanelExtension::Position pos = position(); diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 205f5a43d..26cddaf7b 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -84,7 +84,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if (me->button() & TQt::LeftButton) { m_dragStart = me->pos(); @@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) if (e->type() == TQEvent::MouseMove) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if ((me->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 25f3a3246..439dce8df 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -480,11 +480,11 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQPoint p; if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); p = me->globalPos(); } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent* we = TQT_TQWHEELEVENT(e); + TQWheelEvent* we = static_cast(e); p = we->globalPos(); } @@ -589,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if (view) { bool handled = true; - switch (TQT_TQKEYEVENT(e)->key()) { + switch (static_cast(e)->key()) { case Key_Up: if (view->selectedItem()) { view->setSelected(view->selectedItem()->itemAbove(),true); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 926ef2686..aef83bbb3 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -996,7 +996,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); if (rect().contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) @@ -1008,7 +1008,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); if (rect().contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; @@ -1017,7 +1017,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) } else if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 2e48d4585..d6b873e2b 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -1424,7 +1424,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { if (!m_dragStartPos.isNull()) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); TQPoint p(me->globalPos()); if (me->state() & TQt::LeftButton && diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index 354a4a590..8793441cd 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -399,7 +399,7 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) if ( o == edit ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { - TQKeyEvent *e = TQT_TQKEYEVENT( ev ); + TQKeyEvent *e = static_cast( ev ); if ( e->key() == Key_Return || e->key() == Key_Enter ) { m_modifier = e->state(); diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index 8efe3fe38..cf0960f4d 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -177,7 +177,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { emit clicked(); update(); - if ( TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton) + if ( static_cast(e)->button() == TQt::RightButton) splitFrameMenu(); return true; } @@ -397,7 +397,7 @@ bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev) { if (ev->type()==TQEvent::KeyPress) { - TQKeyEvent * keyEv = TQT_TQKEYEVENT(ev); + TQKeyEvent * keyEv = static_cast(ev); if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton)) { emit ((KonqFrameContainer*)parent())->ctrlTabPressed(); diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index 4633f72c9..ab8d56c77 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -3466,7 +3466,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) { //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl; - TQFocusEvent * focusEv = TQT_TQFOCUSEVENT(ev); + TQFocusEvent * focusEv = static_cast(ev); if (focusEv->reason() == TQFocusEvent::Popup) { return KParts::MainWindow::eventFilter( obj, ev ); diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 856c4aa92..0bacb9c5b 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -1293,7 +1293,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) { if ( e->type() == TQEvent::ContextMenu ) { - TQContextMenuEvent *ev = TQT_TQCONTEXTMENUEVENT( e ); + TQContextMenuEvent *ev = static_cast( e ); if ( ev->reason() == TQContextMenuEvent::Mouse ) { return true; @@ -1301,7 +1301,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent *ev = static_cast( e ); if ( ev->button() == TQt::RightButton ) { return true; @@ -1309,7 +1309,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseButtonRelease ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent *ev = static_cast( e ); if ( ev->button() == TQt::RightButton ) { emit backRightClick(); @@ -1318,7 +1318,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) } else if ( e->type() == TQEvent::MouseMove ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent *ev = static_cast( e ); if ( ev->state() == TQt::RightButton ) { obj->removeEventFilter( this ); diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index e04c9fa4a..f18278801 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -1931,14 +1931,14 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) if ( (e->type() == TQEvent::Accel || e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this ) { - TQT_TQKEYEVENT( e )->ignore(); + static_cast( e )->ignore(); return false; } if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) return false; // not us if ( e->type() == TQEvent::KeyPress ) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast(e); actSel=0; // Key stroke implies a screen update, so TEWidget won't // know where the current selection is. @@ -1956,13 +1956,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::KeyRelease ) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast(e); emit keyReleasedSignal(ke); return true; } if ( e->type() == TQEvent::FocusIn ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(e); + TQFocusEvent *fe = static_cast(e); if (fe->gotFocus()) { emit focusInSignal(fe); @@ -2050,7 +2050,7 @@ bool TEWidget::event( TQEvent *e ) { if ( e->type() == TQEvent::AccelOverride ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast( e ); KKey key( ke ); int keyCodeQt = key.keyCodeQt(); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index d41f30181..7ff81454c 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -991,12 +991,12 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) // is moved by a small distance. if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast(ev); m_newSessionButtonMousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast(ev); if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -1006,7 +1006,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) } else if (ev->type() == TQEvent::ContextMenu) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast(ev); slotTabbarContextMenu(mev->globalPos()); return true; } diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index 8e7d33bf1..0a0e7fabb 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -139,19 +139,19 @@ KdmThemer::widgetEvent( TQEvent *e ) switch (e->type()) { case TQEvent::MouseMove: { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); rootItem->mouseEvent( me->x(), me->y() ); } break; case TQEvent::MouseButtonPress: { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); rootItem->mouseEvent( me->x(), me->y(), true ); } break; case TQEvent::MouseButtonRelease: { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast(e); rootItem->mouseEvent( me->x(), me->y(), false, true ); } break; @@ -164,7 +164,7 @@ KdmThemer::widgetEvent( TQEvent *e ) break; case TQEvent::Paint: { - TQRect paintRect = TQT_TQPAINTEVENT(e)->rect(); + TQRect paintRect = static_cast(e)->rect(); kdDebug() << timestamp() << " paint on: " << paintRect << endl; if (!argb_visual_available) { diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index afef7799f..13375aaf0 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -1183,22 +1183,22 @@ bool B2Client::eventFilter(TQObject *o, TQEvent *e) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(TQT_TQRESIZEEVENT(e)); + resizeEvent(static_cast(e)); return true; case TQEvent::Paint: - paintEvent(TQT_TQPAINTEVENT(e)); + paintEvent(static_cast(e)); return true; case TQEvent::MouseButtonDblClick: - titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + titlebar->mouseDoubleClickEvent(static_cast(e)); return true; case TQEvent::Wheel: - titlebar->wheelEvent(TQT_TQWHEELEVENT(e)); + titlebar->wheelEvent(static_cast(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(TQT_TQMOUSEEVENT(e)); + processMousePressEvent(static_cast(e)); return true; case TQEvent::Show: - showEvent(TQT_TQSHOWEVENT(e)); + showEvent(static_cast(e)); return true; default: break; diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 0a9c7e2d5..fe7cc37d7 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -1802,23 +1802,23 @@ bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( TQT_TQRESIZEEVENT( e ) ); + resizeEvent( static_cast( e ) ); return true; case TQEvent::Paint: - paintEvent( TQT_TQPAINTEVENT( e ) ); + paintEvent( static_cast( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); + mouseDoubleClickEvent( static_cast( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); + processMousePressEvent( static_cast( e ) ); return true; case TQEvent::Wheel: - wheelEvent( TQT_TQWHEELEVENT( e )); + wheelEvent( static_cast( e )); return true; default: diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index 4b38692d1..e306520d5 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -106,7 +106,7 @@ bool Decoration::eventFilter( TQObject* o, TQEvent* e ) { case TQEvent::MouseButtonPress: { // FRAME - processMousePressEvent( TQT_TQMOUSEEVENT( e )); + processMousePressEvent( static_cast( e )); return true; } case TQEvent::Show: diff --git a/twin/events.cpp b/twin/events.cpp index 0c08d102e..10c06f93d 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -1300,25 +1300,25 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) return false; if( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* ev = static_cast( e ); return buttonPressEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::MouseButtonRelease ) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* ev = static_cast( e ); return buttonReleaseEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::MouseMove ) // FRAME i fake z enter/leave? { - TQMouseEvent* ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* ev = static_cast( e ); return motionNotifyEvent( decorationId(), qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); } if( e->type() == TQEvent::Wheel ) { - TQWheelEvent* ev = TQT_TQWHEELEVENT( e ); + TQWheelEvent* ev = static_cast( e ); bool r = buttonPressEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()), ev->x(), ev->y(), ev->globalX(), ev->globalY() ); r = r || buttonReleaseEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()), @@ -1327,7 +1327,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) } if( e->type() == TQEvent::Resize ) { - TQResizeEvent* ev = TQT_TQRESIZEEVENT( e ); + TQResizeEvent* ev = static_cast( e ); // Filter out resize events that inform about size different than frame size. // This will ensure that decoration->width() etc. and decoration->widget()->width() will be in sync. // These events only seem to be delayed events from initial resizing before show() was called diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp index 546db66db..b01066403 100644 --- a/twin/kcmtwin/twinrules/detectwidget.cpp +++ b/twin/kcmtwin/twinrules/detectwidget.cpp @@ -176,7 +176,7 @@ bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) return false; delete grabber; grabber = NULL; - if( TQT_TQMOUSEEVENT( e )->button() != TQt::LeftButton ) + if( static_cast( e )->button() != TQt::LeftButton ) { emit detectionDone( false ); return true; diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index 6bec9b928..7d219ae7f 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -849,19 +849,19 @@ bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e ) switch( e->type()) { case TQEvent::Resize: - resizeEvent(TQT_TQRESIZEEVENT(e) ); + resizeEvent(static_cast(e) ); return true; case TQEvent::Paint: - paintEvent(TQT_TQPAINTEVENT( e )); + paintEvent(static_cast( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e )); + mouseDoubleClickEvent(static_cast( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(TQT_TQMOUSEEVENT( e )); + processMousePressEvent(static_cast( e )); return true; case TQEvent::Wheel: - wheelEvent(TQT_TQWHEELEVENT( e )); + wheelEvent(static_cast( e )); return true; default: return false; -- cgit v1.2.1