Map: split void MapWidget::setEditMode()

The setEditMode(bool) function behaves very differently, when
entering and exiting edit mode. Therefore, split it in two
versions. This will allow to pass arguments that make sense
only when entering the edit mode.

Since setEditMode() doesn't exist anymore, turn the editMode
Q_PROPERTY line to the MEMBER version. Accordingly, remove
the reader function. If QML wants to enter edit mode, it
should invoke the appropriate function and not simply set
the flag.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 15 insertions, 16 deletions

diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index b4ab8efd8..b892cdcea 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -285,28 +285,27 @@ void MapWidgetHelper::updateDiveSiteCoordinates(uint32_t uuid, degrees_t latitud
 	QMetaObject::invokeMethod(m_map, "centerOnCoordinate", Q_ARG(QVariant, QVariant::fromValue(coord)));
 }
 
-bool MapWidgetHelper::editMode()
+void MapWidgetHelper::exitEditMode()
 {
-	return m_editMode;
+	m_editMode = false;
+	emit editModeChanged();
 }
 
-void MapWidgetHelper::setEditMode(bool editMode)
+void MapWidgetHelper::enterEditMode()
 {
-	m_editMode = editMode;
+	m_editMode = true;
 	MapLocation *exists = m_mapLocationModel->getMapLocationForUuid(displayed_dive_site.uuid);
-	if (editMode) {
-		QGeoCoordinate coord;
-		// if divesite uuid doesn't exist in the model, add a new MapLocation.
-		if (!exists) {
-			coord = m_map->property("center").value<QGeoCoordinate>();
-			m_mapLocationModel->add(new MapLocation(displayed_dive_site.uuid, coord,
-			                                        QString(displayed_dive_site.name)));
-		} else {
-			coord = exists->coordinate();
-		}
-		emit coordinatesChanged(degrees_t { (int)lrint(coord.latitude() * 1000000.0) },
-					degrees_t { (int)lrint(coord.longitude() * 1000000.0) });
+	QGeoCoordinate coord;
+	// if divesite uuid doesn't exist in the model, add a new MapLocation.
+	if (!exists) {
+		coord = m_map->property("center").value<QGeoCoordinate>();
+		m_mapLocationModel->add(new MapLocation(displayed_dive_site.uuid, coord,
+							QString(displayed_dive_site.name)));
+	} else {
+		coord = exists->coordinate();
 	}
+	emit coordinatesChanged(degrees_t { (int)lrint(coord.latitude() * 1000000.0) },
+				degrees_t { (int)lrint(coord.longitude() * 1000000.0) });
 	emit editModeChanged();
 }