summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/locationinformation.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-10-13 11:52:59 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-13 21:41:41 -0400
commit8815f77ea086ba474df051144098b80739a0f3ae (patch)
treecd4546081961c4734ca850d72ce8c2f62ac91dc9 /desktop-widgets/locationinformation.h
parent5d3967ce846ed4876abeb43ebe2d919064050ed6 (diff)
downloadsubsurface-8815f77ea086ba474df051144098b80739a0f3ae.tar.gz
Dive site: use own copy of taxonomy in dive-site-edit widget
The dive-site-edit widget uses a copy of the to-be-edited site to compare with old values. Generally, this seems overkill (the original dive-site can be used for such a comparison). But one place where it can't simply be removed is the taxonomy, because the widget needs a place to store the unsaved data. Change the code to use an explicit taxonomy structure instead of the one provided in the copy. This should ultimately allow removal of the latter. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/locationinformation.h')
-rw-r--r--desktop-widgets/locationinformation.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop-widgets/locationinformation.h b/desktop-widgets/locationinformation.h
index 3e0da4aa6..43115a05b 100644
--- a/desktop-widgets/locationinformation.h
+++ b/desktop-widgets/locationinformation.h
@@ -4,6 +4,7 @@
#include "core/units.h"
#include "core/divesite.h"
+#include "core/taxonomy.h"
#include "ui_locationInformation.h"
#include "qt-models/divelocationmodel.h"
#include <stdint.h>
@@ -52,6 +53,7 @@ private:
QAction *acceptAction, *rejectAction;
GPSLocationInformationModel filter_model;
dive_site displayed_dive_site;
+ taxonomy_data taxonomy;
};
class DiveLocationFilterProxyModel : public QSortFilterProxyModel {