From 55d5f995756fc49648cf360371144fa2faf3bc32 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 25 Mar 2022 10:28:06 +0100 Subject: [PATCH] introducing QskHashValue to work around Qt5/6 incompatibilities --- .../iotdashboard/nodes/RadialTickmarksNode.cpp | 2 +- .../iotdashboard/nodes/RadialTickmarksNode.h | 2 +- src/common/QskArcMetrics.cpp | 4 ++-- src/common/QskArcMetrics.h | 2 +- src/common/QskBoxBorderColors.cpp | 4 ++-- src/common/QskBoxBorderColors.h | 2 +- src/common/QskBoxBorderMetrics.cpp | 4 ++-- src/common/QskBoxBorderMetrics.h | 2 +- src/common/QskBoxShapeMetrics.cpp | 4 ++-- src/common/QskBoxShapeMetrics.h | 2 +- src/common/QskGlobal.h | 6 ++++++ src/common/QskGradient.cpp | 4 ++-- src/common/QskGradient.h | 2 +- src/common/QskGradientStop.cpp | 4 ++-- src/common/QskGradientStop.h | 2 +- src/common/QskScaleTickmarks.cpp | 2 +- src/common/QskScaleTickmarks.h | 2 +- src/common/QskShadowMetrics.cpp | 4 ++-- src/common/QskShadowMetrics.h | 2 +- src/common/QskTextColors.cpp | 2 +- src/common/QskTextColors.h | 2 +- src/common/QskTextOptions.cpp | 4 ++-- src/common/QskTextOptions.h | 2 +- src/graphic/QskGraphic.cpp | 2 +- src/graphic/QskGraphic.h | 2 +- src/nodes/QskArcNode.cpp | 4 ++-- src/nodes/QskArcNode.h | 2 +- src/nodes/QskBoxClipNode.cpp | 6 +++--- src/nodes/QskBoxClipNode.h | 2 +- src/nodes/QskBoxNode.cpp | 16 ++++++++-------- src/nodes/QskGraphicNode.cpp | 4 ++-- src/nodes/QskGraphicNode.h | 2 +- src/nodes/QskPaintedNode.h | 4 ++-- src/nodes/QskTextNode.cpp | 6 +++--- src/nodes/QskTextNode.h | 2 +- src/nodes/QskTickmarksNode.cpp | 4 ++-- 36 files changed, 64 insertions(+), 58 deletions(-) diff --git a/examples/iotdashboard/nodes/RadialTickmarksNode.cpp b/examples/iotdashboard/nodes/RadialTickmarksNode.cpp index f6826d1c..a751cf41 100644 --- a/examples/iotdashboard/nodes/RadialTickmarksNode.cpp +++ b/examples/iotdashboard/nodes/RadialTickmarksNode.cpp @@ -34,7 +34,7 @@ void RadialTickmarksNode::update( const QColor& color, const QRectF& rect, markDirty( QSGNode::DirtyGeometry ); } - const uint hash = tickmarks.hash( 17435 ); + const auto hash = tickmarks.hash( 17435 ); if( ( hash != m_hash ) || ( rect != m_rect ) ) { diff --git a/examples/iotdashboard/nodes/RadialTickmarksNode.h b/examples/iotdashboard/nodes/RadialTickmarksNode.h index 2244cdd9..188dc888 100644 --- a/examples/iotdashboard/nodes/RadialTickmarksNode.h +++ b/examples/iotdashboard/nodes/RadialTickmarksNode.h @@ -29,5 +29,5 @@ class RadialTickmarksNode : public QSGGeometryNode QRectF m_rect; int m_lineWidth = 0; - uint m_hash = 0; + QskHashValue m_hash = 0; }; diff --git a/src/common/QskArcMetrics.cpp b/src/common/QskArcMetrics.cpp index 989474a6..991b075d 100644 --- a/src/common/QskArcMetrics.cpp +++ b/src/common/QskArcMetrics.cpp @@ -86,9 +86,9 @@ QskArcMetrics QskArcMetrics::toAbsolute( const QSizeF& size ) const noexcept return absoluted; } -uint QskArcMetrics::hash( uint seed ) const noexcept +QskHashValue QskArcMetrics::hash( QskHashValue seed ) const noexcept { - uint hash = qHash( m_width, seed ); + auto hash = qHash( m_width, seed ); hash = qHash( m_startAngle, hash ); hash = qHash( m_spanAngle, hash ); diff --git a/src/common/QskArcMetrics.h b/src/common/QskArcMetrics.h index f1bee7eb..7d5d6751 100644 --- a/src/common/QskArcMetrics.h +++ b/src/common/QskArcMetrics.h @@ -50,7 +50,7 @@ class QSK_EXPORT QskArcMetrics QskArcMetrics toAbsolute( const QSizeF& ) const noexcept; - uint hash( uint seed = 0 ) const noexcept; + QskHashValue hash( QskHashValue seed = 0 ) const noexcept; static QVariant interpolate( const QskArcMetrics&, const QskArcMetrics&, qreal progress ); diff --git a/src/common/QskBoxBorderColors.cpp b/src/common/QskBoxBorderColors.cpp index dce16657..054696dd 100644 --- a/src/common/QskBoxBorderColors.cpp +++ b/src/common/QskBoxBorderColors.cpp @@ -185,9 +185,9 @@ QVariant QskBoxBorderColors::interpolate( return QVariant::fromValue( from.interpolated( to, ratio ) ); } -uint QskBoxBorderColors::hash( uint seed ) const +QskHashValue QskBoxBorderColors::hash( QskHashValue seed ) const { - uint h = m_gradients[ 0 ].hash( seed ); + auto h = m_gradients[ 0 ].hash( seed ); h = m_gradients[ 1 ].hash( h ); h = m_gradients[ 2 ].hash( h ); h = m_gradients[ 3 ].hash( h ); diff --git a/src/common/QskBoxBorderColors.h b/src/common/QskBoxBorderColors.h index 5a71df73..b6ca4b68 100644 --- a/src/common/QskBoxBorderColors.h +++ b/src/common/QskBoxBorderColors.h @@ -49,7 +49,7 @@ class QSK_EXPORT QskBoxBorderColors static QVariant interpolate( const QskBoxBorderColors&, const QskBoxBorderColors&, qreal ratio ); - uint hash( uint seed = 0 ) const; + QskHashValue hash( QskHashValue seed = 0 ) const; bool isMonochrome() const; bool isVisible() const; diff --git a/src/common/QskBoxBorderMetrics.cpp b/src/common/QskBoxBorderMetrics.cpp index 5f4756cc..25de9fe6 100644 --- a/src/common/QskBoxBorderMetrics.cpp +++ b/src/common/QskBoxBorderMetrics.cpp @@ -92,9 +92,9 @@ QVariant QskBoxBorderMetrics::interpolate( return QVariant::fromValue( from.interpolated( to, progress ) ); } -uint QskBoxBorderMetrics::hash( uint seed ) const noexcept +QskHashValue QskBoxBorderMetrics::hash( QskHashValue seed ) const noexcept { - uint hash = qHashBits( &m_widths, sizeof( m_widths ), seed ); + auto hash = qHashBits( &m_widths, sizeof( m_widths ), seed ); const int mode = m_sizeMode; return qHashBits( &mode, sizeof( mode ), hash ); diff --git a/src/common/QskBoxBorderMetrics.h b/src/common/QskBoxBorderMetrics.h index 1849b789..10b7961c 100644 --- a/src/common/QskBoxBorderMetrics.h +++ b/src/common/QskBoxBorderMetrics.h @@ -55,7 +55,7 @@ class QSK_EXPORT QskBoxBorderMetrics QskBoxBorderMetrics toAbsolute( const QSizeF& ) const noexcept; - uint hash( uint seed = 0 ) const noexcept; + QskHashValue hash( QskHashValue seed = 0 ) const noexcept; static QVariant interpolate( const QskBoxBorderMetrics&, const QskBoxBorderMetrics&, qreal progress ); diff --git a/src/common/QskBoxShapeMetrics.cpp b/src/common/QskBoxShapeMetrics.cpp index 4268b51b..09e9cc70 100644 --- a/src/common/QskBoxShapeMetrics.cpp +++ b/src/common/QskBoxShapeMetrics.cpp @@ -151,9 +151,9 @@ QVariant QskBoxShapeMetrics::interpolate( return QVariant::fromValue( from.interpolated( to, progress ) ); } -uint QskBoxShapeMetrics::hash( uint seed ) const noexcept +QskHashValue QskBoxShapeMetrics::hash( QskHashValue seed ) const noexcept { - uint hash = qHash( static_cast< int >( m_sizeMode ), seed ); + auto hash = qHash( static_cast< int >( m_sizeMode ), seed ); return qHashBits( m_radii, sizeof( m_radii ), hash ); } diff --git a/src/common/QskBoxShapeMetrics.h b/src/common/QskBoxShapeMetrics.h index 2019aaa8..637400fd 100644 --- a/src/common/QskBoxShapeMetrics.h +++ b/src/common/QskBoxShapeMetrics.h @@ -93,7 +93,7 @@ class QSK_EXPORT QskBoxShapeMetrics constexpr QskBoxShapeMetrics transposed() const noexcept; - uint hash( uint seed = 0 ) const noexcept; + QskHashValue hash( QskHashValue seed = 0 ) const noexcept; static QVariant interpolate( const QskBoxShapeMetrics&, const QskBoxShapeMetrics&, qreal progress ) noexcept; diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h index 9bb265fe..147731e5 100644 --- a/src/common/QskGlobal.h +++ b/src/common/QskGlobal.h @@ -39,4 +39,10 @@ #define QSK_QT_PRIVATE_END \ QT_WARNING_POP +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + using QskHashValue = uint; +#else + using QskHashValue = size_t; +#endif + #endif diff --git a/src/common/QskGradient.cpp b/src/common/QskGradient.cpp index 20f52daf..728b8e6a 100644 --- a/src/common/QskGradient.cpp +++ b/src/common/QskGradient.cpp @@ -412,14 +412,14 @@ bool QskGradient::hasStopAt( qreal value ) const return false; } -uint QskGradient::hash( uint seed ) const +QskHashValue QskGradient::hash( QskHashValue seed ) const { if ( m_stops.isEmpty() ) return seed; const auto o = orientation(); - uint hash = qHashBits( &o, sizeof( o ), seed ); + auto hash = qHashBits( &o, sizeof( o ), seed ); for ( const auto& stop : m_stops ) hash = stop.hash( hash ); diff --git a/src/common/QskGradient.h b/src/common/QskGradient.h index de97db9c..75005926 100644 --- a/src/common/QskGradient.h +++ b/src/common/QskGradient.h @@ -96,7 +96,7 @@ class QSK_EXPORT QskGradient static QVariant interpolate( const QskGradient&, const QskGradient&, qreal progress ); - uint hash( uint seed ) const; + QskHashValue hash( QskHashValue seed ) const; Q_INVOKABLE qreal stopAt( int index ) const; Q_INVOKABLE QColor colorAt( int index ) const; diff --git a/src/common/QskGradientStop.cpp b/src/common/QskGradientStop.cpp index b4e8f341..530a2a1d 100644 --- a/src/common/QskGradientStop.cpp +++ b/src/common/QskGradientStop.cpp @@ -44,9 +44,9 @@ void QskGradientStop::setStop( qreal position, const QColor& color ) noexcept m_color = color; } -uint QskGradientStop::hash( uint seed ) const noexcept +QskHashValue QskGradientStop::hash( QskHashValue seed ) const noexcept { - uint hash = qHashBits( &m_position, sizeof( m_position ), seed ); + auto hash = qHashBits( &m_position, sizeof( m_position ), seed ); return qHashBits( &m_color, sizeof( m_color ), hash ); } diff --git a/src/common/QskGradientStop.h b/src/common/QskGradientStop.h index 640352e9..926803c9 100644 --- a/src/common/QskGradientStop.h +++ b/src/common/QskGradientStop.h @@ -41,7 +41,7 @@ class QSK_EXPORT QskGradientStop static QColor interpolated( const QskGradientStop&, const QskGradientStop&, qreal position ) noexcept; - uint hash( uint seed ) const noexcept; + QskHashValue hash( QskHashValue seed ) const noexcept; private: qreal m_position; diff --git a/src/common/QskScaleTickmarks.cpp b/src/common/QskScaleTickmarks.cpp index 201bfc67..2aab1fdb 100644 --- a/src/common/QskScaleTickmarks.cpp +++ b/src/common/QskScaleTickmarks.cpp @@ -63,7 +63,7 @@ void QskScaleTickmarks::invert() std::reverse( m_ticks[ 2 ].begin(), m_ticks[ 2 ].end() ); } -uint QskScaleTickmarks::hash( uint seed ) const +QskHashValue QskScaleTickmarks::hash( QskHashValue seed ) const { seed = qHash( m_ticks[0], seed ); seed = qHash( m_ticks[1], seed ); diff --git a/src/common/QskScaleTickmarks.h b/src/common/QskScaleTickmarks.h index 07e7e26f..45ec5708 100644 --- a/src/common/QskScaleTickmarks.h +++ b/src/common/QskScaleTickmarks.h @@ -53,7 +53,7 @@ class QSK_EXPORT QskScaleTickmarks void invert(); void reset(); - uint hash( uint seed = 0 ) const; + QskHashValue hash( QskHashValue seed = 0 ) const; private: QVector< qreal > m_ticks[ 3 ]; diff --git a/src/common/QskShadowMetrics.cpp b/src/common/QskShadowMetrics.cpp index 66a25f3f..37b951b0 100644 --- a/src/common/QskShadowMetrics.cpp +++ b/src/common/QskShadowMetrics.cpp @@ -83,9 +83,9 @@ QRectF QskShadowMetrics::shadowRect( const QRectF& sourceRect ) const sourceRect.height() + 2 * extent ); } -uint QskShadowMetrics::hash( uint seed ) const noexcept +QskHashValue QskShadowMetrics::hash( QskHashValue seed ) const noexcept { - uint hash; + QskHashValue hash; hash = qHash( m_offset.x(), seed ); hash = qHash( m_offset.y(), seed ); diff --git a/src/common/QskShadowMetrics.h b/src/common/QskShadowMetrics.h index 6bcc4039..8dd4a5a2 100644 --- a/src/common/QskShadowMetrics.h +++ b/src/common/QskShadowMetrics.h @@ -56,7 +56,7 @@ class QSK_EXPORT QskShadowMetrics QRectF shadowRect( const QRectF& sourceRect ) const; - uint hash( uint seed = 0 ) const noexcept; + QskHashValue hash( QskHashValue seed = 0 ) const noexcept; static QVariant interpolate( const QskShadowMetrics&, const QskShadowMetrics&, qreal progress ); diff --git a/src/common/QskTextColors.cpp b/src/common/QskTextColors.cpp index 10378fa7..53d80878 100644 --- a/src/common/QskTextColors.cpp +++ b/src/common/QskTextColors.cpp @@ -9,7 +9,7 @@ #include #include -uint QskTextColors::hash( uint seed ) const +QskHashValue QskTextColors::hash( QskHashValue seed ) const { const QRgb rgb[] = { textColor.rgba(), styleColor.rgba(), linkColor.rgba() }; return qHashBits( rgb, sizeof( rgb ), seed ); diff --git a/src/common/QskTextColors.h b/src/common/QskTextColors.h index 291a5de8..acd334fa 100644 --- a/src/common/QskTextColors.h +++ b/src/common/QskTextColors.h @@ -25,7 +25,7 @@ class QSK_EXPORT QskTextColors static QVariant interpolate( const QskTextColors&, const QskTextColors&, qreal ratio ); - uint hash( uint seed = 0 ) const; + QskHashValue hash( QskHashValue seed = 0 ) const; QColor textColor; QColor styleColor; diff --git a/src/common/QskTextOptions.cpp b/src/common/QskTextOptions.cpp index 40ee67f9..9ab853e2 100644 --- a/src/common/QskTextOptions.cpp +++ b/src/common/QskTextOptions.cpp @@ -50,9 +50,9 @@ QskTextOptions::TextFormat QskTextOptions::effectiveFormat( const QString& text return m_format; } -uint qHash( const QskTextOptions& options, uint seed ) noexcept +QskHashValue qHash( const QskTextOptions& options, QskHashValue seed ) noexcept { - uint hash; + QskHashValue hash; hash = qHash( options.maximumLineCount(), seed ); hash = qHash( options.fontSizeMode(), hash ); diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h index c585aa89..1aeff827 100644 --- a/src/common/QskTextOptions.h +++ b/src/common/QskTextOptions.h @@ -164,7 +164,7 @@ inline constexpr bool QskTextOptions::operator!=( return !( *this == other ); } -QSK_EXPORT uint qHash( const QskTextOptions&, uint seed = 0 ) noexcept; +QSK_EXPORT QskHashValue qHash( const QskTextOptions&, QskHashValue seed = 0 ) noexcept; #ifndef QT_NO_DEBUG_STREAM class QDebug; diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp index 97feb70d..8355107b 100644 --- a/src/graphic/QskGraphic.cpp +++ b/src/graphic/QskGraphic.cpp @@ -1007,7 +1007,7 @@ quint64 QskGraphic::modificationId() const return m_data->modificationId; } -uint QskGraphic::hash( uint seed ) const +QskHashValue QskGraphic::hash( QskHashValue seed ) const { auto hash = qHash( m_data->renderHints, seed ); diff --git a/src/graphic/QskGraphic.h b/src/graphic/QskGraphic.h index 23cceb01..ff27938f 100644 --- a/src/graphic/QskGraphic.h +++ b/src/graphic/QskGraphic.h @@ -127,7 +127,7 @@ class QSK_EXPORT QskGraphic : public QPaintDevice static QskGraphic fromPixmapAsImage( const QPixmap& ); quint64 modificationId() const; - uint hash( uint seed ) const; + QskHashValue hash( QskHashValue seed ) const; protected: virtual QSize sizeMetrics() const; diff --git a/src/nodes/QskArcNode.cpp b/src/nodes/QskArcNode.cpp index 532375a7..698e8364 100644 --- a/src/nodes/QskArcNode.cpp +++ b/src/nodes/QskArcNode.cpp @@ -32,9 +32,9 @@ void QskArcNode::paint( QPainter* painter, const QSizeF& size ) renderer.renderArc( rect, m_metrics, m_gradient, painter ); } -uint QskArcNode::hash() const +QskHashValue QskArcNode::hash() const { - uint h = m_metrics.hash(); + auto h = m_metrics.hash(); for( const auto& stop : qAsConst( m_gradient.stops() ) ) h = stop.hash( h ); diff --git a/src/nodes/QskArcNode.h b/src/nodes/QskArcNode.h index 191c271b..0bf3724c 100644 --- a/src/nodes/QskArcNode.h +++ b/src/nodes/QskArcNode.h @@ -20,7 +20,7 @@ class QSK_EXPORT QskArcNode : public QskPaintedNode const QskGradient&, QQuickWindow* ); void paint( QPainter* painter, const QSizeF& size ) override; - uint hash() const override; + QskHashValue hash() const override; private: QskArcMetrics m_metrics; diff --git a/src/nodes/QskBoxClipNode.cpp b/src/nodes/QskBoxClipNode.cpp index 9408e22a..40b288e0 100644 --- a/src/nodes/QskBoxClipNode.cpp +++ b/src/nodes/QskBoxClipNode.cpp @@ -9,10 +9,10 @@ #include "QskBoxShapeMetrics.h" #include "QskFunctions.h" -static inline uint qskMetricsHash( +static inline QskHashValue qskMetricsHash( const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border ) { - uint hash = 13000; + QskHashValue hash = 13000; hash = shape.hash( hash ); return border.hash( hash ); @@ -32,7 +32,7 @@ QskBoxClipNode::~QskBoxClipNode() void QskBoxClipNode::setBox( const QRectF& rect, const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border ) { - const uint hash = qskMetricsHash( shape, border ); + const auto hash = qskMetricsHash( shape, border ); if ( hash == m_hash && rect == m_rect ) return; diff --git a/src/nodes/QskBoxClipNode.h b/src/nodes/QskBoxClipNode.h index 0eb6d05d..48194062 100644 --- a/src/nodes/QskBoxClipNode.h +++ b/src/nodes/QskBoxClipNode.h @@ -22,7 +22,7 @@ class QSK_EXPORT QskBoxClipNode : public QSGClipNode const QskBoxShapeMetrics&, const QskBoxBorderMetrics& ); private: - uint m_hash; + QskHashValue m_hash; QRectF m_rect; QSGGeometry m_geometry; diff --git a/src/nodes/QskBoxNode.cpp b/src/nodes/QskBoxNode.cpp index 59ac1343..a8457684 100644 --- a/src/nodes/QskBoxNode.cpp +++ b/src/nodes/QskBoxNode.cpp @@ -20,19 +20,19 @@ QSK_QT_PRIVATE_END Q_GLOBAL_STATIC( QSGVertexColorMaterial, qskMaterialVertex ) -static inline uint qskMetricsHash( +static inline QskHashValue qskMetricsHash( const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& borderMetrics ) { - uint hash = 13000; + QskHashValue hash = 13000; hash = shape.hash( hash ); return borderMetrics.hash( hash ); } -static inline uint qskColorsHash( +static inline QskHashValue qskColorsHash( const QskBoxBorderColors& borderColors, const QskGradient& fillGradient ) { - uint hash = 13000; + QskHashValue hash = 13000; hash = borderColors.hash( hash ); return fillGradient.hash( hash ); } @@ -45,8 +45,8 @@ class QskBoxNodePrivate final : public QSGGeometryNodePrivate { } - uint metricsHash = 0; - uint colorsHash = 0; + QskHashValue metricsHash = 0; + QskHashValue colorsHash = 0; QRectF rect; QSGGeometry geometry; @@ -89,8 +89,8 @@ void QskBoxNode::setBoxData( const QRectF& rect, #endif #if 1 - const uint metricsHash = qskMetricsHash( shape, borderMetrics ); - const uint colorsHash = qskColorsHash( borderColors, fillGradient ); + const auto metricsHash = qskMetricsHash( shape, borderMetrics ); + const auto colorsHash = qskColorsHash( borderColors, fillGradient ); if ( ( metricsHash == d->metricsHash ) && ( colorsHash == d->colorsHash ) && ( rect == d->rect ) ) diff --git a/src/nodes/QskGraphicNode.cpp b/src/nodes/QskGraphicNode.cpp index 4c0b9943..4e3e4d79 100644 --- a/src/nodes/QskGraphicNode.cpp +++ b/src/nodes/QskGraphicNode.cpp @@ -8,11 +8,11 @@ #include "QskColorFilter.h" #include "QskPainterCommand.h" -static inline uint qskHash( +static inline QskHashValue qskHash( const QskGraphic& graphic, const QskColorFilter& colorFilter, QskTextureRenderer::RenderMode renderMode ) { - uint hash = 12000; + QskHashValue hash = 12000; const auto& substitutions = colorFilter.substitutions(); if ( substitutions.size() > 0 ) diff --git a/src/nodes/QskGraphicNode.h b/src/nodes/QskGraphicNode.h index 1e814513..3d5925b5 100644 --- a/src/nodes/QskGraphicNode.h +++ b/src/nodes/QskGraphicNode.h @@ -28,7 +28,7 @@ class QSK_EXPORT QskGraphicNode : public QskTextureNode void setTexture( QQuickWindow*, const QRectF&, uint id, Qt::Orientations ) = delete; - uint m_hash; + QskHashValue m_hash; }; #endif diff --git a/src/nodes/QskPaintedNode.h b/src/nodes/QskPaintedNode.h index cb1ccf15..6b53ab6a 100644 --- a/src/nodes/QskPaintedNode.h +++ b/src/nodes/QskPaintedNode.h @@ -22,7 +22,7 @@ class QSK_EXPORT QskPaintedNode : public QskTextureNode virtual void paint( QPainter*, const QSizeF& ) = 0; // a hash value of '0' always results in repainting - virtual uint hash() const = 0; + virtual QskHashValue hash() const = 0; private: class PaintHelper; @@ -30,7 +30,7 @@ class QSK_EXPORT QskPaintedNode : public QskTextureNode void setTexture( QQuickWindow*, const QRectF&, uint id, Qt::Orientations ) = delete; - uint m_hash; + QskHashValue m_hash; }; #endif diff --git a/src/nodes/QskTextNode.cpp b/src/nodes/QskTextNode.cpp index 67fe053d..15b211fa 100644 --- a/src/nodes/QskTextNode.cpp +++ b/src/nodes/QskTextNode.cpp @@ -11,12 +11,12 @@ #include #include -static inline uint qskHash( +static inline QskHashValue qskHash( const QString& text, const QSizeF& size, const QFont& font, const QskTextOptions& options, const QskTextColors& colors, Qt::Alignment alignment, Qsk::TextStyle textStyle ) { - uint hash = 11000; + QskHashValue hash = 11000; hash = qHash( text, hash ); hash = qHash( font, hash ); @@ -49,7 +49,7 @@ void QskTextNode::setTextData( if ( matrix != this->matrix() ) // avoid setting DirtyMatrix accidently setMatrix( matrix ); - const uint hash = qskHash( text, rect.size(), font, + const auto hash = qskHash( text, rect.size(), font, options, colors, alignment, textStyle ); if ( hash != m_hash ) diff --git a/src/nodes/QskTextNode.h b/src/nodes/QskTextNode.h index f09328ba..a5bff603 100644 --- a/src/nodes/QskTextNode.h +++ b/src/nodes/QskTextNode.h @@ -29,7 +29,7 @@ class QSK_EXPORT QskTextNode : public QSGTransformNode Qt::Alignment, Qsk::TextStyle ); private: - uint m_hash; + QskHashValue m_hash; }; #endif diff --git a/src/nodes/QskTickmarksNode.cpp b/src/nodes/QskTickmarksNode.cpp index bf06f862..b2a1df04 100644 --- a/src/nodes/QskTickmarksNode.cpp +++ b/src/nodes/QskTickmarksNode.cpp @@ -34,7 +34,7 @@ class QskTickmarksNodePrivate final : public QSGGeometryNodePrivate QRectF rect; int lineWidth = 0; - uint hash = 0; + QskHashValue hash = 0; }; QskTickmarksNode::QskTickmarksNode() @@ -65,7 +65,7 @@ void QskTickmarksNode::update( markDirty( QSGNode::DirtyGeometry ); } - const uint hash = tickmarks.hash( 17435 ); + const auto hash = tickmarks.hash( 17435 ); if( ( hash != d->hash ) || ( rect != d->rect ) ) {