From a4fdb03c49e11240e44d3bb7c560d74fd5ba7790 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 26 Oct 2021 14:59:41 -0400
Subject: [PATCH] Move Machine properties into MachineInfo.

This will help loaders be less tied to the Machine data structure.
Since Machine contains a MachineInfo, this changes no functionality.
---
 oscar/SleepLib/loader_plugins/intellipap_loader.cpp | 4 ++--
 oscar/SleepLib/loader_plugins/prs1_loader.cpp       | 2 +-
 oscar/SleepLib/loader_plugins/prs1_loader.h         | 2 --
 oscar/SleepLib/loader_plugins/resmed_loader.cpp     | 2 +-
 oscar/SleepLib/machine.h                            | 3 ---
 oscar/SleepLib/machine_common.h                     | 3 +++
 oscar/SleepLib/profiles.cpp                         | 4 ++--
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
index 4cc6d69e..c0aefc67 100644
--- a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
@@ -1,4 +1,4 @@
-/* SleepLib (DeVilbiss) Intellipap Loader Implementation
+/* SleepLib (DeVilbiss) Intellipap Loader Implementation
  *
  * Notes: Intellipap DV54 requires the SmartLink attachment to access this data.
  *
@@ -260,7 +260,7 @@ int IntellipapLoader::OpenDV5(const QString & path)
 
     // Refresh properties data..
     for (QHash<QString, QString>::iterator i = set1.begin(); i != set1.end(); i++) {
-        mach->properties[i.key()] = i.value();
+        mach->info.properties[i.key()] = i.value();
     }
 
     f.close();
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index f4d37c74..2678c536 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -676,7 +676,7 @@ bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Ma
         }
         if (!mach || skip) continue;
 
-        mach->properties[key] = props[key];
+        mach->info.properties[key] = props[key];
     };
 
     if (!modelnum.isEmpty()) {
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index 1a0fafb8..fa5c1374 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -136,8 +136,6 @@ protected:
     // State that needs to persist between individual events:
     EventDataType m_currentPressure;
     bool m_calcPSfromSet;
-    bool m_calcLeaks;
-    EventDataType m_lpm4, m_ppm;
 
     //! \brief Advance the current mask-on slice if needed and update import data structures accordingly.
     bool UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t);
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index a0d4dc86..4f3fabcb 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -466,7 +466,7 @@ int ResmedLoader::Open(const QString & dirpath)
     // Copy the idmap into machine objects properties, (overwriting any old values)
     ///////////////////////////////////////////////////////////////////////////////////
     for (auto i=idmap.begin(), idend=idmap.end(); i != idend; i++) {
-        mach->properties[i.key()] = i.value();
+        mach->info.properties[i.key()] = i.value();
     }
 
     ///////////////////////////////////////////////////////////////////////////////////
diff --git a/oscar/SleepLib/machine.h b/oscar/SleepLib/machine.h
index 632debe5..2e2dc325 100644
--- a/oscar/SleepLib/machine.h
+++ b/oscar/SleepLib/machine.h
@@ -259,9 +259,6 @@ class Machine
     //! \brief Contains all sessions for this machine, indexed by SessionID
     QHash<SessionID, Session *> sessionlist;
 
-    //! \brief List of text machine properties, like brand, model, etc...
-    QHash<QString, QString> properties;
-
     //! \brief The list of sessions that need saving (for multithreaded save code)
 //  QList<Session *> m_savelist;
 
diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h
index e547e78b..9fe9bcee 100644
--- a/oscar/SleepLib/machine_common.h
+++ b/oscar/SleepLib/machine_common.h
@@ -126,6 +126,9 @@ struct MachineInfo {
     QDateTime lastimported;
     int version;
     QDate purgeDate;
+
+    //! \brief List of text machine properties, like brand, model, etc...
+    QHash<QString, QString> properties;
 };
 
 
diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index 2e3f86ee..7fe49b13 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -257,7 +257,7 @@ bool Profile::OpenMachines()
 
         m = CreateMachine(info, m_id);
 
-        if (m) m->properties = prop;
+        if (m) m->info.properties = prop;
 
         elem = elem.nextSiblingElement();
     }
@@ -282,7 +282,7 @@ bool Profile::StoreMachines()
         QDomElement pe = doc.createElement("properties");
         me.appendChild(pe);
 
-        for (QHash<QString, QString>::iterator j = m->properties.begin(); j != m->properties.end(); j++) {
+        for (QHash<QString, QString>::iterator j = m->info.properties.begin(); j != m->info.properties.end(); j++) {
             QDomElement pp = doc.createElement(j.key());
             pp.appendChild(doc.createTextNode(j.value()));
             pe.appendChild(pp);