summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/divelogimportdialog.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-07 22:16:30 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-07 22:26:33 -0800
commit440423ff6476119e090798ae2d59dc59d5253a0a (patch)
tree5a8c32678056583e0cc7cd06682bc123d0584e33 /desktop-widgets/divelogimportdialog.cpp
parentbfe24526d35c47c1229a0711882d4e789fb46731 (diff)
parent829f7a2ee264b4e25e8ea926a98199f8049a23d6 (diff)
downloadsubsurface-440423ff6476119e090798ae2d59dc59d5253a0a.tar.gz
Merge branch 'warnings' of github.com:neolit123/subsurface
Diffstat (limited to 'desktop-widgets/divelogimportdialog.cpp')
-rw-r--r--desktop-widgets/divelogimportdialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 025d181d1..5747f3652 100644
--- a/desktop-widgets/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
@@ -22,7 +22,7 @@ const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] =
{ NULL, }
};
-static enum {
+enum Known {
MANUAL,
APD,
APD2,
@@ -30,7 +30,7 @@ static enum {
SENSUS,
SEABEAR,
SUBSURFACE
-} known;
+};
ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(parent)
{