Explicitly import MoneroComponents; prevent namespace pollution

1 files changed, 13 insertions, 14 deletions

diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index 5d3c44bd..0c999f83 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -29,9 +29,8 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2
-import "../components"
-import "." 1.0
 
+import "../components" as MoneroComponents
 
 Item {
     id: datePicker
@@ -73,11 +72,11 @@ Item {
             anchors.top: parent.top
             anchors.topMargin: 2
             anchors.left: parent.left
-            font.family: Style.fontLight.name
+            font.family: MoneroComponents.Style.fontLight.name
             font.pixelSize: 14
             font.bold: false
             textFormat: Text.RichText
-            color: Style.defaultFontColor
+            color: MoneroComponents.Style.defaultFontColor
 
             MouseArea {
                 anchors.fill: parent
@@ -166,9 +165,9 @@ Item {
                 id: dayInput
                 readOnly: true
                 width: 22
-                font.family: Style.fontRegular.name
+                font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : Style.defaultFontColor
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 maximumLength: 2
                 horizontalAlignment: TextInput.AlignHCenter
                 validator: IntValidator{bottom: 01; top: 31;}
@@ -189,9 +188,9 @@ Item {
             }
 
             Text {
-                font.family: Style.fontRegular.name
+                font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : Style.defaultFontColor
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 text: "-"
             }
 
@@ -199,9 +198,9 @@ Item {
                 id: monthInput
                 readOnly: true
                 width: 22
-                font.family: Style.fontRegular.name
+                font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : Style.defaultFontColor
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 maximumLength: 2
                 horizontalAlignment: TextInput.AlignHCenter
                 validator: IntValidator{bottom: 01; top: 12;}
@@ -221,18 +220,18 @@ Item {
             }
 
             Text {
-                font.family: Style.fontRegular.name
+                font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : Style.defaultFontColor
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 text: "-"
             }
 
             TextInput {
                 id: yearInput
                 width: 44
-                font.family: Style.fontRegular.name
+                font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : Style.defaultFontColor
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 maximumLength: 4
                 horizontalAlignment: TextInput.AlignHCenter
                 validator: IntValidator{bottom: 1000; top: 9999;}