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

Dive site: un-globalize displayed_dive_site

Browse source 
The global object displayed_dive_site is used a a backing-store
by the dive-site-edit widget. All external accesses were removed,
therefore make the object local to the widget.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-13 10:59:16 +02:00 • committed by Dirk Hohndel
parent 954820aa81
commit 5d3967ce84
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
desktop-widgets/locationinformation.cpp
View file

@ -19,6 +19,7 @@
LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBox(parent), modified(false)
{
memset(&displayed_dive_site, 0, sizeof(displayed_dive_site));
ui.setupUi(this);
ui.diveSiteMessage->setCloseButtonVisible(false);
@ -373,7 +374,7 @@ QVariant DiveLocationModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole:
return new_ds_value[index.row()];
case Qt::ToolTipRole:
return displayed_dive_site.uuid ?
return displayed_dive.dive_site_uuid ?
tr("Create a new dive site, copying relevant information from the current dive.") :
tr("Create a new dive site with this name");
case Qt::DecorationRole: