Refactoring DefaultMargins -> DefaultMargin

As in the qt-components examples

diff --git a/application/resources/harmattan/qml/AboutPage.qml b/application/resources/harmattan/qml/AboutPage.qml
index 80df4e7..16837bd 100644 (file)
--- a/application/resources/harmattan/qml/AboutPage.qml
+++ b/application/resources/harmattan/qml/AboutPage.qml
@@ -25,7 +25,7 @@ Page {
             top: header.bottom;
             left: parent.left;
             right: parent.right;
-            margins: UiConstants.DefaultMargins
+            margins: UiConstants.DefaultMargin
         }
         text: qsTr("<h2><a href='http://quandoparte.garage.maemo.org'>" +
                    "Quando Parte" + "</a></h2>" +"<p style='font-size:small;'>version " + "0.4.80" +

diff --git a/application/resources/harmattan/qml/InfoBar.qml b/application/resources/harmattan/qml/InfoBar.qml
index 3df405e..d1922f0 100644 (file)
--- a/application/resources/harmattan/qml/InfoBar.qml
+++ b/application/resources/harmattan/qml/InfoBar.qml
@@ -18,18 +18,18 @@ BorderImage {
     Item {
         id: spacerTop
         width: parent.width
-        height: UiConstants.DefaultMargins
+        height: UiConstants.DefaultMargin
     }
     Item {
         id: spacerLeft
         anchors.left: parent.left
-        width: UiConstants.DefaultMargins
+        width: UiConstants.DefaultMargin
         height: searchField.height
     }
     Item {
         id: spacerRight
         anchors.right: parent.right
-        width: UiConstants.DefaultMargins
+        width: UiConstants.DefaultMargin
         height: searchField.height
     }
     Label {

diff --git a/application/resources/harmattan/qml/PageHeader.qml b/application/resources/harmattan/qml/PageHeader.qml
index 4ad07aa..1700774 100644 (file)
--- a/application/resources/harmattan/qml/PageHeader.qml
+++ b/application/resources/harmattan/qml/PageHeader.qml
@@ -26,7 +26,7 @@ Rectangle {
         id: label
         anchors {
             left: parent.left;
-            leftMargin: UiConstants.DefaultMargins;
+            leftMargin: UiConstants.DefaultMargin;
             verticalCenter: parent.verticalCenter;
         }
         font {
@@ -45,7 +45,7 @@ Rectangle {
         id: icon
         anchors {
             right: (label.text != "") ? parent.right : undefined;
-            rightMargin: UiConstants.DefaultMargins;
+            rightMargin: UiConstants.DefaultMargin;
             horizontalCenter: (label.text != "") ? undefined : parent.horizontalCenter;
             verticalCenter: parent.verticalCenter;
         }

diff --git a/application/resources/harmattan/qml/SearchBar.qml b/application/resources/harmattan/qml/SearchBar.qml
index a529e04..36a3ba1 100644 (file)
--- a/application/resources/harmattan/qml/SearchBar.qml
+++ b/application/resources/harmattan/qml/SearchBar.qml
@@ -19,18 +19,18 @@ BorderImage {
     Item {
         id: spacerTop
         width: parent.width
-        height: UiConstants.DefaultMargins
+        height: UiConstants.DefaultMargin
     }
     Item {
         id: spacerLeft
         anchors.left: parent.left
-        width: UiConstants.DefaultMargins
+        width: UiConstants.DefaultMargin
         height: searchField.height
     }
     Item {
         id: spacerRight
         anchors.right: parent.right
-        width: UiConstants.DefaultMargins
+        width: UiConstants.DefaultMargin
         height: searchField.height
     }
 

diff --git a/application/resources/harmattan/qml/uiconstants.js b/application/resources/harmattan/qml/uiconstants.js
index 2daf272..e6edc11 100644 (file)
--- a/application/resources/harmattan/qml/uiconstants.js
+++ b/application/resources/harmattan/qml/uiconstants.js
@@ -1,6 +1,6 @@
 .pragma library
 
-const DefaultMargins = 16
+const DefaultMargin = 16
 const ButtonSpacing = 6
 
 const HeaderDefaultHeightLandscape = 46