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

Change prefs.show_units_table to bool

Browse source 
Bool is the correct choice for this option.
int was used before because it was not clear to me how and if I can use
bool in this C file.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2017-11-21 15:52:01 +01:00 • committed by Dirk Hohndel
parent 178dcbc0c6
commit bd88306722
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/prefs-macros.h
View file

@ -18,11 +18,11 @@
else \ else \
prefs.units.field = default_prefs.units.field prefs.units.field = default_prefs.units.field
#define GET_UNIT_INT(name, field) \ #define GET_UNIT_BOOL(name, field) \
v = s.value(QString(name)); \ v = s.value(QString(name)); \
if (v.isValid()) \ if (v.isValid()) \
prefs.units.field = v.toInt(); \ prefs.units.field = v.toBool(); \
else \ else \
prefs.units.field = default_prefs.units.field prefs.units.field = default_prefs.units.field
#define GET_BOOL(name, field) \ #define GET_BOOL(name, field) \

6
core/subsurface-qt/SettingsObjectWrapper.cpp
View file

@ -1603,7 +1603,7 @@ int UnitsSettings::durationUnits() const
return prefs.units.duration_units; return prefs.units.duration_units;
} }
int UnitsSettings::showUnitsTable() const bool UnitsSettings::showUnitsTable() const
{ {
return prefs.units.show_units_table; return prefs.units.show_units_table;
} }
@ -1698,7 +1698,7 @@ void UnitsSettings::setDurationUnits(int value)
emit durationUnitChanged(value); emit durationUnitChanged(value);
} }
void UnitsSettings::setShowUnitsTable(int value) void UnitsSettings::setShowUnitsTable(bool value)
{ {
if (value == prefs.units.show_units_table) if (value == prefs.units.show_units_table)
return; return;
@ -2193,7 +2193,7 @@ void SettingsObjectWrapper::load()
} }
GET_UNIT("vertical_speed_time", vertical_speed_time, units::MINUTES, units::SECONDS); GET_UNIT("vertical_speed_time", vertical_speed_time, units::MINUTES, units::SECONDS);
GET_UNIT3("duration_units", duration_units, units::MIXED, units::ALWAYS_HOURS, units::DURATION); GET_UNIT3("duration_units", duration_units, units::MIXED, units::ALWAYS_HOURS, units::DURATION);
GET_UNIT_INT("show_units_table", show_units_table); GET_UNIT_BOOL("show_units_table", show_units_table);
GET_BOOL("coordinates", coordinates_traditional); GET_BOOL("coordinates", coordinates_traditional);
s.endGroup(); s.endGroup();
s.beginGroup("TecDetails"); s.beginGroup("TecDetails");

8
core/subsurface-qt/SettingsObjectWrapper.h
View file

@ -505,7 +505,7 @@ class UnitsSettings : public QObject {
Q_PROPERTY(bool coordinates_traditional READ coordinatesTraditional WRITE setCoordinatesTraditional NOTIFY coordinatesTraditionalChanged) Q_PROPERTY(bool coordinates_traditional READ coordinatesTraditional WRITE setCoordinatesTraditional NOTIFY coordinatesTraditionalChanged)
Q_PROPERTY(int vertical_speed_time READ verticalSpeedTime WRITE setVerticalSpeedTime NOTIFY verticalSpeedTimeChanged) Q_PROPERTY(int vertical_speed_time READ verticalSpeedTime WRITE setVerticalSpeedTime NOTIFY verticalSpeedTimeChanged)
Q_PROPERTY(int duration_units READ durationUnits WRITE setDurationUnits NOTIFY durationUnitChanged) Q_PROPERTY(int duration_units READ durationUnits WRITE setDurationUnits NOTIFY durationUnitChanged)
Q_PROPERTY(int show_units_table READ showUnitsTable WRITE setShowUnitsTable NOTIFY showUnitsTableChanged) Q_PROPERTY(bool show_units_table READ showUnitsTable WRITE setShowUnitsTable NOTIFY showUnitsTableChanged)
public: public:
UnitsSettings(QObject *parent = 0); UnitsSettings(QObject *parent = 0);
@ -516,7 +516,7 @@ public:
int weight() const; int weight() const;
int verticalSpeedTime() const; int verticalSpeedTime() const;
int durationUnits() const; int durationUnits() const;
int showUnitsTable() const; bool showUnitsTable() const;
QString unitSystem() const; QString unitSystem() const;
bool coordinatesTraditional() const; bool coordinatesTraditional() const;
@ -528,7 +528,7 @@ public slots:
void setWeight(int value); void setWeight(int value);
void setVerticalSpeedTime(int value); void setVerticalSpeedTime(int value);
void setDurationUnits(int value); void setDurationUnits(int value);
void setShowUnitsTable(int value); void setShowUnitsTable(bool value);
void setUnitSystem(const QString& value); void setUnitSystem(const QString& value);
void setCoordinatesTraditional(bool value); void setCoordinatesTraditional(bool value);
@ -542,7 +542,7 @@ signals:
void unitSystemChanged(const QString& value); void unitSystemChanged(const QString& value);
void coordinatesTraditionalChanged(bool value); void coordinatesTraditionalChanged(bool value);
void durationUnitChanged(int value); void durationUnitChanged(int value);
void showUnitsTableChanged(int value); void showUnitsTableChanged(bool value);
private: private:
const QString group = QStringLiteral("Units"); const QString group = QStringLiteral("Units");
}; };

4
core/units.h
View file

@ -9,6 +9,8 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else
#include <stdbool.h>
#endif #endif
#define O2_IN_AIR 209 // permille #define O2_IN_AIR 209 // permille
@ -263,7 +265,7 @@ struct units {
MINUTES_ONLY, MINUTES_ONLY,
ALWAYS_HOURS ALWAYS_HOURS
} duration_units; } duration_units;
int show_units_table; bool show_units_table;
}; };
/* /*