From e47610cf5c42c09834a81dc4de52d8d4bbaaab05 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 30 Jun 2020 11:35:23 -0400
Subject: [PATCH] Minor cutting/pasting in device connection manager.

No functional change.
---
 oscar/SleepLib/deviceconnection.cpp | 37 +++++++++++++++--------------
 oscar/SleepLib/deviceconnection.h   | 15 ++++--------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/oscar/SleepLib/deviceconnection.cpp b/oscar/SleepLib/deviceconnection.cpp
index 58743935..2b7c4701 100644
--- a/oscar/SleepLib/deviceconnection.cpp
+++ b/oscar/SleepLib/deviceconnection.cpp
@@ -14,6 +14,8 @@
 #include <QDir>
 #include <QBuffer>
 #include <QDateTime>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 #include <QDebug>
 
 
@@ -940,12 +942,27 @@ bool SerialPortInfo::operator==(const SerialPortInfo & other) const
 }
 
 
-// TODO: restrict constructor to OpenConnectionEvent
+// MARK: -
+// MARK: Device connection base class
+
+class OpenConnectionEvent : public XmlReplayBase<OpenConnectionEvent>
+{
+public:
+    OpenConnectionEvent() {}
+    OpenConnectionEvent(const QString & type, const QString & name)
+    {
+        set("type", type);
+        set("name", name);
+    }
+    virtual const QString id() const { return m_values["name"]; }
+};
+REGISTER_XMLREPLAYEVENT("openConnection", OpenConnectionEvent);
+
 class ConnectionEvent : public XmlReplayBase<ConnectionEvent>
 {
 public:
     ConnectionEvent() { Q_ASSERT(false); }  // Implement if we ever support string-based substreams
-    ConnectionEvent(const XmlReplayEvent & trigger)
+    ConnectionEvent(const OpenConnectionEvent & trigger)
     {
         copy(trigger);
     }
@@ -957,9 +974,6 @@ public:
 };
 REGISTER_XMLREPLAYEVENT("connection", ConnectionEvent);
 
-// MARK: -
-// MARK: Device connection base class
-
 class ConnectionRecorder : public XmlRecorder
 {
 public:
@@ -1027,19 +1041,6 @@ public:
 };
 REGISTER_XMLREPLAYEVENT("get", GetValueEvent);
 
-class OpenConnectionEvent : public XmlReplayBase<OpenConnectionEvent>
-{
-public:
-    OpenConnectionEvent() {}
-    OpenConnectionEvent(const QString & type, const QString & name)
-    {
-        set("type", type);
-        set("name", name);
-    }
-    virtual const QString id() const { return m_values["name"]; }
-};
-REGISTER_XMLREPLAYEVENT("openConnection", OpenConnectionEvent);
-
 class CloseConnectionEvent : public XmlReplayBase<CloseConnectionEvent>
 {
 public:
diff --git a/oscar/SleepLib/deviceconnection.h b/oscar/SleepLib/deviceconnection.h
index 368ab967..2ed54f7b 100644
--- a/oscar/SleepLib/deviceconnection.h
+++ b/oscar/SleepLib/deviceconnection.h
@@ -15,20 +15,13 @@
 #include <QtSerialPort/QSerialPort>
 #include <QHash>
 #include <QVariant>
-#include <QDateTime>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-
-class XmlRecorder;
-class XmlReplay;
-class XmlReplayEvent;
 
 class DeviceConnection : public QObject
 {
     Q_OBJECT
 
 protected:
-    DeviceConnection(const QString & name, XmlRecorder* record, XmlReplay* replay);
+    DeviceConnection(const QString & name, class XmlRecorder* record, class XmlReplay* replay);
 
     const QString & m_name;
     XmlRecorder* m_record;
@@ -99,7 +92,7 @@ class SerialPortConnection : public DeviceConnection
 
 private:
     QSerialPort m_port;
-    void checkResult(bool ok, XmlReplayEvent & event) const;
+    void checkResult(bool ok, class XmlReplayEvent & event) const;
     void checkResult(qint64 len, XmlReplayEvent & event) const;
     void checkError(XmlReplayEvent & event) const;
     void close();
@@ -197,8 +190,8 @@ public:
     inline bool isNull() const { return m_info.isEmpty(); }
 
     operator QString() const;
-    friend QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info);
-    friend QXmlStreamReader & operator>>(QXmlStreamReader & xml, SerialPortInfo & info);
+    friend class QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info);
+    friend class QXmlStreamReader & operator>>(QXmlStreamReader & xml, SerialPortInfo & info);
     bool operator==(const SerialPortInfo & other) const;
 
 protected: