From d8d8319b3dddc86303699f242be2f1a36206da8e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Nov 2023 21:30:52 +0900 Subject: Replace 'Event' #define strings Signed-off-by: Michele Calgaro (cherry picked from commit f22a9c72dda24871973033123039639af6577eaa) --- tdehtml/rendering/render_form.cpp | 4 ++-- tdehtml/rendering/render_replaced.cpp | 40 +++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'tdehtml/rendering') diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 63bba2914..8462f711b 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e) return true; if (e->type()==TQEvent::KeyPress) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast(e); switch(ke->key()) { case Key_Return: @@ -909,7 +909,7 @@ bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e) { if (dest==listBox() && e->type()==TQEvent::KeyPress) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast(e); bool forward = false; switch(ke->key()) { diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index ddf4dfb4b..3c71656e1 100644 --- a/tdehtml/rendering/render_replaced.cpp +++ b/tdehtml/rendering/render_replaced.cpp @@ -642,7 +642,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // Don't count popup as a valid reason for losing the focus // (example: opening the options of a select combobox shouldn't emit onblur) - if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup ) + if ( static_cast(e)->reason() != TQFocusEvent::Popup ) handleFocusOut(); break; case TQEvent::FocusIn: @@ -663,7 +663,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) case TQEvent::KeyRelease: // TODO this seems wrong - Qt events are not correctly translated to DOM ones, // like in TDEHTMLView::dispatchKeyEvent() - if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false)) + if (element()->dispatchKeyEvent(static_cast(e),false)) filtered = true; break; @@ -674,7 +674,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // or something while wheeling a webpage. if (tqApp->focusWidget() != widget() && widget()->focusPolicy() <= TQWidget::StrongFocus) { - TQT_TQWHEELEVENT(e)->ignore(); + static_cast(e)->ignore(); TQApplication::sendEvent(view(), e); filtered = true; } @@ -697,22 +697,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { switch(e->type()) { case TQEvent::MouseButtonPress: - mousePressEvent(TQT_TQMOUSEEVENT(e)); + mousePressEvent(static_cast(e)); break; case TQEvent::MouseButtonRelease: - mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + mouseReleaseEvent(static_cast(e)); break; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + mouseDoubleClickEvent(static_cast(e)); break; case TQEvent::MouseMove: - mouseMoveEvent(TQT_TQMOUSEEVENT(e)); + mouseMoveEvent(static_cast(e)); break; case TQEvent::KeyPress: - keyPressEvent(TQT_TQKEYEVENT(e)); + keyPressEvent(static_cast(e)); break; case TQEvent::KeyRelease: - keyReleaseEvent(TQT_TQKEYEVENT(e)); + keyReleaseEvent(static_cast(e)); break; default: break; @@ -722,22 +722,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) { switch(e->type()) { case TQEvent::MouseButtonPress: - viewportMousePressEvent(TQT_TQMOUSEEVENT(e)); + viewportMousePressEvent(static_cast(e)); break; case TQEvent::MouseButtonRelease: - viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseReleaseEvent(static_cast(e)); break; case TQEvent::MouseButtonDblClick: - viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseDoubleClickEvent(static_cast(e)); break; case TQEvent::MouseMove: - viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseMoveEvent(static_cast(e)); break; case TQEvent::KeyPress: - keyPressEvent(TQT_TQKEYEVENT(e)); + keyPressEvent(static_cast(e)); break; case TQEvent::KeyRelease: - keyReleaseEvent(TQT_TQKEYEVENT(e)); + keyReleaseEvent(static_cast(e)); break; default: break; @@ -811,9 +811,9 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) TQMouseEvent e(type, p, button, state); TQScrollView * sc = ::tqt_cast(m_widget); if (sc && !::tqt_cast(m_widget)) - static_cast(sc)->sendEvent(TQT_TQEVENT(&e)); + static_cast(sc)->sendEvent(static_cast(&e)); else - static_cast(m_widget)->sendEvent(TQT_TQEVENT(&e)); + static_cast(m_widget)->sendEvent(static_cast(&e)); ret = e.isAccepted(); break; } @@ -827,7 +827,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break; TQKeyEvent* const ke = domKeyEv.qKeyEvent(); - static_cast(m_widget)->sendEvent(TQT_TQEVENT(ke)); + static_cast(m_widget)->sendEvent(static_cast(ke)); ret = ke->isAccepted(); break; } @@ -854,9 +854,9 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) if (ke->isAutoRepeat()) { TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(), ke->text(), ke->isAutoRepeat(), ke->count() ); - static_cast(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv)); + static_cast(m_widget)->sendEvent(static_cast(&releaseEv)); } - static_cast(m_widget)->sendEvent(TQT_TQEVENT(ke)); + static_cast(m_widget)->sendEvent(static_cast(ke)); ret = ke->isAccepted(); break; } -- cgit v1.2.1