[PATCH 02/13] Fix 02 typo, rename O2 members in devicesettings

Anton Lundin glance at acc.umu.se
Fri Oct 17 15:33:36 PDT 2014


Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 configuredivecomputerthreads.cpp |  4 ++--
 devicedetails.cpp                | 20 ++++++++++----------
 devicedetails.h                  | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/configuredivecomputerthreads.cpp b/configuredivecomputerthreads.cpp
index fe5430a..00e2e1a 100644
--- a/configuredivecomputerthreads.cpp
+++ b/configuredivecomputerthreads.cpp
@@ -22,8 +22,8 @@
 #define OSTC3_CCR_MODE			0x1F
 #define OSTC3_DIVE_MODE			0x20
 #define OSTC3_DECO_TYPE			0x21
-#define OSTC3_PP02_MAX			0x22
-#define OSTC3_PP02_MIN			0x23
+#define OSTC3_PPO2_MAX			0x22
+#define OSTC3_PPO2_MIN			0x23
 #define OSTC3_FUTURE_TTS		0x24
 #define OSTC3_GF_LOW			0x25
 #define OSTC3_GF_HIGH			0x26
diff --git a/devicedetails.cpp b/devicedetails.cpp
index ccd7689..d6984b3 100644
--- a/devicedetails.cpp
+++ b/devicedetails.cpp
@@ -30,8 +30,8 @@ DeviceDetails::DeviceDetails(QObject *parent) :
 	m_ccrMode(0),
 	m_diveMode(0),
 	m_decoType(0),
-	m_pp02Max(0),
-	m_pp02Min(0),
+	m_ppO2Max(0),
+	m_ppO2Min(0),
 	m_futureTTS(0),
 	m_gfLow(0),
 	m_gfHigh(0),
@@ -355,24 +355,24 @@ void DeviceDetails::setDecoType(int decoType)
 	m_decoType = decoType;
 }
 
-int DeviceDetails::pp02Max() const
+int DeviceDetails::ppO2Max() const
 {
-	return m_pp02Max;
+	return m_ppO2Max;
 }
 
-void DeviceDetails::setPp02Max(int pp02Max)
+void DeviceDetails::setPpO2Max(int ppO2Max)
 {
-	m_pp02Max = pp02Max;
+	m_ppO2Max = ppO2Max;
 }
 
-int DeviceDetails::pp02Min() const
+int DeviceDetails::ppO2Min() const
 {
-	return m_pp02Min;
+	return m_ppO2Min;
 }
 
-void DeviceDetails::setPp02Min(int pp02Min)
+void DeviceDetails::setPpO2Min(int ppO2Min)
 {
-	m_pp02Min = pp02Min;
+	m_ppO2Min = ppO2Min;
 }
 
 int DeviceDetails::futureTTS() const
diff --git a/devicedetails.h b/devicedetails.h
index 4953f72..13311ec 100644
--- a/devicedetails.h
+++ b/devicedetails.h
@@ -110,11 +110,11 @@ public:
 	int decoType() const;
 	void setDecoType(int decoType);
 
-	int pp02Max() const;
-	void setPp02Max(int pp02Max);
+	int ppO2Max() const;
+	void setPpO2Max(int ppO2Max);
 
-	int pp02Min() const;
-	void setPp02Min(int pp02Min);
+	int ppO2Min() const;
+	void setPpO2Min(int ppO2Min);
 
 	int futureTTS() const;
 	void setFutureTTS(int futureTTS);
@@ -216,8 +216,8 @@ private:
 	int m_ccrMode;
 	int m_diveMode;
 	int m_decoType;
-	int m_pp02Max;
-	int m_pp02Min;
+	int m_ppO2Max;
+	int m_ppO2Min;
 	int m_futureTTS;
 	int m_gfLow;
 	int m_gfHigh;
-- 
1.9.1



More information about the subsurface mailing list