uncrustified
This commit is contained in:
parent
66cc68bcda
commit
923affe749
|
@ -13,6 +13,7 @@ class QskTextLabel;
|
|||
class Box : public QskLinearBox
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
QSK_SUBCONTROLS( Panel )
|
||||
|
||||
|
|
|
@ -19,7 +19,8 @@ class ButtonValueLabel : public QskTextLabel
|
|||
public:
|
||||
QSK_SUBCONTROLS( Text )
|
||||
|
||||
ButtonValueLabel( const QString& text, QQuickItem* parent ) : QskTextLabel( text, parent )
|
||||
ButtonValueLabel( const QString& text, QQuickItem* parent )
|
||||
: QskTextLabel( text, parent )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -8,10 +8,6 @@
|
|||
class Diagram::PrivateData
|
||||
{
|
||||
public:
|
||||
PrivateData()
|
||||
{
|
||||
}
|
||||
|
||||
QVector< QVector< QPointF > > dataPoints;
|
||||
int xGridLines = -1;
|
||||
qreal yMax = -1;
|
||||
|
|
|
@ -23,7 +23,8 @@ class LightIntensityValueLabel : public QskTextLabel
|
|||
public:
|
||||
QSK_SUBCONTROLS( Text )
|
||||
|
||||
LightIntensityValueLabel( const QString& text, QQuickItem* parent ) : QskTextLabel( text, parent )
|
||||
LightIntensityValueLabel( const QString& text, QQuickItem* parent )
|
||||
: QskTextLabel( text, parent )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -32,7 +32,8 @@ QSK_SUBCONTROL( ShadowPositioner, Panel )
|
|||
QSK_SUBCONTROL( MainContent, Panel )
|
||||
QSK_SUBCONTROL( MainContentGridBox, Panel )
|
||||
|
||||
ShadowPositioner::ShadowPositioner( QQuickItem* parent ) : QskControl( parent )
|
||||
ShadowPositioner::ShadowPositioner( QQuickItem* parent )
|
||||
: QskControl( parent )
|
||||
{
|
||||
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 );
|
||||
setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );
|
||||
|
|
|
@ -21,8 +21,9 @@ QSK_SUBCONTROL( MenuBar, Panel )
|
|||
|
||||
QSK_STATE( MenuItem, Active, ( QskAspect::FirstUserState << 1 ) )
|
||||
|
||||
MenuItem::MenuItem( const QString& name, QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent ),
|
||||
m_name( name )
|
||||
MenuItem::MenuItem( const QString& name, QQuickItem* parent )
|
||||
: QskLinearBox( Qt::Horizontal, parent )
|
||||
, m_name( name )
|
||||
{
|
||||
setAutoLayoutChildren( 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 );
|
||||
setSizePolicy( QskSizePolicy::Minimum, QskSizePolicy::Preferred );
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
QSK_SUBCONTROL( PieChart, Panel )
|
||||
QSK_SUBCONTROL( PieChart, Labels )
|
||||
|
||||
PieChart::PieChart( QQuickItem* parent ) : QskControl( parent )
|
||||
PieChart::PieChart( QQuickItem* parent )
|
||||
: QskControl( parent )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include <QskBoxBorderMetrics.h>
|
||||
#include <QskBoxBorderColors.h>
|
||||
|
||||
PieChartSkinlet::PieChartSkinlet( QskSkin* skin ) : QskSkinlet( skin )
|
||||
PieChartSkinlet::PieChartSkinlet( QskSkin* skin )
|
||||
: QskSkinlet( skin )
|
||||
{
|
||||
setNodeRoles( { PanelRole, LabelsRole } );
|
||||
}
|
||||
|
|
|
@ -19,7 +19,8 @@ class RoundedIcon : public QskBox
|
|||
QSK_SUBCONTROLS( Panel, Icon )
|
||||
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 subControl ) const override
|
||||
|
|
|
@ -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 >();
|
||||
|
||||
|
|
|
@ -15,9 +15,10 @@ class Skin : public QskSkin
|
|||
class Palette
|
||||
{
|
||||
public:
|
||||
Palette( const QskGradient& menuBar, const QskGradient& mainContent, const QskGradient& box,
|
||||
const QColor& lightDisplay, const QColor& pieChart, const QskGradient& roundButton,
|
||||
const QColor& weekdayBox, const QColor& text, const QColor& shadow )
|
||||
Palette( const QskGradient& menuBar, const QskGradient& mainContent,
|
||||
const QskGradient& box, const QColor& lightDisplay, const QColor& pieChart,
|
||||
const QskGradient& roundButton, const QColor& weekdayBox,
|
||||
const QColor& text, const QColor& shadow )
|
||||
: menuBar( menuBar )
|
||||
, mainContent( mainContent )
|
||||
, box( box )
|
||||
|
@ -41,7 +42,7 @@ class Skin : public QskSkin
|
|||
};
|
||||
|
||||
Skin( const Palette& palette, QObject* parent = nullptr );
|
||||
virtual ~Skin();
|
||||
~Skin() override;
|
||||
|
||||
enum SkinFontRole
|
||||
{
|
||||
|
|
|
@ -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 );
|
||||
setAutoLayoutChildren( true );
|
||||
|
|
|
@ -23,7 +23,8 @@ class WeekdayLabel : public QskTextLabel
|
|||
public:
|
||||
QSK_SUBCONTROLS( Panel, Text )
|
||||
|
||||
WeekdayLabel( const QString& text, QQuickItem* parent ) : QskTextLabel( text, parent )
|
||||
WeekdayLabel( const QString& text, QQuickItem* parent )
|
||||
: QskTextLabel( text, parent )
|
||||
{
|
||||
setPanel( true );
|
||||
}
|
||||
|
@ -52,7 +53,8 @@ class WeekdayBox : public QskBox
|
|||
public:
|
||||
QSK_SUBCONTROLS( Panel )
|
||||
|
||||
WeekdayBox( QQuickItem* parent ) : QskBox( true, parent )
|
||||
WeekdayBox( QQuickItem* parent ):
|
||||
QskBox( true, parent )
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -75,7 +77,8 @@ class CaptionColorBox : public QskBox
|
|||
public:
|
||||
QSK_SUBCONTROLS( Panel )
|
||||
|
||||
CaptionColorBox( QQuickItem* parent ) : QskBox( true, parent )
|
||||
CaptionColorBox( QQuickItem* parent ):
|
||||
QskBox( true, parent )
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -109,7 +112,8 @@ class CaptionBox : public QskLinearBox
|
|||
public:
|
||||
QSK_SUBCONTROLS( Panel )
|
||||
|
||||
CaptionBox( QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent )
|
||||
CaptionBox( QQuickItem* parent ):
|
||||
QskLinearBox( Qt::Horizontal, parent )
|
||||
{
|
||||
setPanel( true );
|
||||
}
|
||||
|
|
|
@ -28,7 +28,8 @@ namespace
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SkinFactory( QObject* parent = nullptr ) : QskSkinFactory( parent )
|
||||
SkinFactory( QObject* parent = nullptr )
|
||||
: QskSkinFactory( parent )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,8 @@ DiagramDataNode::DiagramDataNode()
|
|||
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 )
|
||||
{
|
||||
Q_UNUSED( rect );
|
||||
|
|
|
@ -20,7 +20,8 @@ DiagramSegmentsNode::DiagramSegmentsNode()
|
|||
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 );
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
QSK_SUBCONTROL( QskTabButton, Panel )
|
||||
QSK_SUBCONTROL( QskTabButton, Text )
|
||||
|
||||
static inline QskTabBar* qskFindTabBar( QskTabButton* button )
|
||||
static inline QskTabBar* qskFindTabBar( const QskTabButton* button )
|
||||
{
|
||||
return qskFindAncestorOf< QskTabBar* >( button->parentItem() );
|
||||
}
|
||||
|
|
|
@ -18,8 +18,7 @@ namespace
|
|||
class TextInputProxy final : public QskTextInput
|
||||
{
|
||||
public:
|
||||
TextInputProxy( QskInputPanelBox* panelBox,
|
||||
QQuickItem* parentItem = nullptr )
|
||||
TextInputProxy( QskInputPanelBox* panelBox, QQuickItem* parentItem = nullptr )
|
||||
: QskTextInput( parentItem )
|
||||
, m_panelBox( panelBox )
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue