From 4e81edcf1e73b118fea1cb72b8a287a2ed738ef5 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 5 May 2019 14:58:04 +0200 Subject: Map: remove skipReload logic in mapwidget.cpp There used to be a flag to avoid reloading of the map. Since this is not used anymore, remove it. Signed-off-by: Berthold Stoeger --- desktop-widgets/mapwidget.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index 8bc0b175c..b28dea830 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -16,7 +16,6 @@ static const QUrl urlMapWidget = QUrl(QStringLiteral("qrc:/qml/MapWidget.qml")); static const QUrl urlMapWidgetError = QUrl(QStringLiteral("qrc:/qml/MapWidgetError.qml")); static bool isReady = false; -static bool skipReload = false; #define CHECK_IS_READY_RETURN_VOID() \ if (!isReady) return @@ -55,8 +54,7 @@ void MapWidget::doneLoading(QQuickWidget::Status status) void MapWidget::centerOnDiveSite(struct dive_site *ds) { CHECK_IS_READY_RETURN_VOID(); - if (!skipReload) - m_mapHelper->centerOnDiveSite(ds); + m_mapHelper->centerOnDiveSite(ds); } void MapWidget::centerOnIndex(const QModelIndex& idx) @@ -78,10 +76,8 @@ void MapWidget::repopulateLabels() void MapWidget::reload() { CHECK_IS_READY_RETURN_VOID(); - if (!skipReload) { - m_mapHelper->reloadMapLocations(); - m_mapHelper->centerOnSelectedDiveSite(); - } + m_mapHelper->reloadMapLocations(); + m_mapHelper->centerOnSelectedDiveSite(); } void MapWidget::selectedDivesChanged(const QList &list) -- cgit v1.2.3-70-g09d2