Got rid of controls1 where possible, and otherwise marked it learly

6 files changed, 8 insertions, 10 deletions

diff --git a/views/accounts/qml/View.qml b/views/accounts/qml/View.qml
index 28849ae4..e25c32c9 100644
--- a/views/accounts/qml/View.qml
+++ b/views/accounts/qml/View.qml
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.3 as Controls
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0
 import org.kube.framework 1.0 as Kube
 import org.kube.components.accounts 1.0 as KubeAccounts
@@ -30,7 +30,7 @@ FocusScope {
     //Defines available account types.
     property var availableAccountPlugins: ["kolabnow", "imap", "maildir", "gmail"]
 
-    Controls.SplitView {
+    Controls1.SplitView {
         height: parent.height
         width: parent.width
 
diff --git a/views/composer/qml/AddresseeListEditor.qml b/views/composer/qml/AddresseeListEditor.qml
index 8f9862e7..9267ebee 100644
--- a/views/composer/qml/AddresseeListEditor.qml
+++ b/views/composer/qml/AddresseeListEditor.qml
@@ -19,7 +19,6 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 
 import org.kube.framework 1.0 as Kube
diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml
index ad9689e8..85e8b559 100644
--- a/views/composer/qml/View.qml
+++ b/views/composer/qml/View.qml
@@ -19,7 +19,6 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0 as Dialogs
diff --git a/views/conversation/qml/View.qml b/views/conversation/qml/View.qml
index c0e44144..c1f3625b 100644
--- a/views/conversation/qml/View.qml
+++ b/views/conversation/qml/View.qml
@@ -19,7 +19,7 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 
@@ -27,7 +27,7 @@ import org.kube.framework 1.0 as Kube
 
 FocusScope {
     property alias currentAccount: accountFolderview.currentAccount
-    SplitView {
+    Controls1.SplitView {
         anchors.fill: parent
         Rectangle {
             width: Kube.Units.gridUnit * 10
diff --git a/views/log/qml/View.qml b/views/log/qml/View.qml
index 9b2ac24a..bf06b76c 100644
--- a/views/log/qml/View.qml
+++ b/views/log/qml/View.qml
@@ -19,11 +19,11 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.3 as Controls
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0 as Controls2
 import org.kube.framework 1.0 as Kube
 
-Controls.SplitView {
+Controls1.SplitView {
     id: root
 
     property bool pendingError: false;
diff --git a/views/search/qml/View.qml b/views/search/qml/View.qml
index 437b0ba2..d63f6d1f 100644
--- a/views/search/qml/View.qml
+++ b/views/search/qml/View.qml
@@ -19,14 +19,14 @@
 
 
 import QtQuick 2.7
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.3 as Controls1
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 
 import org.kube.framework 1.0 as Kube
 
 FocusScope {
-    SplitView {
+    Controls1.SplitView {
         anchors.fill: parent
         ColumnLayout {
             width: Kube.Units.gridUnit * 18