diff options
author | willemferguson <willemferguson@zoology.up.ac.za> | 2019-12-12 10:28:04 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-12-25 02:57:42 +0900 |
commit | 6212bb6721391efc82df21d80d177f93204cb12e (patch) | |
tree | b055013d411f38fd72fb515f208868c37defb799 /core | |
parent | 42a85dfa7e3052d50a831bb5700a26ad7df9dc0a (diff) | |
download | subsurface-6212bb6721391efc82df21d80d177f93204cb12e.tar.gz |
Preferences UI: final cleanup
This commit does some final cleaning up to the code, mostly deleting
white space and comments.
Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
-rw-r--r-- | core/settings/qPrefDiveComputer.cpp | 2 | ||||
-rw-r--r-- | core/settings/qPrefEquipment.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefGeneral.cpp | 2 | ||||
-rw-r--r-- | core/settings/qPrefGeocoding.cpp | 4 | ||||
-rw-r--r-- | core/settings/qPrefGeocoding.h | 1 | ||||
-rw-r--r-- | core/settings/qPrefLog.cpp | 3 | ||||
-rw-r--r-- | core/settings/qPrefMedia.cpp | 1 | ||||
-rw-r--r-- | core/settings/qPrefTechnicalDetails.h | 1 |
8 files changed, 3 insertions, 12 deletions
diff --git a/core/settings/qPrefDiveComputer.cpp b/core/settings/qPrefDiveComputer.cpp index c19f56c18..0ee74254a 100644 --- a/core/settings/qPrefDiveComputer.cpp +++ b/core/settings/qPrefDiveComputer.cpp @@ -10,7 +10,6 @@ qPrefDiveComputer *qPrefDiveComputer::instance() return self; } - void qPrefDiveComputer::loadSync(bool doSync) { // last computer used @@ -30,7 +29,6 @@ void qPrefDiveComputer::loadSync(bool doSync) DISK_DC(2) DISK_DC(3) DISK_DC(4) - } // these are the 'active' settings diff --git a/core/settings/qPrefEquipment.cpp b/core/settings/qPrefEquipment.cpp index f7bdb01e1..10c6877aa 100644 --- a/core/settings/qPrefEquipment.cpp +++ b/core/settings/qPrefEquipment.cpp @@ -14,7 +14,6 @@ void qPrefEquipment::loadSync(bool doSync) { disk_default_cylinder(doSync); disk_display_unused_tanks(doSync); - } HANDLE_PREFERENCE_TXT(Equipment, "default_cylinder", default_cylinder); diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp index 25ed835f0..96b9a1aca 100644 --- a/core/settings/qPrefGeneral.cpp +++ b/core/settings/qPrefGeneral.cpp @@ -2,7 +2,6 @@ #include "qPrefGeneral.h" #include "qPrefPrivate.h" - static const QString group = QStringLiteral("GeneralSettings"); QString qPrefGeneral::st_diveshareExport_uid; @@ -17,7 +16,6 @@ qPrefGeneral *qPrefGeneral::instance() return self; } - void qPrefGeneral::loadSync(bool doSync) { disk_defaultsetpoint(doSync); diff --git a/core/settings/qPrefGeocoding.cpp b/core/settings/qPrefGeocoding.cpp index 57450eac2..2c27ea4f4 100644 --- a/core/settings/qPrefGeocoding.cpp +++ b/core/settings/qPrefGeocoding.cpp @@ -17,7 +17,6 @@ void qPrefGeocoding::loadSync(bool doSync) disk_third_taxonomy_category(doSync); } - void qPrefGeocoding::set_first_taxonomy_category(taxonomy_category value) { if (value != prefs.geocoding.category[0]) { @@ -34,7 +33,6 @@ void qPrefGeocoding::disk_first_taxonomy_category(bool doSync) prefs.geocoding.category[0] = (enum taxonomy_category)qPrefPrivate::propValue(keyFromGroupAndName(group, "cat0"), default_prefs.geocoding.category[0]).toInt(); } - void qPrefGeocoding::set_second_taxonomy_category(taxonomy_category value) { if (value != prefs.geocoding.category[1]) { @@ -43,6 +41,7 @@ void qPrefGeocoding::set_second_taxonomy_category(taxonomy_category value) emit instance()->second_taxonomy_categoryChanged(value); } } + void qPrefGeocoding::disk_second_taxonomy_category(bool doSync) { if (doSync) @@ -60,6 +59,7 @@ void qPrefGeocoding::set_third_taxonomy_category(taxonomy_category value) emit instance()->third_taxonomy_categoryChanged(value); } } + void qPrefGeocoding::disk_third_taxonomy_category(bool doSync) { if (doSync) diff --git a/core/settings/qPrefGeocoding.h b/core/settings/qPrefGeocoding.h index f2eb95fbc..c8c4c106d 100644 --- a/core/settings/qPrefGeocoding.h +++ b/core/settings/qPrefGeocoding.h @@ -5,7 +5,6 @@ #include <QObject> - class qPrefGeocoding : public QObject { Q_OBJECT Q_PROPERTY(taxonomy_category first_taxonomy_category READ first_taxonomy_category WRITE set_first_taxonomy_category NOTIFY first_taxonomy_categoryChanged) diff --git a/core/settings/qPrefLog.cpp b/core/settings/qPrefLog.cpp index 2ce9ae550..3a267b56d 100644 --- a/core/settings/qPrefLog.cpp +++ b/core/settings/qPrefLog.cpp @@ -19,8 +19,6 @@ void qPrefLog::loadSync(bool doSync) disk_show_average_depth(doSync); } -HANDLE_PREFERENCE_TXT(Log, "default_filename", default_filename); - void qPrefLog::set_default_file_behavior(enum def_file_behavior value) { if (value != prefs.default_file_behavior || @@ -50,6 +48,7 @@ void qPrefLog::disk_default_file_behavior(bool doSync) } } +HANDLE_PREFERENCE_TXT(Log, "default_filename", default_filename); HANDLE_PREFERENCE_BOOL(Log, "extraEnvironmentalDefault", extraEnvironmentalDefault); diff --git a/core/settings/qPrefMedia.cpp b/core/settings/qPrefMedia.cpp index 557b2124f..60e68f3d9 100644 --- a/core/settings/qPrefMedia.cpp +++ b/core/settings/qPrefMedia.cpp @@ -17,7 +17,6 @@ void qPrefMedia::loadSync(bool doSync) disk_ffmpeg_executable(doSync); disk_auto_recalculate_thumbnails(doSync); disk_auto_recalculate_thumbnails(doSync); - } HANDLE_PREFERENCE_BOOL(Media, "auto_recalculate_thumbnails", auto_recalculate_thumbnails); diff --git a/core/settings/qPrefTechnicalDetails.h b/core/settings/qPrefTechnicalDetails.h index 5b62aa7ea..f50aa35b2 100644 --- a/core/settings/qPrefTechnicalDetails.h +++ b/core/settings/qPrefTechnicalDetails.h @@ -5,7 +5,6 @@ #include <QObject> - class qPrefTechnicalDetails : public QObject { Q_OBJECT Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE set_calcalltissues NOTIFY calcalltissuesChanged) |