mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mainwindow: rename the variable 'globeGps' to 'mapWidget'

Browse source 
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>
This commit is contained in:
Lubomir I. Ivanov 2017-07-15 01:04:16 +03:00 • committed by Dirk Hohndel
parent 70ab937296
commit 0f0a953727
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
desktop-widgets/mainwindow.cpp
View file

@ -104,9 +104,9 @@ MainWindow::MainWindow() : QMainWindow(),
ProfileWidget2 *profileWidget = new ProfileWidget2(); ProfileWidget2 *profileWidget = new ProfileWidget2();
#ifndef NO_MARBLE #ifndef NO_MARBLE
GlobeGPS *globeGps = GlobeGPS::instance(); GlobeGPS *mapWidget = GlobeGPS::instance();
#else #else
QWidget *globeGps = NULL; QWidget *mapWidget = NULL;
#endif #endif
PlannerSettingsWidget *plannerSettings = new PlannerSettingsWidget(); PlannerSettingsWidget *plannerSettings = new PlannerSettingsWidget();
@ -157,12 +157,12 @@ MainWindow::MainWindow() : QMainWindow(),
enabledList.push_back(enabled); enabledList.push_back(enabled);
disabledList.push_back(disabled); disabledList.push_back(disabled);
registerApplicationState("Default", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("Default", mainTab, profileContainer, diveListView, mapWidget );
registerApplicationState("AddDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("AddDive", mainTab, profileContainer, diveListView, mapWidget );
registerApplicationState("EditDive", mainTab, profileContainer, diveListView, globeGps ); registerApplicationState("EditDive", mainTab, profileContainer, diveListView, mapWidget );
registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails ); registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails );
registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, globeGps ); registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, mapWidget );
registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveListView, globeGps); registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveListView, mapWidget);
setStateProperties("Default", enabledList, enabledList, enabledList,enabledList); setStateProperties("Default", enabledList, enabledList, enabledList,enabledList);
setStateProperties("AddDive", 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())); connect(this, SIGNAL(startDiveSiteEdit()), this, SLOT(on_actionDiveSiteEdit_triggered()));
#ifndef NO_MARBLE #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 #endif
wtu = new WindowTitleUpdate(); wtu = new WindowTitleUpdate();
connect(WindowTitleUpdate::instance(), SIGNAL(updateTitle()), this, SLOT(setAutomaticTitle())); connect(WindowTitleUpdate::instance(), SIGNAL(updateTitle()), this, SLOT(setAutomaticTitle()));