Sync theme with Plasma oneHEADmaster

1 files changed, 13 insertions, 26 deletions

diff --git a/components/Clock.qml b/components/Clock.qml
index cece7be..fbe0c7c 100644
--- a/components/Clock.qml
+++ b/components/Clock.qml
@@ -1,47 +1,34 @@
 /*
- *   Copyright 2016 David Edmundson <davidedmundson@kde.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Library General Public License as
- *   published by the Free Software Foundation; either version 2 or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details
- *
- *   You should have received a copy of the GNU Library General Public
- *   License along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+    SPDX-FileCopyrightText: 2016 David Edmundson <davidedmundson@kde.org>
+
+    SPDX-License-Identifier: LGPL-2.0-or-later
+*/
 
 import QtQuick 2.8
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.5
-import org.kde.plasma.core 2.0
+import QtQuick.Controls 2.5 as QQC2
+import org.kde.plasma.core 2.0 as PlasmaCore
 
 ColumnLayout {
     readonly property bool softwareRendering: GraphicsInfo.api === GraphicsInfo.Software
 
-    Label {
+    QQC2.Label {
         text: Qt.formatTime(timeSource.data["Local"]["DateTime"])
-        color: ColorScope.textColor
+        color: PlasmaCore.ColorScope.textColor
         style: softwareRendering ? Text.Outline : Text.Normal
-        styleColor: softwareRendering ? ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
+        styleColor: softwareRendering ? PlasmaCore.ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
         font.pointSize: 48
         Layout.alignment: Qt.AlignHCenter
     }
-    Label {
+    QQC2.Label {
         text: Qt.formatDate(timeSource.data["Local"]["DateTime"], Qt.DefaultLocaleLongDate)
-        color: ColorScope.textColor
+        color: PlasmaCore.ColorScope.textColor
         style: softwareRendering ? Text.Outline : Text.Normal
-        styleColor: softwareRendering ? ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
+        styleColor: softwareRendering ? PlasmaCore.ColorScope.backgroundColor : "transparent" //no outline, doesn't matter
         font.pointSize: 24
         Layout.alignment: Qt.AlignHCenter
     }
-    DataSource {
+    PlasmaCore.DataSource {
         id: timeSource
         engine: "time"
         connectedSources: ["Local"]