From 452c1e8191d38a7449364467ae0601ace808e7f7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Nov 2023 21:31:00 +0900 Subject: [PATCH] Replace 'Event' #define strings Signed-off-by: Michele Calgaro (cherry picked from commit 7ef70d6552605c1df5653f039314c3ac568069cc) --- arts/builder/propertypanel.cpp | 2 +- juk/playlist.cpp | 4 ++-- juk/searchwidget.cpp | 2 +- juk/statuslabel.cpp | 2 +- juk/tageditor.cpp | 2 +- juk/viewmode.cpp | 2 +- kmix/mdwenum.cpp | 2 +- kmix/mdwslider.cpp | 4 ++-- kmix/mdwswitch.cpp | 2 +- noatun/modules/excellent/userinterface.cpp | 2 +- noatun/modules/noatunui/userinterface.cpp | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index 25809100..9f306d15 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -341,7 +341,7 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e ) { if( port && !constantValueEdit->hasFocus() && (e->type() == TQEvent::KeyPress) ) { // kdDebug() << TQString(" ..is KeyPress") << endl; - TQString entered = TQT_TQKEYEVENT(e)->text(); + TQString entered = static_cast(e)->text(); bool goodString = entered.length() > 0; // kdDebug() << TQString("pressed '%1'").arg(entered) << endl; diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 38cdb73f..21df8553 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -1116,7 +1116,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) switch(e->type()) { case TQEvent::MouseMove: { - if((TQT_TQMOUSEEVENT(e)->state() & TQt::LeftButton) == TQt::LeftButton && + if((static_cast(e)->state() & TQt::LeftButton) == TQt::LeftButton && !action("resizeColumnsManually")->isChecked()) { m_columnWidthModeChanged = true; @@ -1129,7 +1129,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } case TQEvent::MouseButtonPress: { - if(TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton) + if(static_cast(e)->button() == TQt::RightButton) m_headerMenu->popup(TQCursor::pos()); break; diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index be489358..19e98c33 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -139,7 +139,7 @@ bool SearchLine::eventFilter(TQObject *watched, TQEvent *e) if(watched != m_lineEdit || e->type() != TQEvent::KeyPress) return TQHBox::eventFilter(watched, e); - TQKeyEvent *key = TQT_TQKEYEVENT(e); + TQKeyEvent *key = static_cast(e); if(key->key() == TQt::Key_Down) emit signalDownPressed(); diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index c3c2da0f..a590362c 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -175,7 +175,7 @@ bool StatusLabel::eventFilter(TQObject *o, TQEvent *e) if(!o || !e) return false; - TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(e); + TQMouseEvent *mouseEvent = static_cast(e); if(e->type() == TQEvent::MouseButtonRelease && mouseEvent->button() == TQt::LeftButton) { diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index c0b0a183..c1200e3d 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -768,7 +768,7 @@ void TagEditor::showEvent(TQShowEvent *e) bool TagEditor::eventFilter(TQObject *watched, TQEvent *e) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast(e); if(watched->inherits("TQSpinBox") && e->type() == TQEvent::KeyRelease && ke->state() == 0) slotDataChanged(); diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index bdb2b7a8..040bf3a3 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -105,7 +105,7 @@ void ViewMode::paintCell(PlaylistBox::Item *item, bool ViewMode::eventFilter(TQObject *watched, TQEvent *e) { if(m_visible && watched == m_playlistBox->viewport() && e->type() == TQEvent::Resize) { - TQResizeEvent *re = TQT_TQRESIZEEVENT(e); + TQResizeEvent *re = static_cast(e); if(re->size().width() != re->oldSize().width()) m_needsRefresh = true; } diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 04500df7..ceeac1f3 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -194,7 +194,7 @@ void MDWEnum::setDisabled( bool value ) { bool MDWEnum::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); + TQMouseEvent *qme = static_cast(e); if (qme->button() == TQt::RightButton) { showContextMenu(); return true; diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index f75041d9..6b493e48 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -934,7 +934,7 @@ TQSize MDWSlider::sizeHint() const { bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); + TQMouseEvent *qme = static_cast(e); if (qme->button() == TQt::RightButton) { showContextMenu(); return true; @@ -942,7 +942,7 @@ bool MDWSlider::eventFilter( TQObject* obj, TQEvent* e ) } // Attention: We don't filter WheelEvents for KSmallSlider, because it handles WheelEvents itself else if ( (e->type() == TQEvent::Wheel) && !obj->isA("KSmallSlider") ) { - TQWheelEvent *qwe = TQT_TQWHEELEVENT(e); + TQWheelEvent *qwe = static_cast(e); if (qwe->delta() > 0) { increaseVolume(); } diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 9a59028e..48b918a3 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -219,7 +219,7 @@ void MDWSwitch::setDisabled( bool value ) { bool MDWSwitch::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); + TQMouseEvent *qme = static_cast(e); if (qme->button() == TQt::RightButton) { showContextMenu(); return true; diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 40154489..540a3abc 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -248,7 +248,7 @@ bool Excellent::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Wheel) { - wheelEvent(TQT_TQWHEELEVENT(e)); + wheelEvent(static_cast(e)); return true; } return TQWidget::eventFilter(o, e); diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 7019aea5..250d79a9 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -281,15 +281,15 @@ void MilkChocolate::changeLoopType(int t) bool MilkChocolate::eventFilter(TQObject *o, TQEvent *e) { if ((e->type() == TQEvent::MouseButtonRelease) - && ((TQT_TQMOUSEEVENT(e))->button()==TQt::RightButton)) + && ((static_cast(e))->button()==TQt::RightButton)) { - mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + mouseReleaseEvent(static_cast(e)); return true; } if (e->type() == TQEvent::Wheel) { - wheelEvent(TQT_TQWHEELEVENT(e)); + wheelEvent(static_cast(e)); return true; } return TQWidget::eventFilter(o, e);