map: whitespace cleanup in QML and C++ files

- remove ";"s
- remove {} where not needed or move them to the same line

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>

desktop-widgets/mapwidget.h

@@ -40,7 +40,6 @@ private:
 	static MapWidget *m_instance;
 	QQuickItem *m_rootItem;
 	MapWidgetHelper *m_mapHelper;
-
 };
 
 #endif // MAPWIDGET_H

mobile-widgets/qml/MapWidget.qml

@@ -16,11 +16,7 @@ Item {
 		id: mapHelper
 		map: map
 		editMode: false
-
+		onSelectedDivesChanged: nSelectedDives = list.length
-		onSelectedDivesChanged: {
-			// 'list' contains a list of dive list indexes
-			nSelectedDives = list.length
-		}
 		onEditModeChanged: editMessage.isVisible = editMode === true ? 1 : 0
 		onCoordinatesChanged: {}
 	}
@@ -42,10 +38,7 @@ Item {
 		property real newZoomOut: 1.0
 		property var clickCoord: QtPositioning.coordinate(0, 0)
 
-		Component.onCompleted: {
+		Component.onCompleted: activeMapType = mapType.SATELLITE
-			activeMapType = mapType.SATELLITE
-		}
-
 		onZoomLevelChanged: mapHelper.calculateSmallCircleRadius(map.center)
 
 		MapItemView {
@@ -63,12 +56,8 @@ Item {
 						source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : "")
 						SequentialAnimation {
 							id: mapItemImageAnimation
-							PropertyAnimation {
+							PropertyAnimation { target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120 }
-								target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120
+							PropertyAnimation { target: mapItemImage; property: "scale"; from: 0.7; to: 1.0; duration: 80 }
-							}
-							PropertyAnimation {
-								target: mapItemImage; property: "scale"; from: 0.7; to: 1.0; duration: 80
-							}
 						}
 						MouseArea {
 							drag.target: (mapHelper.editMode && mapHelper.model.selectedUuid === model.uuid) ? mapItem : undefined
@@ -113,9 +102,7 @@ Item {
 				target: map; property: "zoomLevel"; to: map.newZoomOut; duration: Math.abs(map.newZoomOut - map.zoomLevel) * 200
 			}
 			ParallelAnimation {
-				CoordinateAnimation {
+				CoordinateAnimation { target: map; property: "center"; to: map.newCenter; duration: 1000 }
-					target: map; property: "center"; to: map.newCenter; duration: 1000
-				}
 				NumberAnimation {
 					target: map; property: "zoomLevel"; to: map.newZoom ; duration: 2000; easing.type: Easing.InCubic
 				}
@@ -124,25 +111,17 @@ Item {
 
 		ParallelAnimation {
 			id: mapAnimationZoomOut
-			NumberAnimation {
+			NumberAnimation { target: map; property: "zoomLevel"; from: map.zoomLevel; to: map.newZoom; duration: 3000 }
-				target: map; property: "zoomLevel"; from: map.zoomLevel; to: map.newZoom; duration: 3000
-			}
 			SequentialAnimation {
 				PauseAnimation { duration: 2000 }
-				CoordinateAnimation {
+				CoordinateAnimation { target: map; property: "center"; to: map.newCenter; duration: 2000 }
-					target: map; property: "center"; to: map.newCenter; duration: 2000
-				}
 			}
 		}
 
 		ParallelAnimation {
 			id: mapAnimationClick
-			CoordinateAnimation {
+			CoordinateAnimation { target: map; property: "center"; to: map.newCenter; duration: 500	}
-				target: map; property: "center"; to: map.newCenter; duration: 500
+			NumberAnimation { target: map; property: "zoomLevel"; to: map.newZoom; duration: 500 }
-			}
-			NumberAnimation {
-				target: map; property: "zoomLevel"; to: map.newZoom; duration: 500
-			}
 		}
 
 		MouseArea {
@@ -205,15 +184,12 @@ Item {
 		opacity: 0.0
 		property int isVisible: -1
 		property real padding: 10.0
-
 		onOpacityChanged: visible = opacity != 0.0
 		states: [
 			State { when: editMessage.isVisible === 1; PropertyChanges { target: editMessage; opacity: 1.0 }},
 			State { when: editMessage.isVisible === 0; PropertyChanges { target: editMessage; opacity: 0.0 }}
 		]
-		transitions: Transition {
+		transitions: Transition { NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }}
-			NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
-		}
 		Text {
 			id: editMessageText
 			y: editMessage.padding; x: editMessage.padding
@@ -228,17 +204,11 @@ Item {
 		id: toggleImage
 		x: 10; y: x
 		source: "qrc:///mapwidget-toggle-" + (map.activeMapType === map.mapType.SATELLITE ? "street" : "satellite")
-
 		SequentialAnimation {
 			id: toggleImageAnimation
-			PropertyAnimation {
+			PropertyAnimation { target: toggleImage; property: "scale"; from: 1.0; to: 0.8; duration: 120 }
-				target: toggleImage; property: "scale"; from: 1.0; to: 0.8; duration: 120
+			PropertyAnimation { target: toggleImage; property: "scale"; from: 0.8; to: 1.0; duration: 80 }
-			}
-			PropertyAnimation {
-				target: toggleImage; property: "scale"; from: 0.8; to: 1.0; duration: 80
-			}
 		}
-
 		MouseArea {
 			anchors.fill: parent
 			onClicked: {
@@ -254,12 +224,8 @@ Item {
 		source: "qrc:///mapwidget-zoom-in"
 		SequentialAnimation {
 			id: imageZoomInAnimation
-			PropertyAnimation {
+			PropertyAnimation { target: imageZoomIn; property: "scale"; from: 1.0; to: 0.8; duration: 120 }
-				target: imageZoomIn; property: "scale"; from: 1.0; to: 0.8; duration: 120
+			PropertyAnimation { target: imageZoomIn; property: "scale"; from: 0.8; to: 1.0; duration: 80 }
-			}
-			PropertyAnimation {
-				target: imageZoomIn; property: "scale"; from: 0.8; to: 1.0; duration: 80
-			}
 		}
 		MouseArea {
 			anchors.fill: parent
@@ -280,12 +246,8 @@ Item {
 		source: "qrc:///mapwidget-zoom-out"
 		SequentialAnimation {
 			id: imageZoomOutAnimation
-			PropertyAnimation {
+			PropertyAnimation { target: imageZoomOut; property: "scale"; from: 1.0; to: 0.8; duration: 120 }
-				target: imageZoomOut; property: "scale"; from: 1.0; to: 0.8; duration: 120
+			PropertyAnimation { target: imageZoomOut; property: "scale"; from: 0.8; to: 1.0; duration: 80 }
-			}
-			PropertyAnimation {
-				target: imageZoomOut; property: "scale"; from: 0.8; to: 1.0; duration: 80
-			}
 		}
 		MouseArea {
 			anchors.fill: parent
@@ -311,13 +273,13 @@ Item {
 			switch (action) {
 			case contextMenu.actions.OPEN_LOCATION_IN_GOOGLE_MAPS:
 				openLocationInGoogleMaps(map.center.latitude, map.center.longitude)
-				break;
+				break
 			case contextMenu.actions.COPY_LOCATION_DECIMAL:
 				mapHelper.copyToClipboardCoordinates(map.center, false)
-				break;
+				break
 			case contextMenu.actions.COPY_LOCATION_SEXAGESIMAL:
 				mapHelper.copyToClipboardCoordinates(map.center, true)
-				break;
+				break
 			}
 		}
 	}

mobile-widgets/qml/MapWidgetContextMenu.qml

@@ -33,12 +33,8 @@ Item {
 
 		SequentialAnimation {
 			id:contextMenuImageAnimation
-			PropertyAnimation {
+			PropertyAnimation { target: contextMenuImage; property: "scale"; from: 1.0; to: 0.8; duration: 80 }
-				target: contextMenuImage; property: "scale"; from: 1.0; to: 0.8; duration: 80;
+			PropertyAnimation { target: contextMenuImage; property: "scale"; from: 0.8; to: 1.0; duration: 60 }
-			}
-			PropertyAnimation {
-				target: contextMenuImage; property: "scale"; from: 0.8; to: 1.0; duration: 60;
-			}
 		}
 
 		MouseArea {
@@ -121,8 +117,6 @@ Item {
 			State { when: listViewIsVisible === 1; PropertyChanges { target: listView; opacity: 1.0 }},
 			State { when: listViewIsVisible === 0; PropertyChanges { target: listView; opacity: 0.0 }}
 		]
-		transitions: Transition {
+		transitions: Transition { NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }}
-			NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
-		}
 	}
 }

qt-models/maplocationmodel.h

@@ -55,7 +55,6 @@ public:
 	~MapLocationModel();
 
 	Q_INVOKABLE MapLocation *get(int row);
-
 	QVariant data(const QModelIndex &index, int role) const override;
 	int rowCount(const QModelIndex &parent) const override;
 	int count();
@@ -78,7 +77,6 @@ signals:
 	void countChanged(int c);
 	void selectedUuidChanged();
 	void selectedLocationChanged(MapLocation *);
-
 };
 
 #endif