summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2017-11-12 14:26:34 +0100
committerGravatar Jan Mulder <jlmulder@xs4all.nl>2017-11-12 15:11:30 +0100
commitb32251a5a8ec6dc431b6c5a71e5cd9d3d95f0930 (patch)
treeedaba36a007a32d40abccfabdb4930fd4a0b407a
parent4d04f74312dc4a7fe75a442cf22a2901ede28d1a (diff)
downloadsubsurface-b32251a5a8ec6dc431b6c5a71e5cd9d3d95f0930.tar.gz
Typo: modp02 -> modpO2
Fixes two function names, where O2 was written as 02. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.cpp4
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.h6
-rw-r--r--desktop-widgets/preferences/preferences_graph.cpp2
-rw-r--r--tests/testpreferences.cpp8
4 files changed, 10 insertions, 10 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index 3787d27dd..ed4b556d1 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
@@ -296,7 +296,7 @@ void TechnicalDetailsSettings::setDecoMode(deco_mode d)
emit decoModeChanged(d);
}
-double TechnicalDetailsSettings:: modp02() const
+double TechnicalDetailsSettings:: modpO2() const
{
return prefs.modpO2;
}
@@ -416,7 +416,7 @@ bool TechnicalDetailsSettings::showPicturesInProfile() const
return prefs.show_pictures_in_profile;
}
-void TechnicalDetailsSettings::setModp02(double value)
+void TechnicalDetailsSettings::setModpO2(double value)
{
if (value == prefs.modpO2)
return;
diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index 622bb7efb..d16d3fa27 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -112,7 +112,7 @@ private:
class TechnicalDetailsSettings : public QObject {
Q_OBJECT
- Q_PROPERTY(double modpO2 READ modp02 WRITE setModp02 NOTIFY modpO2Changed)
+ Q_PROPERTY(double modpO2 READ modpO2 WRITE setModpO2 NOTIFY modpO2Changed)
Q_PROPERTY(bool ead READ ead WRITE setEad NOTIFY eadChanged)
Q_PROPERTY(bool mod READ mod WRITE setMod NOTIFY modChanged)
Q_PROPERTY(bool dcceiling READ dcceiling WRITE setDCceiling NOTIFY dcceilingChanged)
@@ -141,7 +141,7 @@ class TechnicalDetailsSettings : public QObject {
public:
TechnicalDetailsSettings(QObject *parent);
- double modp02() const;
+ double modpO2() const;
bool ead() const;
bool mod() const;
bool dcceiling() const;
@@ -169,7 +169,7 @@ public:
public slots:
void setMod(bool value);
- void setModp02(double value);
+ void setModpO2(double value);
void setEad(bool value);
void setDCceiling(bool value);
void setRedceiling(bool value);
diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index f0bd408e1..9f45c7db6 100644
--- a/desktop-widgets/preferences/preferences_graph.cpp
+++ b/desktop-widgets/preferences/preferences_graph.cpp
@@ -62,7 +62,7 @@ void PreferencesGraph::syncSettings()
pp_gas->setPn2Threshold(ui->pn2Threshold->value());
auto tech = SettingsObjectWrapper::instance()->techDetails;
- tech->setModp02(ui->maxpo2->value());
+ tech->setModpO2(ui->maxpo2->value());
tech->setRedceiling(ui->red_ceiling->isChecked());
tech->setBuehlmann(ui->buehlmann->isChecked());
tech->setGflow(ui->gflow->value());
diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp
index 59a4037a6..ae8ad6132 100644
--- a/tests/testpreferences.cpp
+++ b/tests/testpreferences.cpp
@@ -78,10 +78,10 @@ void TestPreferences::testPreferences()
TEST(cloud->verificationStatus(), (short)1);
auto tecDetails = pref->techDetails;
- tecDetails->setModp02(0.2);
- TEST(tecDetails->modp02(), 0.2);
- tecDetails->setModp02(1.0);
- TEST(tecDetails->modp02(), 1.0);
+ tecDetails->setModpO2(0.2);
+ TEST(tecDetails->modpO2(), 0.2);
+ tecDetails->setModpO2(1.0);
+ TEST(tecDetails->modpO2(), 1.0);
tecDetails->setGflow(2);
TEST(tecDetails->gflow(), 2);