From 898791a4403e758d8ee229d1c1ced656f4393a4e Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 17 Dec 2020 08:50:35 +0100 Subject: [PATCH] code cleanup --- examples/automotive/SpeedometerSkinlet.cpp | 1 - examples/gallery/slider/CustomSlider.cpp | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/automotive/SpeedometerSkinlet.cpp b/examples/automotive/SpeedometerSkinlet.cpp index 9f92c8c1..25239c6a 100644 --- a/examples/automotive/SpeedometerSkinlet.cpp +++ b/examples/automotive/SpeedometerSkinlet.cpp @@ -116,7 +116,6 @@ QSGNode* SpeedometerSkinlet::updatePanelNode( QSGNode* SpeedometerSkinlet::updateLabelsNode( const Speedometer* speedometer, QSGNode* node ) const { - using namespace QskAspect; using Q = Speedometer; const int labelsCount = speedometer->labels().count(); diff --git a/examples/gallery/slider/CustomSlider.cpp b/examples/gallery/slider/CustomSlider.cpp index 276b8542..9edd79b8 100644 --- a/examples/gallery/slider/CustomSlider.cpp +++ b/examples/gallery/slider/CustomSlider.cpp @@ -18,15 +18,17 @@ QSK_SUBCONTROL( CustomSlider, Decoration ) CustomSlider::CustomSlider( QQuickItem* parentItem ) : QskSlider( parentItem ) { + using namespace QskRgb; + setBoxShapeHint( Fill, 0 ); - setGradientHint( Fill, QskRgb::Grey700 ); + setGradientHint( Fill, Grey700 ); setColor( Scale, qRgb( 178, 178, 178 ) ); // for the ticks - setMetric( QskSlider::Handle | QskAspect::Size, 80 ); - setColor( QskSlider::Handle, QskRgb::Grey800 ); + setMetric( Handle | QskAspect::Size, 80 ); + setColor( Handle, Grey800 ); for ( auto state : { Pressed, Focused | Hovered, Hovered, Focused } ) - setColor( QskSlider::Handle | state, QskRgb::Orange600 ); + setColor( Handle | state, Orange600 ); setAnimation( QskSlider::Handle | QskAspect::Color, 1000 ); for ( auto state : { Focused | Hovered, Hovered, Focused } ) @@ -56,5 +58,5 @@ QSizeF CustomSlider::contentsSizeHint( QRectF CustomSlider::focusIndicatorRect() const { - return subControlRect( QskSlider::Handle ); + return subControlRect( Handle ); }