From 92b1ed669bea6d4f5ba58f2a24631f1d1c61de22 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Sun, 27 Dec 2020 16:19:01 +0100
Subject: [PATCH] fontRole/graphicRole renamed to fontRoleHint/graphicRoleHint

---
 src/controls/QskGraphicLabel.cpp |  4 ++--
 src/controls/QskSkinnable.cpp    | 20 +++++++++++++++-----
 src/controls/QskSkinnable.h      | 10 ++++++----
 src/controls/QskTextInput.cpp    | 13 +++++++------
 src/controls/QskTextLabel.cpp    |  4 ++--
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/controls/QskGraphicLabel.cpp b/src/controls/QskGraphicLabel.cpp
index ac663173..6563373e 100644
--- a/src/controls/QskGraphicLabel.cpp
+++ b/src/controls/QskGraphicLabel.cpp
@@ -133,7 +133,7 @@ void QskGraphicLabel::setGraphicRole( int role )
 {
     const int oldRole = graphicRole();
 
-    QskSkinnable::setGraphicRole( Graphic, role );
+    setGraphicRoleHint( Graphic, role );
 
     if ( role != oldRole )
     {
@@ -144,7 +144,7 @@ void QskGraphicLabel::setGraphicRole( int role )
 
 int QskGraphicLabel::graphicRole() const
 {
-    return QskSkinnable::graphicRole( Graphic );
+    return graphicRoleHint( Graphic );
 }
 
 QskColorFilter QskGraphicLabel::graphicFilter() const
diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp
index 66b23de9..5dd5e96a 100644
--- a/src/controls/QskSkinnable.cpp
+++ b/src/controls/QskSkinnable.cpp
@@ -389,12 +389,17 @@ qreal QskSkinnable::spacingHint(
     return qskMetric< qreal >( this, aspect | QskAspect::Spacing, status );
 }
 
-bool QskSkinnable::setFontRole( const QskAspect aspect, int role )
+bool QskSkinnable::setFontRoleHint( const QskAspect aspect, int role )
 {
     return qskSetFlag( this, aspect | QskAspect::FontRole, role );
 }
 
-int QskSkinnable::fontRole(
+bool QskSkinnable::resetFontRoleHint( const QskAspect aspect )
+{
+    return resetFlagHint( aspect | QskAspect::FontRole );
+}
+
+int QskSkinnable::fontRoleHint(
     const QskAspect aspect, QskSkinHintStatus* status ) const
 {
     return qskFlag( this, aspect | QskAspect::FontRole, status );
@@ -402,15 +407,20 @@ int QskSkinnable::fontRole(
 
 QFont QskSkinnable::effectiveFont( const QskAspect aspect ) const
 {
-    return effectiveSkin()->font( fontRole( aspect ) );
+    return effectiveSkin()->font( fontRoleHint( aspect ) );
 }
 
-bool QskSkinnable::setGraphicRole( const QskAspect aspect, int role )
+bool QskSkinnable::setGraphicRoleHint( const QskAspect aspect, int role )
 {
     return qskSetFlag( this, aspect | QskAspect::GraphicRole, role );
 }
 
-int QskSkinnable::graphicRole(
+bool QskSkinnable::resetGraphicRoleHint( const QskAspect aspect )
+{
+    return resetFlagHint( aspect | QskAspect::GraphicRole );
+}
+
+int QskSkinnable::graphicRoleHint(
     const QskAspect aspect, QskSkinHintStatus* status ) const
 {
     return qskFlag( this, aspect | QskAspect::GraphicRole, status );
diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h
index 2ea80cd9..e7cd9f30 100644
--- a/src/controls/QskSkinnable.h
+++ b/src/controls/QskSkinnable.h
@@ -183,11 +183,13 @@ class QSK_EXPORT QskSkinnable
     bool resetAlignmentHint( QskAspect );
     Qt::Alignment alignmentHint( QskAspect, Qt::Alignment = Qt::Alignment() ) const;
 
-    bool setFontRole( QskAspect, int role );
-    int fontRole( QskAspect, QskSkinHintStatus* = nullptr ) const;
+    bool setFontRoleHint( QskAspect, int role );
+    bool resetFontRoleHint( QskAspect );
+    int fontRoleHint( QskAspect, QskSkinHintStatus* = nullptr ) const;
 
-    bool setGraphicRole( QskAspect, int role );
-    int graphicRole( QskAspect, QskSkinHintStatus* = nullptr ) const;
+    bool setGraphicRoleHint( QskAspect, int role );
+    bool resetGraphicRoleHint( QskAspect );
+    int graphicRoleHint( QskAspect, QskSkinHintStatus* = nullptr ) const;
 
   protected:
     virtual void updateNode( QSGNode* );
diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp
index 08831a83..98598f11 100644
--- a/src/controls/QskTextInput.cpp
+++ b/src/controls/QskTextInput.cpp
@@ -521,14 +521,14 @@ void QskTextInput::setActivationModes( ActivationModes modes )
 
 int QskTextInput::fontRole() const
 {
-    return QskSkinnable::fontRole( Text );
+    return fontRoleHint( Text );
 }
 
 void QskTextInput::setFontRole( int role )
 {
     if ( role != fontRole() )
     {
-        QskSkinnable::setFontRole( Text, role );
+        setFontRoleHint( Text, role );
 
         polish();
         resetImplicitSize();
@@ -551,7 +551,6 @@ void QskTextInput::setAlignment( Qt::Alignment alignment )
         m_data->textInput->setAlignment( alignment );
 
         polish();
-
         Q_EMIT alignmentChanged();
     }
 }
@@ -573,7 +572,9 @@ bool QskTextInput::isReadOnly() const
 
 void QskTextInput::setReadOnly( bool on )
 {
-    if ( m_data->textInput->isReadOnly() == on )
+    auto input = m_data->textInput;
+
+    if ( input->isReadOnly() == on )
         return;
 
 #if 1
@@ -581,10 +582,10 @@ void QskTextInput::setReadOnly( bool on )
     setFocusPolicy( Qt::NoFocus );
 #endif
 
-    m_data->textInput->setReadOnly( on );
+    input->setReadOnly( on );
 
     // we are killing user settings here ?
-    m_data->textInput->setFlag( QQuickItem::ItemAcceptsInputMethod, !on );
+    input->setFlag( QQuickItem::ItemAcceptsInputMethod, !on );
     qskUpdateInputMethod( this, Qt::ImEnabled );
 
     setSkinStateFlag( ReadOnly, on );
diff --git a/src/controls/QskTextLabel.cpp b/src/controls/QskTextLabel.cpp
index 39264c44..d1898cae 100644
--- a/src/controls/QskTextLabel.cpp
+++ b/src/controls/QskTextLabel.cpp
@@ -171,7 +171,7 @@ void QskTextLabel::setFontRole( int role )
 {
     const int oldRole = fontRole();
 
-    QskSkinnable::setFontRole( Text, role );
+    setFontRoleHint( Text, role );
 
     if ( oldRole != role )
     {
@@ -184,7 +184,7 @@ void QskTextLabel::setFontRole( int role )
 
 int QskTextLabel::fontRole() const
 {
-    return QskSkinnable::fontRole( Text );
+    return fontRoleHint( Text );
 }
 
 void QskTextLabel::setTextColor( const QColor& color )