From 0f0a953727db5a63e03956c493261c03dc6be2f2 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 15 Jul 2017 01:04:16 +0300 Subject: [PATCH] mainwindow: rename the variable 'globeGps' to 'mapWidget' This is needed by the transition to the new map widget. Also generalizes the variable name. Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/mainwindow.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 4753f178c..8e7620d7a 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -104,9 +104,9 @@ MainWindow::MainWindow() : QMainWindow(), ProfileWidget2 *profileWidget = new ProfileWidget2(); #ifndef NO_MARBLE - GlobeGPS *globeGps = GlobeGPS::instance(); + GlobeGPS *mapWidget = GlobeGPS::instance(); #else - QWidget *globeGps = NULL; + QWidget *mapWidget = NULL; #endif PlannerSettingsWidget *plannerSettings = new PlannerSettingsWidget(); @@ -157,12 +157,12 @@ MainWindow::MainWindow() : QMainWindow(), enabledList.push_back(enabled); disabledList.push_back(disabled); - registerApplicationState("Default", mainTab, profileContainer, diveListView, globeGps ); - registerApplicationState("AddDive", mainTab, profileContainer, diveListView, globeGps ); - registerApplicationState("EditDive", mainTab, profileContainer, diveListView, globeGps ); + registerApplicationState("Default", mainTab, profileContainer, diveListView, mapWidget ); + registerApplicationState("AddDive", mainTab, profileContainer, diveListView, mapWidget ); + registerApplicationState("EditDive", mainTab, profileContainer, diveListView, mapWidget ); registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails ); - registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, globeGps ); - registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveListView, globeGps); + registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, mapWidget ); + registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveListView, mapWidget); setStateProperties("Default", enabledList, enabledList, enabledList,enabledList); setStateProperties("AddDive", enabledList, enabledList, enabledList,enabledList); @@ -199,7 +199,7 @@ MainWindow::MainWindow() : QMainWindow(), connect(this, SIGNAL(startDiveSiteEdit()), this, SLOT(on_actionDiveSiteEdit_triggered())); #ifndef NO_MARBLE - connect(information(), SIGNAL(diveSiteChanged(struct dive_site *)), globeGps, SLOT(centerOnDiveSite(struct dive_site *))); + connect(information(), SIGNAL(diveSiteChanged(struct dive_site *)), mapWidget, SLOT(centerOnDiveSite(struct dive_site *))); #endif wtu = new WindowTitleUpdate(); connect(WindowTitleUpdate::instance(), SIGNAL(updateTitle()), this, SLOT(setAutomaticTitle()));