From 48b8129137ed3db1c4b0940301c8bfc9662bcee3 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Thu, 2 May 2019 22:41:24 +0200
Subject: [PATCH] Cleanup: remove MapWidgetHelper::m_selectedDiveIds member

This member variable was only used locally in functions.
Accordingly, make it a function-local variable.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 desktop-widgets/mapwidget.cpp     |  5 ++---
 desktop-widgets/mapwidget.h       |  2 +-
 map-widget/qmlmapwidgethelper.cpp | 32 +++++++++++++++----------------
 map-widget/qmlmapwidgethelper.h   |  3 +--
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp
index bbdf89de2..14ac3a075 100644
--- a/desktop-widgets/mapwidget.cpp
+++ b/desktop-widgets/mapwidget.cpp
@@ -48,8 +48,7 @@ void MapWidget::doneLoading(QQuickWidget::Status status)
 	isReady = true;
 	m_rootItem = qobject_cast<QQuickItem *>(rootObject());
 	m_mapHelper = rootObject()->findChild<MapWidgetHelper *>();
-	connect(m_mapHelper, SIGNAL(selectedDivesChanged(QList<int>)),
-		this, SLOT(selectedDivesChanged(QList<int>)));
+	connect(m_mapHelper, &MapWidgetHelper::selectedDivesChanged, this, &MapWidget::selectedDivesChanged);
 	connect(m_mapHelper, &MapWidgetHelper::coordinatesChanged, this, &MapWidget::coordinatesChanged);
 }
 
@@ -108,7 +107,7 @@ void MapWidget::prepareForGetDiveCoordinates(struct dive_site *ds)
 	skipReload = true;
 }
 
-void MapWidget::selectedDivesChanged(QList<int> list)
+void MapWidget::selectedDivesChanged(const QList<int> &list)
 {
 	CHECK_IS_READY_RETURN_VOID();
 	skipReload = true;
diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h
index 9d31aa75a..96da308d8 100644
--- a/desktop-widgets/mapwidget.h
+++ b/desktop-widgets/mapwidget.h
@@ -31,7 +31,7 @@ public slots:
 	void endGetDiveCoordinates();
 	void repopulateLabels();
 	void prepareForGetDiveCoordinates(struct dive_site *ds);
-	void selectedDivesChanged(QList<int>);
+	void selectedDivesChanged(const QList<int> &);
 	void coordinatesChanged(struct dive_site *ds, const location_t &);
 	void doneLoading(QQuickWidget::Status status);
 	void diveSiteChanged(struct dive_site *ds, int field);
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index 5454f5858..e4c62ccd0 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -110,7 +110,7 @@ void MapWidgetHelper::selectedLocationChanged(MapLocation *location)
 {
 	int idx;
 	struct dive *dive;
-	m_selectedDiveIds.clear();
+	QList<int> selectedDiveIds;
 	QGeoCoordinate locationCoord = location->coordinate();
 	for_each_dive (idx, dive) {
 		struct dive_site *ds = get_dive_site_for_dive(dive);
@@ -121,27 +121,27 @@ void MapWidgetHelper::selectedLocationChanged(MapLocation *location)
 		const qreal longitude = ds->location.lon.udeg * 0.000001;
 		QGeoCoordinate dsCoord(latitude, longitude);
 		if (locationCoord.distanceTo(dsCoord) < m_smallCircleRadius)
-			m_selectedDiveIds.append(idx);
+			selectedDiveIds.append(idx);
 	}
 #else // the mobile version doesn't support multi-dive selection
 		if (ds == location->divesite())
-			m_selectedDiveIds.append(dive->id); // use id here instead of index
+			selectedDiveIds.append(dive->id); // use id here instead of index
 	}
 	int last; // get latest dive chronologically
-	if (!m_selectedDiveIds.isEmpty()) {
-		 last = m_selectedDiveIds.last();
-		 m_selectedDiveIds.clear();
-		 m_selectedDiveIds.append(last);
+	if (!selectedDiveIds.isEmpty()) {
+		 last = selectedDiveIds.last();
+		 selectedDiveIds.clear();
+		 selectedDiveIds.append(last);
 	}
 #endif
-	emit selectedDivesChanged(m_selectedDiveIds);
+	emit selectedDivesChanged(selectedDiveIds);
 }
 
 void MapWidgetHelper::selectVisibleLocations()
 {
 	int idx;
 	struct dive *dive;
-	m_selectedDiveIds.clear();
+	QList<int> selectedDiveIds;
 	for_each_dive (idx, dive) {
 		struct dive_site *ds = get_dive_site_for_dive(dive);
 		if (!dive_site_has_gps_location(ds))
@@ -154,19 +154,19 @@ void MapWidgetHelper::selectVisibleLocations()
 		                          Q_ARG(QGeoCoordinate, dsCoord));
 		if (!qIsNaN(point.x()))
 #ifndef SUBSURFACE_MOBILE // indexes on desktop
-			m_selectedDiveIds.append(idx);
+			selectedDiveIds.append(idx);
 	}
 #else // use id on mobile instead of index
-			m_selectedDiveIds.append(dive->id);
+			selectedDiveIds.append(dive->id);
 	}
 	int last; // get latest dive chronologically
-	if (!m_selectedDiveIds.isEmpty()) {
-		 last = m_selectedDiveIds.last();
-		 m_selectedDiveIds.clear();
-		 m_selectedDiveIds.append(last);
+	if (!selectedDiveIds.isEmpty()) {
+		 last = selectedDiveIds.last();
+		 selectedDiveIds.clear();
+		 selectedDiveIds.append(last);
 	}
 #endif
-	emit selectedDivesChanged(m_selectedDiveIds);
+	emit selectedDivesChanged(selectedDiveIds);
 }
 
 /*
diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h
index 2ea4959d6..d6dfa17a1 100644
--- a/map-widget/qmlmapwidgethelper.h
+++ b/map-widget/qmlmapwidgethelper.h
@@ -43,7 +43,6 @@ private:
 	QObject *m_map;
 	MapLocationModel *m_mapLocationModel;
 	qreal m_smallCircleRadius;
-	QList<int> m_selectedDiveIds;
 	bool m_editMode;
 
 private slots:
@@ -52,7 +51,7 @@ private slots:
 signals:
 	void modelChanged();
 	void editModeChanged();
-	void selectedDivesChanged(QList<int> list);
+	void selectedDivesChanged(const QList<int> &list);
 	void coordinatesChanged(struct dive_site *ds, const location_t &);
 	void pluginObjectChanged();
 };