Replace units.spacing with units.smallSpacing

In line with the new Units API.

Signed-off-by: Sebastian Kügler <sebas@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

3 files changed, 22 insertions, 23 deletions

diff --git a/qt-mobile/DiveList.qml b/qt-mobile/DiveList.qml
index 86a57b614..c95b4dcaa 100644
--- a/qt-mobile/DiveList.qml
+++ b/qt-mobile/DiveList.qml
@@ -16,7 +16,7 @@ Rectangle {
 
 			property real detailsOpacity : 0
 
-			width: diveListView.width - units.spacing
+			width: diveListView.width - units.smallSpacing
 			height: childrenRect.height
 
 			//Mouse region: When clicked, the mode changes to details view
@@ -41,11 +41,11 @@ Rectangle {
 			//Layout of the page: (mini profile, dive no, date at the top
 			//And other details at the bottom.
 			Item {
-				x: units.spacing
-				width: parent.width - units.spacing * 2
-				height: childrenRect.height + units.spacing * 2
-				//spacing: units.spacing / 2
-				anchors.margins: units.spacing
+				x: units.smallSpacing
+				width: parent.width - units.smallSpacing * 2
+				height: childrenRect.height + units.smallSpacing * 2
+				//spacing: units.smallSpacing / 2
+				anchors.margins: units.smallSpacing
 
 				Text {
 					id: locationText
@@ -65,7 +65,7 @@ Rectangle {
 					anchors {
 						right: parent.right
 						top: parent.top
-						bottomMargin: units.spacing / 2
+						bottomMargin: units.smallSpacing / 2
 					}
 				}
 				Row {
@@ -104,7 +104,7 @@ Rectangle {
 					opacity: 0.4
 					anchors {
 						right: parent.right
-						topMargin: units.spacing
+						topMargin: units.smallSpacing
 						top: locationText.bottom
 					}
 				}
@@ -126,8 +126,8 @@ Rectangle {
 	Component {
 		id: tripHeading
 		Item {
-			width: page.width - units.spacing * 2
-			height: childrenRect.height + units.spacing * 2
+			width: page.width - units.smallSpacing * 2
+			height: childrenRect.height + units.smallSpacing * 2
 
 			Text {
 				id: sectionText
@@ -135,7 +135,7 @@ Rectangle {
 				anchors {
 					top: parent.top
 					left: parent.left
-					leftMargin: units.spacing
+					leftMargin: units.smallSpacing
 					right: parent.right
 				}
 				color: theme.textColor
@@ -146,7 +146,7 @@ Rectangle {
 				anchors {
 					top: sectionText.bottom
 					left: parent.left
-					leftMargin: units.spacing
+					leftMargin: units.smallSpacing
 					right: parent.right
 				}
 				color: theme.accentColor
@@ -160,7 +160,7 @@ Rectangle {
 		model: diveModel
 		delegate: diveDelegate
 		boundsBehavior: Flickable.StopAtBounds
-		//highlight: Rectangle { color: theme.highlightColor; width: units.spacing }
+		//highlight: Rectangle { color: theme.highlightColor; width: units.smallSpacing }
 		focus: true
 		clip: true
 		section.property: "trip"
diff --git a/qt-mobile/TopBar.qml b/qt-mobile/TopBar.qml
index da000c469..552159d53 100644
--- a/qt-mobile/TopBar.qml
+++ b/qt-mobile/TopBar.qml
@@ -12,14 +12,14 @@ Rectangle {
 	color: theme.accentColor
 	Layout.fillWidth: true
 	Layout.margins: 0
-	Layout.minimumHeight: prefsButton.height + units.spacing * 2
+	Layout.minimumHeight: prefsButton.height + units.smallSpacing * 2
 	RowLayout {
 		anchors.bottom: topBar.bottom
-		anchors.bottomMargin: units.spacing
+		anchors.bottomMargin: units.smallSpacing
 		anchors.left: topBar.left
-		anchors.leftMargin: units.spacing
+		anchors.leftMargin: units.smallSpacing
 		anchors.right: topBar.right
-		anchors.rightMargin: units.spacing
+		anchors.rightMargin: units.smallSpacing
 		Button {
 			id: backButton
 			Layout.maximumHeight: prefsButton.height
@@ -60,7 +60,7 @@ Rectangle {
 			font.pointSize: 18
 			color: theme.accentTextColor
 			anchors.left: backButton.right
-			anchors.leftMargin: units.spacing
+			anchors.leftMargin: units.smallSpacing
 			//horizontalAlignment: Text.AlignHCenter
 		}
 	}
diff --git a/qt-mobile/main.qml b/qt-mobile/main.qml
index e9cfb5b74..f45ab9b60 100644
--- a/qt-mobile/main.qml
+++ b/qt-mobile/main.qml
@@ -17,7 +17,6 @@ ApplicationWindow {
 
 	Theme.Units {
 		id: units
-		property int spacing: Math.ceil(gridUnit / 3)
 	}
 
 	Theme.Theme {
@@ -94,16 +93,16 @@ ApplicationWindow {
 				Rectangle {
 					id: topPart
 					color: theme.accentColor
-					Layout.minimumHeight: units.gridUnit * 2 + units.spacing * 2
+					Layout.minimumHeight: units.gridUnit * 2 + units.smallSpacing * 2
 					Layout.fillWidth: true
 					Layout.margins: 0
 					RowLayout {
 						anchors.bottom: topPart.bottom
-						anchors.bottomMargin: units.spacing
+						anchors.bottomMargin: units.smallSpacing
 						anchors.left: topPart.left
-						anchors.leftMargin: units.spacing
+						anchors.leftMargin: units.smallSpacing
 						anchors.right: topPart.right
-						anchors.rightMargin: units.spacing
+						anchors.rightMargin: units.smallSpacing
 						Image {
 							source: "qrc:/qml/subsurface-mobile-icon.png"
 							Layout.maximumWidth: units.gridUnit * 2