From 7a301be29339f3f47afa2f316908fd7c41559acb Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 29 Nov 2019 14:57:21 +0100
Subject: [PATCH] more use of ColorScope

---
 src/declarativeimports/plasmacomponents3/ComboBox.qml  | 2 +-
 src/declarativeimports/plasmacomponents3/Dial.qml      | 4 ++--
 src/declarativeimports/plasmacomponents3/TabButton.qml | 2 +-
 src/declarativeimports/plasmastyle/GroupBoxStyle.qml   | 2 +-
 src/declarativeimports/plasmastyle/StatusBarStyle.qml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/declarativeimports/plasmacomponents3/ComboBox.qml b/src/declarativeimports/plasmacomponents3/ComboBox.qml
index 1bae1bf61..63f748137 100644
--- a/src/declarativeimports/plasmacomponents3/ComboBox.qml
+++ b/src/declarativeimports/plasmacomponents3/ComboBox.qml
@@ -271,7 +271,7 @@ T.ComboBox {
             }
             radius: 2
             color: theme.viewBackgroundColor
-            border.color: Qt.rgba(theme.textColor.r, theme.textColor.g, theme.textColor.b, 0.3)
+            border.color: Qt.rgba(PlasmaCore.ColorScope.textColor.r, PlasmaCore.ColorScope.textColor.g, PlasmaCore.ColorScope.textColor.b, 0.3)
             layer.enabled: true
 
             layer.effect: DropShadow {
diff --git a/src/declarativeimports/plasmacomponents3/Dial.qml b/src/declarativeimports/plasmacomponents3/Dial.qml
index 7589d8ef6..1d52efa49 100644
--- a/src/declarativeimports/plasmacomponents3/Dial.qml
+++ b/src/declarativeimports/plasmacomponents3/Dial.qml
@@ -43,14 +43,14 @@ T.Dial {
 
             ctx.globalAlpha = 0.3;
             ctx.beginPath();
-            ctx.strokeStyle = theme.textColor;
+            ctx.strokeStyle = control.PlasmaCore.ColorScope.textColor;
             ctx.lineWidth=5;
             ctx.arc(centreX, centreY, width/2.4, 0, 2*Math.PI, false);
             ctx.stroke();
             ctx.globalAlpha = 1;
 
             ctx.beginPath();
-            ctx.strokeStyle = theme.highlightColor;
+            ctx.strokeStyle = control.PlasmaCore.ColorScope.highlightColor;
             ctx.lineWidth=5;
             ctx.arc(centreX, centreY, width/2.4, 0.7*Math.PI, 1.6*Math.PI * control.position - 1.25*Math.PI, false);
             ctx.stroke();
diff --git a/src/declarativeimports/plasmacomponents3/TabButton.qml b/src/declarativeimports/plasmacomponents3/TabButton.qml
index 61ec49863..af892f3a6 100644
--- a/src/declarativeimports/plasmacomponents3/TabButton.qml
+++ b/src/declarativeimports/plasmacomponents3/TabButton.qml
@@ -39,7 +39,7 @@ T.TabButton {
         font: control.font
         elide: Text.ElideRight
         opacity: enabled ? 1 : 0.3
-        color: theme.textColor
+        color: PlasmaCore.ColorScope.textColor
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
diff --git a/src/declarativeimports/plasmastyle/GroupBoxStyle.qml b/src/declarativeimports/plasmastyle/GroupBoxStyle.qml
index 430d50942..fd447b670 100644
--- a/src/declarativeimports/plasmastyle/GroupBoxStyle.qml
+++ b/src/declarativeimports/plasmastyle/GroupBoxStyle.qml
@@ -28,7 +28,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
 Style  {
     id: styleRoot
 
-    property color textColor: theme.textColor
+    property color textColor: PlasmaCore.ColorScope.textColor
 
     property Component checkbox: PlasmaComponents.CheckBox {
         checked: control.checked
diff --git a/src/declarativeimports/plasmastyle/StatusBarStyle.qml b/src/declarativeimports/plasmastyle/StatusBarStyle.qml
index 42dc39b2d..6370a3ccb 100644
--- a/src/declarativeimports/plasmastyle/StatusBarStyle.qml
+++ b/src/declarativeimports/plasmastyle/StatusBarStyle.qml
@@ -40,7 +40,7 @@ QtQuickControlStyle.StatusBarStyle {
             anchors.top: parent.top
             width: parent.width
             height: 1
-            color: theme.textColor
+            color: PlasmaCore.ColorScope.textColor
             opacity: 0.1
         }
     }