From 85642665d44e39a27b54584fa6147eae274ef3de Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 9 Aug 2023 10:37:20 +0200 Subject: [PATCH] being more const aware --- examples/iotdashboard/MainItem.cpp | 4 ++-- examples/iotdashboard/MainItem.h | 2 +- src/controls/QskControl.cpp | 2 +- src/controls/QskControl.h | 2 +- src/controls/QskControlPrivate.cpp | 2 +- src/controls/QskControlPrivate.h | 2 +- src/controls/QskGestureRecognizer.cpp | 10 +++++----- src/controls/QskGestureRecognizer.h | 2 +- src/controls/QskScrollBox.cpp | 4 ++-- src/controls/QskScrollBox.h | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/iotdashboard/MainItem.cpp b/examples/iotdashboard/MainItem.cpp index 36a17243..cf84cd67 100644 --- a/examples/iotdashboard/MainItem.cpp +++ b/examples/iotdashboard/MainItem.cpp @@ -345,13 +345,13 @@ bool MainItem::eventFilter( QObject* object, QEvent* event ) } } -bool MainItem::gestureFilter( QQuickItem* item, QEvent* event ) +bool MainItem::gestureFilter( const QQuickItem* item, const QEvent* event ) { auto& recognizer = m_panRecognizer; if( event->type() == QEvent::MouseButtonPress ) { - const auto mouseEvent = static_cast< QMouseEvent* >( event ); + auto mouseEvent = static_cast< const QMouseEvent* >( event ); if( ( item != this ) || ( recognizer.timeout() < 0 ) ) { diff --git a/examples/iotdashboard/MainItem.h b/examples/iotdashboard/MainItem.h index 9d7ef47d..44e7e478 100644 --- a/examples/iotdashboard/MainItem.h +++ b/examples/iotdashboard/MainItem.h @@ -74,7 +74,7 @@ class MainItem : public QskControl protected: bool eventFilter(QObject* obj, QEvent* event) override final; - bool gestureFilter( QQuickItem*, QEvent* ) override final; + bool gestureFilter( const QQuickItem*, const QEvent* ) override final; void gestureEvent( QskGestureEvent* ) override final; private: diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index 86c863e3..0ea473d0 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -809,7 +809,7 @@ bool QskControl::childMouseEventFilter( QQuickItem* item, QEvent* event ) return d_func()->maybeGesture( item, event ); } -bool QskControl::gestureFilter( QQuickItem*, QEvent* ) +bool QskControl::gestureFilter( const QQuickItem*, const QEvent* ) { return false; } diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index e9a4bb7a..dd8ff9ed 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -196,7 +196,7 @@ class QSK_EXPORT QskControl : public QskQuickItem, public QskSkinnable void hoverLeaveEvent( QHoverEvent* ) override; bool childMouseEventFilter( QQuickItem*, QEvent* ) override; - virtual bool gestureFilter( QQuickItem*, QEvent* ); + virtual bool gestureFilter( const QQuickItem*, const QEvent* ); void itemChange( ItemChange, const ItemChangeData& ) override; void geometryChange( const QRectF&, const QRectF& ) override; diff --git a/src/controls/QskControlPrivate.cpp b/src/controls/QskControlPrivate.cpp index 8a24102e..88e4747d 100644 --- a/src/controls/QskControlPrivate.cpp +++ b/src/controls/QskControlPrivate.cpp @@ -309,7 +309,7 @@ QSizeF QskControlPrivate::explicitSizeHint( Qt::SizeHint whichHint ) const return QSizeF(); } -bool QskControlPrivate::maybeGesture( QQuickItem* child, QEvent* event ) +bool QskControlPrivate::maybeGesture( const QQuickItem* child, const QEvent* event ) { Q_Q( QskControl ); diff --git a/src/controls/QskControlPrivate.h b/src/controls/QskControlPrivate.h index dadcc37d..06815304 100644 --- a/src/controls/QskControlPrivate.h +++ b/src/controls/QskControlPrivate.h @@ -36,7 +36,7 @@ class QskControlPrivate : public QskQuickItemPrivate void implicitSizeChanged() override final; void layoutConstraintChanged() override final; - bool maybeGesture( QQuickItem*, QEvent* ); + bool maybeGesture( const QQuickItem*, const QEvent* ); QskPlacementPolicy::Policy placementPolicy( bool visible ) const noexcept; void setPlacementPolicy( bool visible, QskPlacementPolicy::Policy ); diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp index fea738a1..d5262fa7 100644 --- a/src/controls/QskGestureRecognizer.cpp +++ b/src/controls/QskGestureRecognizer.cpp @@ -295,7 +295,7 @@ QskGestureRecognizer::State QskGestureRecognizer::state() const } bool QskGestureRecognizer::processEvent( - QQuickItem* item, QEvent* event, bool blockReplayedEvents ) + const QQuickItem* item, const QEvent* event, bool blockReplayedEvents ) { if ( m_data->isReplayingEvents && blockReplayedEvents ) { @@ -331,7 +331,7 @@ bool QskGestureRecognizer::processEvent( if ( buttons == Qt::NoButton ) buttons = watchedItem->acceptedMouseButtons(); - auto mouseEvent = static_cast< QMouseEvent* >( event ); + auto mouseEvent = static_cast< const QMouseEvent* >( event ); if ( !( buttons & mouseEvent->button() ) ) return false; @@ -383,7 +383,7 @@ bool QskGestureRecognizer::processEvent( { case QEvent::MouseButtonPress: { - auto mouseEvent = static_cast< QMouseEvent* >( event ); + auto mouseEvent = static_cast< const QMouseEvent* >( event ); m_data->pendingEvents += qskClonedMouseEvent( mouseEvent ); pressEvent( mouseEvent ); @@ -392,7 +392,7 @@ bool QskGestureRecognizer::processEvent( case QEvent::MouseMove: { - auto mouseEvent = static_cast< QMouseEvent* >( event ); + auto mouseEvent = static_cast< const QMouseEvent* >( event ); m_data->pendingEvents += qskClonedMouseEvent( mouseEvent ); moveEvent( mouseEvent ); @@ -401,7 +401,7 @@ bool QskGestureRecognizer::processEvent( case QEvent::MouseButtonRelease: { - auto mouseEvent = static_cast< QMouseEvent* >( event ); + auto mouseEvent = static_cast< const QMouseEvent* >( event ); m_data->pendingEvents += qskClonedMouseEvent( mouseEvent ); if ( m_data->state == Pending ) diff --git a/src/controls/QskGestureRecognizer.h b/src/controls/QskGestureRecognizer.h index 41ad6509..7ed710be 100644 --- a/src/controls/QskGestureRecognizer.h +++ b/src/controls/QskGestureRecognizer.h @@ -41,7 +41,7 @@ class QSK_EXPORT QskGestureRecognizer // timestamp, when the Idle state had been left ulong timestamp() const; - bool processEvent( QQuickItem*, QEvent*, bool blockReplayedEvents = true ); + bool processEvent( const QQuickItem*, const QEvent*, bool blockReplayedEvents = true ); void reject(); void accept(); diff --git a/src/controls/QskScrollBox.cpp b/src/controls/QskScrollBox.cpp index 8bd84942..842a2dd5 100644 --- a/src/controls/QskScrollBox.cpp +++ b/src/controls/QskScrollBox.cpp @@ -446,7 +446,7 @@ void QskScrollBox::wheelEvent( QWheelEvent* event ) #endif -bool QskScrollBox::gestureFilter( QQuickItem* item, QEvent* event ) +bool QskScrollBox::gestureFilter( const QQuickItem* item, const QEvent* event ) { if ( event->type() == QEvent::MouseButtonPress ) { @@ -501,7 +501,7 @@ bool QskScrollBox::gestureFilter( QQuickItem* item, QEvent* event ) its parent, finally ending up here for a second time. */ - const auto mouseEvent = static_cast< QMouseEvent* >( event ); + auto mouseEvent = static_cast< const QMouseEvent* >( event ); if ( recognizer.hasProcessedBefore( mouseEvent ) ) { /* diff --git a/src/controls/QskScrollBox.h b/src/controls/QskScrollBox.h index 46bc9604..889a1809 100644 --- a/src/controls/QskScrollBox.h +++ b/src/controls/QskScrollBox.h @@ -73,7 +73,7 @@ class QSK_EXPORT QskScrollBox : public QskControl virtual QPointF scrollOffset( const QWheelEvent* ) const; #endif - bool gestureFilter( QQuickItem*, QEvent* ) override; + bool gestureFilter( const QQuickItem*, const QEvent* ) override; void setScrollableSize( const QSizeF& ); private: