From ef173e633b7d068c4ddd2209af41899ec44e47ce Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Nov 2023 21:31:17 +0900 Subject: Replace 'Event' #define strings Signed-off-by: Michele Calgaro --- kmail/kmcomposewin.cpp | 2 +- kmail/kmedit.cpp | 2 +- kmail/kmfoldertree.cpp | 4 ++-- kmail/kmheaders.cpp | 4 ++-- kmail/kmreaderwin.cpp | 4 ++-- knode/articlewidget.cpp | 2 +- knode/headerview.cpp | 6 +++--- knode/kncollectionview.cpp | 6 +++--- knotes/knote.cpp | 2 +- korganizer/koagenda.cpp | 16 ++++++++-------- libtdepim/addresseelineedit.cpp | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 473d454f..7e02e403 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -3830,7 +3830,7 @@ void KMComposeWin::slotCopy() #endif TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton); - kapp->notify(TQT_TQOBJECT(fw), TQT_TQEVENT(&k)); + kapp->notify(fw, &k); } diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 1d01782d..960eb455 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -569,7 +569,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) } } } else if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(e); + TQFocusEvent *fe = static_cast(e); if(! (fe->reason() == TQFocusEvent::ActiveWindow || fe->reason() == TQFocusEvent::Popup) ) emit focusChanged( fe->gotFocus() ); } diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 21a2eb0f..312f4feb 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -1753,10 +1753,10 @@ void KMFolderTree::slotToggleSizeColumn() bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && + static_cast(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast(e)->globalPos() ); return true; } return KFolderTree::eventFilter(o, e); diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 66231ae2..eaf045b4 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -235,7 +235,7 @@ KMHeaders::~KMHeaders () bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && + static_cast(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { // if we currently only show one of either sender/receiver column @@ -248,7 +248,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e ) else mPopup->changeItem(KPaintInfo::COL_RECEIVER, i18n("Receiver")); - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast(e)->globalPos() ); return true; } return TDEListView::eventFilter(o, e); diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 1e4eab6d..01486496 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -2754,7 +2754,7 @@ static TQString linkForNode( const DOM::Node &node ) bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast(e); if ( me->button() == TQt::LeftButton && ( me->state() & ShiftButton ) ) { // special processing for shift+click URLHandlerManager::instance()->handleShiftClick( mHoveredUrl, this ); @@ -2786,7 +2786,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) } if ( e->type() == TQEvent::MouseMove ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast( e ); // Handle this ourselves instead of connecting to mViewer::onURL(), since TDEHTML misses some // notifications in case we started a drag ourselves diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 73b75514..852707ff 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -1472,7 +1472,7 @@ void ArticleWidget::focusOutEvent( TQFocusEvent *e ) bool ArticleWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( e->type() == TQEvent::KeyPress && (TQT_TQKEYEVENT(e)->key() == Key_Tab) ) { + if ( e->type() == TQEvent::KeyPress && (static_cast(e)->key() == Key_Tab) ) { emit focusChangeRequest( this ); if ( !hasFocus() ) // focusChangeRequest was successful return true; diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 31d85fda..d30cc5a3 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -540,7 +540,7 @@ void KNHeaderView::slotSizeChanged( int section, int, int newSize ) bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) { + if ((e->type() == TQEvent::KeyPress) && (static_cast(e)->key() == Key_Tab)) { emit(focusChangeRequest(this)); if (!hasFocus()) // focusChangeRequest was successful return true; @@ -548,10 +548,10 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) // right click on header if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && + static_cast(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast(e)->globalPos() ); return true; } diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 7a8e6840..ad952552 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -421,7 +421,7 @@ void KNCollectionView::updatePopup() const bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) { + if ((e->type() == TQEvent::KeyPress) && (static_cast(e)->key() == Key_Tab)) { emit(focusChangeRequest(this)); if (!hasFocus()) // focusChangeRequest was successful return true; @@ -429,10 +429,10 @@ bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e) // header popup menu if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && + static_cast(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast(e)->globalPos() ); return true; } diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 2a2098b5..32cd586f 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -1381,7 +1381,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) if ( o == m_editor ) { if ( ev->type() == TQEvent::FocusOut ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(ev); + TQFocusEvent *fe = static_cast(ev); if ( fe->reason() != TQFocusEvent::Popup && fe->reason() != TQFocusEvent::Mouse ) { updateFocus(); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 18a1c2ad..1405f205 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -384,14 +384,14 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonRelease: case TQEvent::MouseMove: - return eventFilter_mouse( object, TQT_TQMOUSEEVENT( event ) ); + return eventFilter_mouse( object, static_cast( event ) ); #ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: - return eventFilter_wheel( object, TQT_TQWHEELEVENT( event ) ); + return eventFilter_wheel( object, static_cast( event ) ); #endif case TQEvent::KeyPress: case TQEvent::KeyRelease: - return eventFilter_key( object, TQT_TQKEYEVENT( event ) ); + return eventFilter_key( object, static_cast( event ) ); case ( TQEvent::Leave ): if ( !mActionItem ) @@ -526,10 +526,10 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke ) case Key_Alt: break; default: - mTypeAheadEvents.append( TQT_TQEVENT( new TQKeyEvent( ke->type(), ke->key(), + mTypeAheadEvents.append( new TQKeyEvent( ke->type(), ke->key(), ke->ascii(), ke->state(), ke->text(), ke->isAutoRepeat(), - ke->count() ) ) ); + ke->count() ) ); if ( !mTypeAhead ) { mTypeAhead = true; emitNewEventForSelection(); @@ -615,7 +615,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) mClickedItem->incidence(), mClickedItem->itemDate() ); } else { - return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda + return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda } } else { KOAgendaItem* item = dynamic_cast(object); @@ -635,7 +635,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) // null. selectItem( item ); } else { - return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda + return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda } } } else { @@ -662,7 +662,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) startSelectAction(viewportPos); } } - return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda + return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda } break; diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index d867768c..4060c451 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -1042,7 +1042,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonRelease || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast( e ); // find list box item at the event position TQListBoxItem *item = completionBox()->itemAt( me->pos() ); if ( !item ) { @@ -1072,7 +1072,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) } if ( ( obj == this ) && ( e->type() == TQEvent::AccelOverride ) ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast( e ); if ( ke->key() == Key_Up || ke->key() == Key_Down || ke->key() == Key_Tab ) { ke->accept(); return true; @@ -1081,7 +1081,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) if ( ( obj == this ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::KeyRelease ) && completionBox()->isVisible() ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast( e ); int currentIndex = completionBox()->currentItem(); if ( currentIndex < 0 ) { return true; -- cgit v1.2.3