From 6c0f0810f1c24a7f97c943a440e9467e02908e73 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Tue, 15 Dec 2020 18:12:48 +0100
Subject: [PATCH] code cleanup

---
 skins/material/QskMaterialSkin.cpp | 16 +++++-----------
 skins/squiek/QskSquiekSkin.cpp     |  4 ----
 src/controls/QskControl.cpp        |  4 +---
 src/controls/QskProgressBar.cpp    |  3 +--
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material/QskMaterialSkin.cpp
index 5fe8fcbc..bdbf787f 100644
--- a/skins/material/QskMaterialSkin.cpp
+++ b/skins/material/QskMaterialSkin.cpp
@@ -198,7 +198,6 @@ void QskMaterialSkin::initPopupHints()
 
 void QskMaterialSkin::initTextLabelHints()
 {
-    using namespace QskAspect;
     using Q = QskTextLabel;
 
     const auto& pal = m_data->palette;
@@ -215,7 +214,6 @@ void QskMaterialSkin::initTextLabelHints()
 
 void QskMaterialSkin::initTextInputHints()
 {
-    using namespace QskAspect;
     using Q = QskTextInput;
 
     setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignTop );
@@ -257,7 +255,6 @@ void QskMaterialSkin::initProgressBarHints()
 
 void QskMaterialSkin::initFocusIndicatorHints()
 {
-    using namespace QskAspect;
     using Q = QskFocusIndicator;
 
     const auto& pal = m_data->palette;
@@ -313,7 +310,7 @@ void QskMaterialSkin::initPageIndicatorHints()
     setBoxBorderMetrics( Q::Panel, 0 );
     setGradient( Q::Panel, QskGradient() );
 
-    setMetric( Q::Panel | Spacing, 3 );
+    setSpacing( Q::Panel, 3 );
 }
 
 void QskMaterialSkin::initPushButtonHints()
@@ -327,7 +324,7 @@ void QskMaterialSkin::initPushButtonHints()
     setMetric( Q::Panel | MinimumWidth, qskDpiScaled( 75.0 ) );
     setMetric( Q::Panel | MinimumHeight, qskDpiScaled( 23.0 ) );
 
-    setMetric( Q::Panel | Spacing, 4 );
+    setSpacing( Q::Panel, 4 );
 
     const QskMargins margin( 4, 3 );
     const QskMargins padding( 10, 6 );
@@ -389,11 +386,8 @@ void QskMaterialSkin::initDialogButtonHints()
     setMetric( Q::Panel | MinimumHeight, 16 );
     setMetric( Q::Panel | Spacing, 4 );
 
-    const QskMargins margin( 4, 3 );
-    const QskMargins padding( 10, 6 );
-
-    setMargin( Q::Panel, margin );
-    setPadding( Q::Panel, padding );
+    setMargin( Q::Panel, QskMargins( 4, 3 ) );
+    setPadding( Q::Panel, QskMargins( 10, 6 ) );
 
     const QskBoxBorderColors borderColors( Grey400, Grey300, Grey400, Grey600 );
 
@@ -655,7 +649,7 @@ void QskMaterialSkin::initScrollViewHints()
 
     const auto& pal = m_data->palette;
 
-    setMetric( Q::Panel | Spacing, 2 );
+    setSpacing( Q::Panel, 2 );
 
     setBoxShape( Q::Viewport, 5 );
     setBoxBorderMetrics( Q::Viewport, 1 );
diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp
index c0273e3c..dc2ac21a 100644
--- a/skins/squiek/QskSquiekSkin.cpp
+++ b/skins/squiek/QskSquiekSkin.cpp
@@ -274,7 +274,6 @@ void QskSquiekSkin::initPopupHints()
 
 void QskSquiekSkin::initTextLabelHints()
 {
-    using namespace QskAspect;
     using Q = QskTextLabel;
 
     const auto& pal = m_data->palette;
@@ -361,7 +360,6 @@ void QskSquiekSkin::initProgressBarHints()
 
 void QskSquiekSkin::initFocusIndicatorHints()
 {
-    using namespace QskAspect;
     using Q = QskFocusIndicator;
 
     const auto& pal = m_data->palette;
@@ -703,7 +701,6 @@ void QskSquiekSkin::initTabViewHints()
 
 void QskSquiekSkin::initInputPanelHints()
 {
-    using namespace QskAspect;
     using Q = QskInputPanelBox;
 
     setPadding( Q::Panel, 5 );
@@ -803,7 +800,6 @@ void QskSquiekSkin::initScrollViewHints()
 
 void QskSquiekSkin::initListViewHints()
 {
-    using namespace QskAspect;
     using Q = QskListView;
 
     const auto& pal = m_data->palette;
diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp
index 4463acc2..c34bfebe 100644
--- a/src/controls/QskControl.cpp
+++ b/src/controls/QskControl.cpp
@@ -201,9 +201,7 @@ void QskControl::setMargins( const QMarginsF& margins )
 
 void QskControl::resetMargins()
 {
-    using namespace QskAspect;
-
-    if ( resetMarginHint( Control ) )
+    if ( resetMarginHint( QskAspect::Control ) )
     {
         resetImplicitSize();
 
diff --git a/src/controls/QskProgressBar.cpp b/src/controls/QskProgressBar.cpp
index 5a67565e..18580a41 100644
--- a/src/controls/QskProgressBar.cpp
+++ b/src/controls/QskProgressBar.cpp
@@ -178,9 +178,8 @@ void QskProgressBar::setBarGradient( const QskGradient& gradient )
 void QskProgressBar::resetBarGradient()
 {
     using namespace QskAspect;
-    const auto aspect = QskProgressBar::Bar | Color;
 
-    if ( resetHint( aspect | Vertical ) || resetHint( aspect | Horizontal ) )
+    if ( resetColor( Bar | Vertical ) || resetHint( Bar | Horizontal ) )
         update();
 }