168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compiler errors

This commit is contained in:
Vogel, Rick 2023-08-02 15:13:17 +02:00
parent 4e126156a2
commit 6542c061c9
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/controls/QskLevelingSensor.h
View File

@ -2,10 +2,9 @@
#define QSK_LEVELING_SENSOR_H #define QSK_LEVELING_SENSOR_H
#include <QskControl.h> #include <QskControl.h>
#include <QskScaleTickmarks.h>
#include <memory> #include <memory>
class QskScaleTickmarks;
class QSK_EXPORT QskLevelingSensor : public QskControl class QSK_EXPORT QskLevelingSensor : public QskControl
{ {
Q_OBJECT Q_OBJECT

6
src/controls/private/QskLevelingSensorNodes.h
View File

@ -3,10 +3,12 @@
#include "QskLevelingSensorUtility.h" #include "QskLevelingSensorUtility.h"
#include <QskScaleTickmarks.h>
#include <QskAspect.h> #include <QskAspect.h>
#include <QskTextNode.h> #include <QskScaleTickmarks.h>
#include <QskSkinlet.h>
#include <QskSkinnable.h> #include <QskSkinnable.h>
#include <QskTextNode.h>
#include <QskTextOptions.h>
#include <QSGFlatColorMaterial> #include <QSGFlatColorMaterial>
#include <QSGGeometry> #include <QSGGeometry>

9
src/controls/private/QskLevelingSensorSkinlet.cpp
View File

@ -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<> template<>
Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect< R::OuterDisk >( Q_REQUIRED_RESULT QRectF QskLevelingSensorSkinlet::subControlRect< R::OuterDisk >(
const QskLevelingSensor* const sensor, const QRectF& contentsRect ) const const QskLevelingSensor* const sensor, const QRectF& contentsRect ) const
@ -244,10 +240,6 @@ QRectF QskLevelingSensorSkinlet::subControlRect( const QskSkinnable* skinnable,
return Inherited::subControlRect( skinnable, contentsRect, subControl ); 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<> template<>
QSGNode* QskLevelingSensorSkinlet::updateSubNode< R::OuterDisk >( QSGNode* QskLevelingSensorSkinlet::updateSubNode< R::OuterDisk >(
const QskLevelingSensor* const sensor, const quint8 nodeRole, QSGNode* const node ) const 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 auto subControl = Q::TickmarksZ;
const State< QskAspect::Subcontrol > state( sensor, subControl ); const State< QskAspect::Subcontrol > state( sensor, subControl );
const auto color = sensor->color( subControl ); const auto color = sensor->color( subControl );
const auto scale = sensor->strutSizeHint( subControl );
const auto r3 = qvariant_cast< QVector3D >( sensor->effectiveSkinHint( subControl ) ) * const auto r3 = qvariant_cast< QVector3D >( sensor->effectiveSkinHint( subControl ) ) *
( state.r2 - state.r1 ) + ( state.r2 - state.r1 ) +

3
src/controls/private/QskSGNodeUtility.h
View File

@ -21,9 +21,8 @@ namespace QskSGNode
if constexpr ( mode == Recursive ) if constexpr ( mode == Recursive )
{ {
QSGNode* current = root;
( (
[ & ]( QSGNode* const child ) { [ current = root ]( QSGNode* const child ) mutable {
current->appendChildNode( child ); current->appendChildNode( child );
current = child; current = child;
}( new Children ), }( new Children ),