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

uncrustified

This commit is contained in:
Uwe Rathmann 2021-08-04 09:31:16 +02:00
parent 66cc68bcda
commit 923affe749
64 changed files with 863 additions and 848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/iotdashboard/Box.h
View File

@ -13,6 +13,7 @@ class QskTextLabel;
class Box : public QskLinearBox class Box : public QskLinearBox
{ {
Q_OBJECT Q_OBJECT
public: public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )

5
examples/iotdashboard/BoxWithButtons.h
View File

@ -19,7 +19,8 @@ class ButtonValueLabel : public QskTextLabel
public: public:
QSK_SUBCONTROLS( Text ) QSK_SUBCONTROLS( Text )
ButtonValueLabel( const QString& text, QQuickItem* parent ) : QskTextLabel( text, parent ) ButtonValueLabel( const QString& text, QQuickItem* parent )
: QskTextLabel( text, parent )
{ {
} }
@ -90,7 +91,7 @@ class IndoorTemperature : public BoxWithButtons
} }
}; };
class Humidity: public BoxWithButtons class Humidity : public BoxWithButtons
{ {
public: public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )

12
examples/iotdashboard/Diagram.cpp
View File

@ -8,15 +8,11 @@
class Diagram::PrivateData class Diagram::PrivateData
{ {
public: public:
PrivateData() QVector< QVector< QPointF > > dataPoints;
{
}
QVector<QVector<QPointF> > dataPoints;
int xGridLines = -1; int xGridLines = -1;
qreal yMax = -1; qreal yMax = -1;
Qsk::Position position = Qsk::Bottom; Qsk::Position position = Qsk::Bottom;
QVector<Types> types; QVector< Types > types;
}; };
QSK_SUBCONTROL( Diagram, Chart ) QSK_SUBCONTROL( Diagram, Chart )
@ -38,12 +34,12 @@ Diagram::~Diagram()
{ {
} }
QVector< QVector<QPointF> > Diagram::dataPoints() const QVector< QVector< QPointF > > Diagram::dataPoints() const
{ {
return m_data->dataPoints; return m_data->dataPoints;
} }
void Diagram::addDataPoints( const QVector<QPointF>& dataPoints, const Types& types ) void Diagram::addDataPoints( const QVector< QPointF >& dataPoints, const Types& types )
{ {
m_data->dataPoints.append( dataPoints ); m_data->dataPoints.append( dataPoints );
m_data->types.append( types ); m_data->types.append( types );

4
examples/iotdashboard/Diagram.h
View File

@ -29,8 +29,8 @@ class Diagram : public QskControl
Diagram( QQuickItem* parent = nullptr ); Diagram( QQuickItem* parent = nullptr );
~Diagram() override; ~Diagram() override;
QVector< QVector<QPointF> > dataPoints() const; QVector< QVector< QPointF > > dataPoints() const;
void addDataPoints( const QVector<QPointF>& dataPoints, const Types& types ); void addDataPoints( const QVector< QPointF >& dataPoints, const Types& types );
Types typesAt( uint pos ) const; Types typesAt( uint pos ) const;

10
examples/iotdashboard/DiagramSkinlet.cpp
View File

@ -95,7 +95,7 @@ QSGNode* DiagramSkinlet::updateChartNode( const Diagram* diagram, QSGNode* node
const QRectF rect = diagram->subControlRect( Q::Chart ); const QRectF rect = diagram->subControlRect( Q::Chart );
const qreal yMax = diagram->yMax(); const qreal yMax = diagram->yMax();
const Qsk::Position position = diagram->chartPosition(); const Qsk::Position position = diagram->chartPosition();
QVector<Diagram::Type> types = {Diagram::Line, Diagram::Area}; QVector< Diagram::Type > types = { Diagram::Line, Diagram::Area };
for( int i = 0; i < diagram->dataPoints().size(); ++i ) for( int i = 0; i < diagram->dataPoints().size(); ++i )
{ {
@ -111,7 +111,7 @@ QSGNode* DiagramSkinlet::updateChartNode( const Diagram* diagram, QSGNode* node
node->appendChildNode( chartNode ); node->appendChildNode( chartNode );
} }
const QVector<QPointF> dataPoints = diagram->dataPoints().at( i ); const QVector< QPointF > dataPoints = diagram->dataPoints().at( i );
int nodeIndex = 0; int nodeIndex = 0;
QskAspect::Subcontrol lineSubcontrol = lineForIndex( i ); QskAspect::Subcontrol lineSubcontrol = lineForIndex( i );
QskAspect::Subcontrol areaSubcontrol = areaForIndex( i ); QskAspect::Subcontrol areaSubcontrol = areaForIndex( i );
@ -125,7 +125,7 @@ QSGNode* DiagramSkinlet::updateChartNode( const Diagram* diagram, QSGNode* node
if( chartNode->childCount() > nodeIndex ) if( chartNode->childCount() > nodeIndex )
{ {
dataPointNode = static_cast<DiagramDataNode*>( chartNode->childAtIndex( nodeIndex ) ); dataPointNode = static_cast< DiagramDataNode* >( chartNode->childAtIndex( nodeIndex ) );
} }
else else
{ {
@ -162,7 +162,7 @@ QSGNode* DiagramSkinlet::updateSeparatorNode( const Diagram* diagram, QSGNode* n
return nullptr; return nullptr;
} }
auto* separatorNode = static_cast<DiagramSegmentsNode*>( node ); auto* separatorNode = static_cast< DiagramSegmentsNode* >( node );
if( separatorNode == nullptr ) if( separatorNode == nullptr )
{ {
@ -172,7 +172,7 @@ QSGNode* DiagramSkinlet::updateSeparatorNode( const Diagram* diagram, QSGNode* n
using Q = Diagram; using Q = Diagram;
const QRectF rect = diagram->subControlRect( Q::Chart ); const QRectF rect = diagram->subControlRect( Q::Chart );
const QColor color = diagram->color( Q::Segments ); const QColor color = diagram->color( Q::Segments );
const QVector< QVector<QPointF> > dataPoints = diagram->dataPoints(); const QVector< QVector< QPointF > > dataPoints = diagram->dataPoints();
separatorNode->update( rect, color, dataPoints, xGridLines ); separatorNode->update( rect, color, dataPoints, xGridLines );

2
examples/iotdashboard/LightIntensity.cpp
View File

@ -39,7 +39,7 @@ class DimmerAnimator : public QskAnimator
: m_display( display ) : m_display( display )
, m_dimmer( dimmer ) , m_dimmer( dimmer )
{ {
QQuickWindow* w = static_cast<QQuickWindow*>( qGuiApp->allWindows().at( 0 ) ); QQuickWindow* w = static_cast< QQuickWindow* >( qGuiApp->allWindows().at( 0 ) );
setWindow( w ); setWindow( w );
setDuration( 500 ); setDuration( 500 );
setEasingCurve( QEasingCurve::Linear ); setEasingCurve( QEasingCurve::Linear );

5
examples/iotdashboard/LightIntensity.h
View File

@ -23,7 +23,8 @@ class LightIntensityValueLabel : public QskTextLabel
public: public:
QSK_SUBCONTROLS( Text ) QSK_SUBCONTROLS( Text )
LightIntensityValueLabel( const QString& text, QQuickItem* parent ) : QskTextLabel( text, parent ) LightIntensityValueLabel( const QString& text, QQuickItem* parent )
: QskTextLabel( text, parent )
{ {
} }
@ -39,7 +40,7 @@ class LightIntensityValueLabel : public QskTextLabel
} }
}; };
class LightDimmer: public QQuickPaintedItem class LightDimmer : public QQuickPaintedItem
{ {
Q_OBJECT Q_OBJECT

8
examples/iotdashboard/MainContent.cpp
View File

@ -32,7 +32,8 @@ QSK_SUBCONTROL( ShadowPositioner, Panel )
QSK_SUBCONTROL( MainContent, Panel ) QSK_SUBCONTROL( MainContent, Panel )
QSK_SUBCONTROL( MainContentGridBox, Panel ) QSK_SUBCONTROL( MainContentGridBox, Panel )
ShadowPositioner::ShadowPositioner( QQuickItem* parent ) : QskControl( parent ) ShadowPositioner::ShadowPositioner( QQuickItem* parent )
: QskControl( parent )
{ {
setAutoLayoutChildren( true ); setAutoLayoutChildren( true );
} }
@ -68,7 +69,7 @@ void ShadowPositioner::setGridBox( QskGridBox* gridBox )
void ShadowPositioner::updateLayout() void ShadowPositioner::updateLayout()
{ {
auto* mainContent = static_cast<QskLinearBox*>( parentItem() ); auto* mainContent = static_cast< QskLinearBox* >( parentItem() );
QTimer::singleShot( 0, this, [this, mainContent]() QTimer::singleShot( 0, this, [this, mainContent]()
{ {
@ -81,7 +82,8 @@ void ShadowPositioner::updateLayout()
} ); } );
} }
MainContent::MainContent( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) MainContent::MainContent( QQuickItem* parent )
: QskLinearBox( Qt::Vertical, parent )
{ {
setAutoAddChildren( false ); setAutoAddChildren( false );
setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding ); setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );

2
examples/iotdashboard/MainContent.h
View File

@ -25,7 +25,7 @@ class ShadowPositioner : public QskControl
private: private:
QskGridBox* m_gridBox; QskGridBox* m_gridBox;
QVector<ShadowedRectangle*> m_rectangles; QVector< ShadowedRectangle* > m_rectangles;
}; };
class MainContentGridBox : public QskGridBox class MainContentGridBox : public QskGridBox

8
examples/iotdashboard/MenuBar.cpp
View File

@ -21,8 +21,9 @@ QSK_SUBCONTROL( MenuBar, Panel )
QSK_STATE( MenuItem, Active, ( QskAspect::FirstUserState << 1 ) ) QSK_STATE( MenuItem, Active, ( QskAspect::FirstUserState << 1 ) )
MenuItem::MenuItem( const QString& name, QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent ), MenuItem::MenuItem( const QString& name, QQuickItem* parent )
m_name( name ) : QskLinearBox( Qt::Horizontal, parent )
, m_name( name )
{ {
setAutoLayoutChildren( true ); setAutoLayoutChildren( true );
setAutoAddChildren( true ); setAutoAddChildren( true );
@ -53,7 +54,8 @@ QskAspect::Subcontrol MenuItem::effectiveSubcontrol( QskAspect::Subcontrol subCo
} }
MenuBar::MenuBar( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) MenuBar::MenuBar( QQuickItem* parent )
: QskLinearBox( Qt::Vertical, parent )
{ {
setPanel( true ); setPanel( true );
setSizePolicy( QskSizePolicy::Minimum, QskSizePolicy::Preferred ); setSizePolicy( QskSizePolicy::Minimum, QskSizePolicy::Preferred );

3
examples/iotdashboard/PieChart.cpp
View File

@ -8,7 +8,8 @@
QSK_SUBCONTROL( PieChart, Panel ) QSK_SUBCONTROL( PieChart, Panel )
QSK_SUBCONTROL( PieChart, Labels ) QSK_SUBCONTROL( PieChart, Labels )
PieChart::PieChart( QQuickItem* parent ) : QskControl( parent ) PieChart::PieChart( QQuickItem* parent )
: QskControl( parent )
{ {
} }

2
examples/iotdashboard/PieChartPainted.cpp
View File

@ -37,7 +37,7 @@ class ProgressBarAnimator : public QskAnimator
: m_pieChart( pieChart ) : m_pieChart( pieChart )
, m_progressBar( progressBar ) , m_progressBar( progressBar )
{ {
QQuickWindow* w = static_cast<QQuickWindow*>( qGuiApp->allWindows().at( 0 ) ); QQuickWindow* w = static_cast< QQuickWindow* >( qGuiApp->allWindows().at( 0 ) );
setWindow( w ); setWindow( w );
setDuration( 500 ); setDuration( 500 );
setEasingCurve( QEasingCurve::Linear ); setEasingCurve( QEasingCurve::Linear );

3
examples/iotdashboard/PieChartSkinlet.cpp
View File

@ -11,7 +11,8 @@
#include <QskBoxBorderMetrics.h> #include <QskBoxBorderMetrics.h>
#include <QskBoxBorderColors.h> #include <QskBoxBorderColors.h>
PieChartSkinlet::PieChartSkinlet( QskSkin* skin ) : QskSkinlet( skin ) PieChartSkinlet::PieChartSkinlet( QskSkin* skin )
: QskSkinlet( skin )
{ {
setNodeRoles( { PanelRole, LabelsRole } ); setNodeRoles( { PanelRole, LabelsRole } );
} }

3
examples/iotdashboard/RoundedIcon.h
View File

@ -19,7 +19,8 @@ class RoundedIcon : public QskBox
QSK_SUBCONTROLS( Panel, Icon ) QSK_SUBCONTROLS( Panel, Icon )
QSK_STATES( Bright, Small ) // to differentiate between orange and purple and small vs. big QSK_STATES( Bright, Small ) // to differentiate between orange and purple and small vs. big
RoundedIcon( const QString& iconName, bool isBright, bool isSmall, QQuickItem* parent = nullptr ); RoundedIcon( const QString& iconName, bool isBright, bool isSmall,
QQuickItem* parent = nullptr );
QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override QskAspect::Subcontrol subControl ) const override

3
examples/iotdashboard/Skin.cpp
View File

@ -43,7 +43,8 @@ namespace
} }
Skin::Skin( const Palette& palette, QObject* parent ) : QskSkin( parent ) Skin::Skin( const Palette& palette, QObject* parent )
: QskSkin( parent )
{ {
declareSkinlet< Diagram, DiagramSkinlet >(); declareSkinlet< Diagram, DiagramSkinlet >();

9
examples/iotdashboard/Skin.h
View File

@ -15,9 +15,10 @@ class Skin : public QskSkin
class Palette class Palette
{ {
public: public:
Palette( const QskGradient& menuBar, const QskGradient& mainContent, const QskGradient& box, Palette( const QskGradient& menuBar, const QskGradient& mainContent,
const QColor& lightDisplay, const QColor& pieChart, const QskGradient& roundButton, const QskGradient& box, const QColor& lightDisplay, const QColor& pieChart,
const QColor& weekdayBox, const QColor& text, const QColor& shadow ) const QskGradient& roundButton, const QColor& weekdayBox,
const QColor& text, const QColor& shadow )
: menuBar( menuBar ) : menuBar( menuBar )
, mainContent( mainContent ) , mainContent( mainContent )
, box( box ) , box( box )
@ -41,7 +42,7 @@ class Skin : public QskSkin
}; };
Skin( const Palette& palette, QObject* parent = nullptr ); Skin( const Palette& palette, QObject* parent = nullptr );
virtual ~Skin(); ~Skin() override;
enum SkinFontRole enum SkinFontRole
{ {

3
examples/iotdashboard/TopBar.cpp
View File

@ -74,7 +74,8 @@ TopBarItem::TopBarItem( int index, const QString& name, const QskGradient& gradi
} }
TopBar::TopBar( QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent ) TopBar::TopBar( QQuickItem* parent )
: QskLinearBox( Qt::Horizontal, parent )
{ {
setPanel( true ); setPanel( true );
setAutoLayoutChildren( true ); setAutoLayoutChildren( true );

4
examples/iotdashboard/UsageDiagram.cpp
View File

@ -78,7 +78,7 @@ UsageDiagram::UsageDiagram( QQuickItem* parent )
// These values are calculated with a boost::math::cubic_b_spline. // These values are calculated with a boost::math::cubic_b_spline.
// We just output the values here to get rid of the dependency: // We just output the values here to get rid of the dependency:
std::vector< std::vector<qreal> > yValues = std::vector< std::vector< qreal > > yValues =
{ {
{64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 63.99, 63.96, 63.85, 63.64, 63.30, 62.79, 62.09, 61.14, 59.93, 58.42, 56.59, 54.50, 52.23, 49.84, 47.42, 45.03, 42.76, 40.68, 38.85, 37.36, 36.27, 35.55, 35.19, 35.14, 35.39, 35.91, 36.65, 37.60, 38.73, 40.00, 41.39, 42.87, 44.41, 46.00, 47.60, 49.19, 50.76, 52.26, 53.68, 55.00, 56.19, 57.24, 58.15, 58.90, 59.51, 59.95, 60.23, 60.33, 60.26, 60.00, 59.56, 58.94, 58.17, 57.27, 56.24, 55.12, 53.92, 52.65, 51.34, 50.00, 48.65, 47.32, 46.03, 44.79, 43.65, 42.61, 41.70, 40.95, 40.37, 40.00, 39.85, 39.94, 40.26, 40.84, 41.67, 42.77, 44.15, 45.80, 47.75, 50.00, 52.54, 55.30, 58.19, 61.13, 64.04, 66.82, 69.40, 71.67, 73.57}, {64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 64.00, 63.99, 63.96, 63.85, 63.64, 63.30, 62.79, 62.09, 61.14, 59.93, 58.42, 56.59, 54.50, 52.23, 49.84, 47.42, 45.03, 42.76, 40.68, 38.85, 37.36, 36.27, 35.55, 35.19, 35.14, 35.39, 35.91, 36.65, 37.60, 38.73, 40.00, 41.39, 42.87, 44.41, 46.00, 47.60, 49.19, 50.76, 52.26, 53.68, 55.00, 56.19, 57.24, 58.15, 58.90, 59.51, 59.95, 60.23, 60.33, 60.26, 60.00, 59.56, 58.94, 58.17, 57.27, 56.24, 55.12, 53.92, 52.65, 51.34, 50.00, 48.65, 47.32, 46.03, 44.79, 43.65, 42.61, 41.70, 40.95, 40.37, 40.00, 39.85, 39.94, 40.26, 40.84, 41.67, 42.77, 44.15, 45.80, 47.75, 50.00, 52.54, 55.30, 58.19, 61.13, 64.04, 66.82, 69.40, 71.67, 73.57},
{36.00, 36.01, 36.11, 36.37, 36.88, 37.73, 38.98, 40.73, 43.07, 46.06, 49.80, 54.31, 59.38, 64.73, 70.09, 75.20, 79.77, 83.55, 86.24, 87.59, 87.33, 85.26, 81.61, 76.64, 70.67, 63.98, 56.86, 49.61, 42.52, 35.89, 30.00, 25.09, 21.14, 18.08, 15.83, 14.31, 13.45, 13.16, 13.37, 14.01, 15.00, 16.26, 17.73, 19.36, 21.07, 22.82, 24.55, 26.19, 27.68, 28.97, 30.00, 30.73, 31.25, 31.65, 32.04, 32.52, 33.21, 34.19, 35.58, 37.48, 40.00, 43.17, 46.80, 50.61, 54.33, 57.71, 60.47, 62.35, 63.07, 62.38, 60.00, 55.79, 50.12, 43.46, 36.31, 29.13, 22.43, 16.68, 12.37, 9.98, 10.00, 12.73, 17.76, 24.50, 32.36, 40.75, 49.09, 56.77, 63.21, 67.81, 70.00, 69.37, 66.28, 61.29, 54.96, 47.85, 40.51, 33.50, 27.37, 22.68}, {36.00, 36.01, 36.11, 36.37, 36.88, 37.73, 38.98, 40.73, 43.07, 46.06, 49.80, 54.31, 59.38, 64.73, 70.09, 75.20, 79.77, 83.55, 86.24, 87.59, 87.33, 85.26, 81.61, 76.64, 70.67, 63.98, 56.86, 49.61, 42.52, 35.89, 30.00, 25.09, 21.14, 18.08, 15.83, 14.31, 13.45, 13.16, 13.37, 14.01, 15.00, 16.26, 17.73, 19.36, 21.07, 22.82, 24.55, 26.19, 27.68, 28.97, 30.00, 30.73, 31.25, 31.65, 32.04, 32.52, 33.21, 34.19, 35.58, 37.48, 40.00, 43.17, 46.80, 50.61, 54.33, 57.71, 60.47, 62.35, 63.07, 62.38, 60.00, 55.79, 50.12, 43.46, 36.31, 29.13, 22.43, 16.68, 12.37, 9.98, 10.00, 12.73, 17.76, 24.50, 32.36, 40.75, 49.09, 56.77, 63.21, 67.81, 70.00, 69.37, 66.28, 61.29, 54.96, 47.85, 40.51, 33.50, 27.37, 22.68},
@ -89,7 +89,7 @@ UsageDiagram::UsageDiagram( QQuickItem* parent )
{ {
auto y = yValues[i]; auto y = yValues[i];
QVector<QPointF> dataPoints; QVector< QPointF > dataPoints;
dataPoints.reserve( number ); dataPoints.reserve( number );
for( int x = 0; x < number; ++x ) for( int x = 0; x < number; ++x )

12
examples/iotdashboard/UsageDiagram.h
View File

@ -23,7 +23,8 @@ class WeekdayLabel : public QskTextLabel
public: public:
QSK_SUBCONTROLS( Panel, Text ) QSK_SUBCONTROLS( Panel, Text )
WeekdayLabel( const QString& text, QQuickItem* parent ) : QskTextLabel( text, parent ) WeekdayLabel( const QString& text, QQuickItem* parent )
: QskTextLabel( text, parent )
{ {
setPanel( true ); setPanel( true );
} }
@ -52,7 +53,8 @@ class WeekdayBox : public QskBox
public: public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )
WeekdayBox( QQuickItem* parent ) : QskBox( true, parent ) WeekdayBox( QQuickItem* parent ):
QskBox( true, parent )
{ {
} }
@ -75,7 +77,8 @@ class CaptionColorBox : public QskBox
public: public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )
CaptionColorBox( QQuickItem* parent ) : QskBox( true, parent ) CaptionColorBox( QQuickItem* parent ):
QskBox( true, parent )
{ {
} }
@ -109,7 +112,8 @@ class CaptionBox : public QskLinearBox
public: public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )
CaptionBox( QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent ) CaptionBox( QQuickItem* parent ):
QskLinearBox( Qt::Horizontal, parent )
{ {
setPanel( true ); setPanel( true );
} }

3
examples/iotdashboard/main.cpp
View File

@ -28,7 +28,8 @@ namespace
Q_OBJECT Q_OBJECT
public: public:
SkinFactory( QObject* parent = nullptr ) : QskSkinFactory( parent ) SkinFactory( QObject* parent = nullptr )
: QskSkinFactory( parent )
{ {
} }

3
examples/iotdashboard/nodes/DiagramDataNode.cpp
View File

@ -14,7 +14,8 @@ DiagramDataNode::DiagramDataNode()
setMaterial( &m_material ); setMaterial( &m_material );
} }
void DiagramDataNode::update( const QRectF& rect, Type type, const QColor& color, const QVector<QPointF>& dataPoints, void DiagramDataNode::update( const QRectF& rect, Type type,
const QColor& color, const QVector< QPointF >& dataPoints,
const qreal yMax, Qsk::Position position, int lineWidth ) const qreal yMax, Qsk::Position position, int lineWidth )
{ {
Q_UNUSED( rect ); Q_UNUSED( rect );

4
examples/iotdashboard/nodes/DiagramDataNode.h
View File

@ -23,7 +23,7 @@ class DiagramDataNode : public QSGGeometryNode
DiagramDataNode(); DiagramDataNode();
void update( const QRectF& rect, Type type, const QColor& color, const QVector<QPointF>& dataPoints, const qreal yMax, Qsk::Position position, int lineWidth ); void update( const QRectF& rect, Type type, const QColor& color, const QVector< QPointF >& dataPoints, const qreal yMax, Qsk::Position position, int lineWidth );
private: private:
QSGFlatColorMaterial m_material; QSGFlatColorMaterial m_material;
@ -32,7 +32,7 @@ class DiagramDataNode : public QSGGeometryNode
QRectF m_rect; QRectF m_rect;
Type m_type; Type m_type;
QColor m_color; QColor m_color;
QVector<QPointF> m_dataPoints; QVector< QPointF > m_dataPoints;
qreal m_yMax; qreal m_yMax;
Qsk::Position m_position; Qsk::Position m_position;
int m_lineWidth; int m_lineWidth;

3
examples/iotdashboard/nodes/DiagramSegmentsNode.cpp
View File

@ -20,7 +20,8 @@ DiagramSegmentsNode::DiagramSegmentsNode()
setMaterial( &m_material ); setMaterial( &m_material );
} }
void DiagramSegmentsNode::update( const QRectF& rect, const QColor& color, const QVector<QVector<QPointF> >& dataPoints, int xGridLines ) void DiagramSegmentsNode::update( const QRectF& rect, const QColor& color,
const QVector< QVector< QPointF > >& dataPoints, int xGridLines )
{ {
Q_UNUSED( rect ); Q_UNUSED( rect );

4
examples/iotdashboard/nodes/DiagramSegmentsNode.h
View File

@ -15,7 +15,7 @@ class DiagramSegmentsNode : public QSGGeometryNode
public: public:
DiagramSegmentsNode(); DiagramSegmentsNode();
void update( const QRectF& rect, const QColor& color, const QVector< QVector<QPointF> >& dataPoints, int xGridLines ); void update( const QRectF& rect, const QColor& color, const QVector< QVector< QPointF > >& dataPoints, int xGridLines );
private: private:
QSGFlatColorMaterial m_material; QSGFlatColorMaterial m_material;
@ -23,7 +23,7 @@ class DiagramSegmentsNode : public QSGGeometryNode
QRectF m_rect; QRectF m_rect;
QColor m_color; QColor m_color;
QVector< QVector<QPointF> > m_dataPoints; QVector< QVector< QPointF > > m_dataPoints;
int m_xGridLines; int m_xGridLines;
}; };

2
src/controls/QskEvent.h
View File

@ -48,7 +48,7 @@ class QSK_EXPORT QskEvent : public QEvent
QskEvent( QskEvent::Type type ); QskEvent( QskEvent::Type type );
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
virtual QskEvent *clone() const; virtual QskEvent* clone() const;
#endif #endif
}; };

8
src/controls/QskSkinHintTableEditor.cpp
View File

@ -82,7 +82,7 @@ void QskSkinHintTableEditor::setFlag( QskAspect aspect, int flag )
int QskSkinHintTableEditor::flag( QskAspect aspect ) const int QskSkinHintTableEditor::flag( QskAspect aspect ) const
{ {
return flagHint<int>( aspect ); return flagHint< int >( aspect );
} }
void QskSkinHintTableEditor::setMetric( QskAspect aspect, qreal metric ) void QskSkinHintTableEditor::setMetric( QskAspect aspect, qreal metric )
@ -92,7 +92,7 @@ void QskSkinHintTableEditor::setMetric( QskAspect aspect, qreal metric )
qreal QskSkinHintTableEditor::metric( QskAspect aspect ) const qreal QskSkinHintTableEditor::metric( QskAspect aspect ) const
{ {
return metricHint<qreal>( aspect ); return metricHint< qreal >( aspect );
} }
void QskSkinHintTableEditor::setColor( QskAspect aspect, Qt::GlobalColor color ) void QskSkinHintTableEditor::setColor( QskAspect aspect, Qt::GlobalColor color )
@ -112,7 +112,7 @@ void QskSkinHintTableEditor::setColor( QskAspect aspect, const QColor& color )
QColor QskSkinHintTableEditor::color( QskAspect aspect ) const QColor QskSkinHintTableEditor::color( QskAspect aspect ) const
{ {
return colorHint<QColor>( aspect ); return colorHint< QColor >( aspect );
} }
void QskSkinHintTableEditor::setHGradient( void QskSkinHintTableEditor::setHGradient(
@ -134,7 +134,7 @@ void QskSkinHintTableEditor::setGradient( QskAspect aspect, const QskGradient& g
QskGradient QskSkinHintTableEditor::gradient( QskAspect aspect ) const QskGradient QskSkinHintTableEditor::gradient( QskAspect aspect ) const
{ {
return colorHint<QskGradient>( aspect ); return colorHint< QskGradient >( aspect );
} }
void QskSkinHintTableEditor::setStrutSize( QskAspect aspect, const QSizeF& size ) void QskSkinHintTableEditor::setStrutSize( QskAspect aspect, const QSizeF& size )

4
src/controls/QskStatusIndicator.cpp
View File

@ -54,7 +54,7 @@ class QskStatusIndicator::PrivateData
int currentStatus; int currentStatus;
QMap< int, StatusData > map; QMap< int, StatusData > map;
mutable QList<int> statusList; mutable QList< int > statusList;
}; };
QskStatusIndicator::QskStatusIndicator( QQuickItem* parent ) QskStatusIndicator::QskStatusIndicator( QQuickItem* parent )
@ -211,7 +211,7 @@ void QskStatusIndicator::setStatus( int status )
update(); update();
} }
QList<int> QskStatusIndicator::statusList() const QList< int > QskStatusIndicator::statusList() const
{ {
/* /*
We should be have a QMap< int, QskGraphic >, so that We should be have a QMap< int, QskGraphic >, so that

2
src/controls/QskTabButton.cpp
View File

@ -15,7 +15,7 @@
QSK_SUBCONTROL( QskTabButton, Panel ) QSK_SUBCONTROL( QskTabButton, Panel )
QSK_SUBCONTROL( QskTabButton, Text ) QSK_SUBCONTROL( QskTabButton, Text )
static inline QskTabBar* qskFindTabBar( QskTabButton* button ) static inline QskTabBar* qskFindTabBar( const QskTabButton* button )
{ {
return qskFindAncestorOf< QskTabBar* >( button->parentItem() ); return qskFindAncestorOf< QskTabBar* >( button->parentItem() );
} }

3
src/inputpanel/QskInputPanelBox.cpp
View File

@ -18,8 +18,7 @@ namespace
class TextInputProxy final : public QskTextInput class TextInputProxy final : public QskTextInput
{ {
public: public:
TextInputProxy( QskInputPanelBox* panelBox, TextInputProxy( QskInputPanelBox* panelBox, QQuickItem* parentItem = nullptr )
QQuickItem* parentItem = nullptr )
: QskTextInput( parentItem ) : QskTextInput( parentItem )
, m_panelBox( panelBox ) , m_panelBox( panelBox )
{ {