From f8016125b11f70e7a7447887b1421f33ab37c0c7 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Thu, 28 Feb 2019 08:06:44 +0100
Subject: [PATCH] code cleanup

---
 examples/mycontrols/MyToggleButton.cpp        | 21 -------------------
 examples/mycontrols/MyToggleButton.h          |  9 --------
 examples/mycontrols/MyToggleButtonSkinlet.cpp | 20 ++++++++++--------
 3 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/examples/mycontrols/MyToggleButton.cpp b/examples/mycontrols/MyToggleButton.cpp
index 909f4302..ef7d0d99 100644
--- a/examples/mycontrols/MyToggleButton.cpp
+++ b/examples/mycontrols/MyToggleButton.cpp
@@ -51,27 +51,6 @@ MyToggleButton::MyToggleButton( QQuickItem* parent )
     initSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Fixed );
 }
 
-MyToggleButton::MyToggleButton(
-        const QString& checkedIcon, const QString& uncheckedIcon, QQuickItem* parent )
-    : MyToggleButton( parent )
-{
-    if ( !uncheckedIcon.isEmpty() )
-    {
-        auto& data = m_data->content[ UncheckedSection ];
-
-        data.iconSource = uncheckedIcon;
-        data.iconDirty = true;
-    }
-
-    if ( !checkedIcon.isEmpty() )
-    {
-        auto& data = m_data->content[ CheckedSection ];
-
-        data.iconSource = checkedIcon;
-        data.iconDirty = true;
-    }
-}
-
 MyToggleButton::~MyToggleButton()
 {
 }
diff --git a/examples/mycontrols/MyToggleButton.h b/examples/mycontrols/MyToggleButton.h
index 53749a6c..7ab43e86 100644
--- a/examples/mycontrols/MyToggleButton.h
+++ b/examples/mycontrols/MyToggleButton.h
@@ -19,17 +19,8 @@ class MyToggleButton : public QskAbstractButton
   public:
     QSK_SUBCONTROLS( Panel, Cursor, CheckedPanel, CheckedLabel, CheckedIcon,
         UncheckedPanel, UncheckedLabel, UncheckedIcon )
-    enum
-    {
-        UncheckedSection = 0,
-        CheckedSection   = 1
-    };
 
     MyToggleButton( QQuickItem* parent = nullptr );
-
-    MyToggleButton( const QString& ckeckedIcon, const QString& uncheckedIcon,
-        QQuickItem* parent = nullptr );
-
     ~MyToggleButton() override;
 
     void setTextAt( int index, const QString& );
diff --git a/examples/mycontrols/MyToggleButtonSkinlet.cpp b/examples/mycontrols/MyToggleButtonSkinlet.cpp
index 844b38c4..6646dd25 100644
--- a/examples/mycontrols/MyToggleButtonSkinlet.cpp
+++ b/examples/mycontrols/MyToggleButtonSkinlet.cpp
@@ -26,9 +26,11 @@ MyToggleButtonSkinlet::MyToggleButtonSkinlet( QskSkin* skin )
 {
     // sorted in stacking order
 
-    setNodeRoles( { PanelRole, CursorRole, UncheckedPanelRole, UncheckedLabelRole,
-                    UncheckedIconRole, CheckedPanelRole, CheckedLabelRole, CheckedIconRole
-                  } );
+    setNodeRoles(
+        { PanelRole, CursorRole, UncheckedPanelRole, UncheckedLabelRole,
+          UncheckedIconRole, CheckedPanelRole, CheckedLabelRole, CheckedIconRole
+        }
+    );
 }
 
 QRectF MyToggleButtonSkinlet::subControlRect(
@@ -44,12 +46,12 @@ QRectF MyToggleButtonSkinlet::subControlRect(
     }
     else if( subControl == Q::UncheckedPanel )
     {
-        auto rect = innerRect( skinnable, Q::Panel );
+        const auto rect = innerRect( skinnable, Q::Panel );
         return sectionRect( rect, button->isInverted() ? 0 : 1 );
     }
     else if( subControl == Q::CheckedPanel )
     {
-        auto rect = innerRect( skinnable, Q::Panel );
+        const auto rect = innerRect( skinnable, Q::Panel );
         return sectionRect( rect, button->isInverted() ? 1 : 0 );
     }
     else if( subControl == Q::CheckedLabel || subControl == Q::CheckedIcon )
@@ -100,27 +102,27 @@ QSGNode* MyToggleButtonSkinlet::updateSubNode(
         case CheckedLabelRole:
         {
             return updateTextNode(
-                button, node, button->textAt( Q::CheckedSection ),
+                button, node, button->textAt( 1 ),
                 button->textOptions(), Q::CheckedLabel );
         }
 
         case UncheckedLabelRole:
         {
             return updateTextNode(
-                button, node, button->textAt( Q::UncheckedSection ),
+                button, node, button->textAt( 0 ),
                 button->textOptions(), Q::UncheckedLabel );
         }
 
         case CheckedIconRole:
         {
             return updateGraphicNode(
-                button, node, button->graphicAt( Q::CheckedSection ), Q::CheckedIcon );
+                button, node, button->graphicAt( 1 ), Q::CheckedIcon );
         }
 
         case UncheckedIconRole:
         {
             return updateGraphicNode(
-                button, node, button->graphicAt( Q::UncheckedSection ), Q::UncheckedIcon );
+                button, node, button->graphicAt( 0 ), Q::UncheckedIcon );
         }
 
         case CheckedPanelRole: