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

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 )

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 )
{ {
} }

View File

@ -8,10 +8,6 @@
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;

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 )
{ {
} }

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 );
} }
@ -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 );

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 );

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 )
{ {
} }

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 } );
} }

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

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 >();

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
{ {

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 );

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 );
} }

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 )
{ {
} }

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 );

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 );

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() );
} }

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 )
{ {