diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-07-15 01:04:16 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-28 07:31:11 -0700 |
| commit | 0f0a953727db5a63e03956c493261c03dc6be2f2 (patch) | |
| tree | 519c1681e70ad4f263d6c967922444d5cdbd927e | |
| parent | 70ab9372960270c62ab2effe93a06fcc0e472dc6 (diff) | |
| download | subsurface-0f0a953727db5a63e03956c493261c03dc6be2f2.tar.gz | |
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 <neolit123@gmail.com>
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 16 |
1 files 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())); |