From 6542c061c984c69f9773000f6832e4a97c2a98cf Mon Sep 17 00:00:00 2001 From: "Vogel, Rick" Date: Wed, 2 Aug 2023 15:13:17 +0200 Subject: [PATCH] fix compiler errors --- src/controls/QskLevelingSensor.h | 3 +-- src/controls/private/QskLevelingSensorNodes.h | 6 ++++-- src/controls/private/QskLevelingSensorSkinlet.cpp | 9 --------- src/controls/private/QskSGNodeUtility.h | 3 +-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/controls/QskLevelingSensor.h b/src/controls/QskLevelingSensor.h index 1d88c957..59fcc29a 100644 --- a/src/controls/QskLevelingSensor.h +++ b/src/controls/QskLevelingSensor.h @@ -2,10 +2,9 @@ #define QSK_LEVELING_SENSOR_H #include +#include #include -class QskScaleTickmarks; - class QSK_EXPORT QskLevelingSensor : public QskControl { Q_OBJECT diff --git a/src/controls/private/QskLevelingSensorNodes.h b/src/controls/private/QskLevelingSensorNodes.h index 76bd8db1..418f5044 100644 --- a/src/controls/private/QskLevelingSensorNodes.h +++ b/src/controls/private/QskLevelingSensorNodes.h @@ -3,10 +3,12 @@ #include "QskLevelingSensorUtility.h" -#include #include -#include +#include +#include #include +#include +#include #include #include diff --git a/src/controls/private/QskLevelingSensorSkinlet.cpp b/src/controls/private/QskLevelingSensorSkinlet.cpp index 77d0b53c..88acaf5c 100644 --- a/src/controls/private/QskLevelingSensorSkinlet.cpp +++ b/src/controls/private/QskLevelingSensorSkinlet.cpp @@ -199,10 +199,6 @@ QskLevelingSensorSkinlet::QskLevelingSensorSkinlet( QskSkin* skin ) } ); } -template< QskLevelingSensorSkinlet::NodeRole > -Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect( - const QskLevelingSensor* const sensor, const QRectF& contentsRect ) const = delete; - template<> Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect< R::OuterDisk >( const QskLevelingSensor* const sensor, const QRectF& contentsRect ) const @@ -244,10 +240,6 @@ QRectF QskLevelingSensorSkinlet::subControlRect( const QskSkinnable* skinnable, return Inherited::subControlRect( skinnable, contentsRect, subControl ); } -template< QskLevelingSensorSkinlet::NodeRole > -QSGNode* QskLevelingSensorSkinlet::updateSubNode( const QskLevelingSensor* const sensor, - const quint8 nodeRole, QSGNode* const node ) const = delete; - template<> QSGNode* QskLevelingSensorSkinlet::updateSubNode< R::OuterDisk >( const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node ) const @@ -378,7 +370,6 @@ QSGNode* QskLevelingSensorSkinlet::updateSubNode< R::TickmarksZ >( const auto subControl = Q::TickmarksZ; const State< QskAspect::Subcontrol > state( sensor, subControl ); const auto color = sensor->color( subControl ); - const auto scale = sensor->strutSizeHint( subControl ); const auto r3 = qvariant_cast< QVector3D >( sensor->effectiveSkinHint( subControl ) ) * ( state.r2 - state.r1 ) + diff --git a/src/controls/private/QskSGNodeUtility.h b/src/controls/private/QskSGNodeUtility.h index 42bdf208..ab7abe42 100644 --- a/src/controls/private/QskSGNodeUtility.h +++ b/src/controls/private/QskSGNodeUtility.h @@ -21,9 +21,8 @@ namespace QskSGNode if constexpr ( mode == Recursive ) { - QSGNode* current = root; ( - [ & ]( QSGNode* const child ) { + [ current = root ]( QSGNode* const child ) mutable { current->appendChildNode( child ); current = child; }( new Children ),