diff --git a/examples/iotdashboard/DashboardPage.cpp b/examples/iotdashboard/DashboardPage.cpp index a91291bf..3c7f5028 100644 --- a/examples/iotdashboard/DashboardPage.cpp +++ b/examples/iotdashboard/DashboardPage.cpp @@ -14,17 +14,6 @@ #include "TopBar.h" #include "UsageBox.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include - QSK_SUBCONTROL( DashboardPage, Panel ) namespace diff --git a/examples/iotdashboard/LightDisplay.cpp b/examples/iotdashboard/LightDisplay.cpp index 9f305b51..8ef43ea3 100644 --- a/examples/iotdashboard/LightDisplay.cpp +++ b/examples/iotdashboard/LightDisplay.cpp @@ -51,17 +51,6 @@ bool LightDisplay::isPressed() const return hasSkinState( Pressed ); } -void LightDisplay::setGradient( const QskGradient& gradient ) -{ - m_gradient = gradient; - update(); -} - -const QskGradient& LightDisplay::gradient() const -{ - return m_gradient; -} - void LightDisplay::mousePressEvent( QMouseEvent* event ) { QRectF handleRect = subControlRect( LightDisplay::Knob ); diff --git a/examples/iotdashboard/LightDisplay.h b/examples/iotdashboard/LightDisplay.h index bddd5f47..8c7728a5 100644 --- a/examples/iotdashboard/LightDisplay.h +++ b/examples/iotdashboard/LightDisplay.h @@ -6,7 +6,6 @@ #pragma once #include -#include #include class LightDisplay : public QskBoundedValueInput @@ -22,9 +21,6 @@ class LightDisplay : public QskBoundedValueInput bool isPressed() const; - void setGradient( const QskGradient& ); - const QskGradient& gradient() const; - protected: void mousePressEvent( QMouseEvent* e ) override; void mouseMoveEvent( QMouseEvent* e ) override; @@ -33,9 +29,4 @@ class LightDisplay : public QskBoundedValueInput private: qreal angleFromPoint( const QRectF&, const QPointF& ) const; bool arcContainsPoint( const QRectF&, const QPointF& ) const; - - QskShadowMetrics m_shadow; - QColor m_shadowColor = Qt::black; - - QskGradient m_gradient; }; diff --git a/examples/iotdashboard/Skin.h b/examples/iotdashboard/Skin.h index 1b2cd7f1..1a06c446 100644 --- a/examples/iotdashboard/Skin.h +++ b/examples/iotdashboard/Skin.h @@ -34,5 +34,4 @@ class Skin : public QskSkin void initHints() override; Palette palette( ColorScheme ) const; - void initHints( const Palette& ); }; diff --git a/examples/iotdashboard/TopBar.cpp b/examples/iotdashboard/TopBar.cpp index 9deb9089..31b6d932 100644 --- a/examples/iotdashboard/TopBar.cpp +++ b/examples/iotdashboard/TopBar.cpp @@ -62,9 +62,9 @@ TopBarItem::TopBarItem( const auto subcontrol = subcontrolForIndex( index ); const auto textColor = color( subcontrol | QskAspect::TextColor ); - auto pieChart = new EnergyMeter( + auto meter = new EnergyMeter( textColor, gradient, progress, pieChartAndDisplay ); - pieChart->setSizePolicy( Qt::Horizontal, QskSizePolicy::Constrained ); + meter->setSizePolicy( Qt::Horizontal, QskSizePolicy::Constrained ); auto display = new QskLinearBox( Qt::Vertical, pieChartAndDisplay ); display->setSpacing( 0 );