Reorganize BobinkClient by domain and make s_instance private

Group header and source by domain (Connection, Discovery, PKI) so
properties, methods, and signal handlers live together. Move enums
before constructor, move s_instance to private, and add a public
instance() accessor used by BobinkNode.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/BobinkNode.cpp b/src/BobinkNode.cpp
index fed87bc..55e3b75 100644
--- a/src/BobinkNode.cpp
+++ b/src/BobinkNode.cpp
@@ -104,7 +104,7 @@ BobinkNode::componentComplete ()
   QQuickItem::componentComplete ();
   m_componentComplete = true;
 
-  auto *client = BobinkClient::s_instance;
+  auto *client = BobinkClient::instance ();
   if (client)
     connect (client, &BobinkClient::connectedChanged, this,
              &BobinkNode::handleClientConnectedChanged);
@@ -137,7 +137,7 @@ BobinkNode::startMonitoring ()
   if (m_opcuaNode || m_nodeId.isEmpty ())
     return;
 
-  auto *client = BobinkClient::s_instance;
+  auto *client = BobinkClient::instance ();
   if (!client || !client->connected ())
     return;
 
@@ -245,10 +245,10 @@ BobinkNode::handleAttributeWritten (QOpcUa::NodeAttribute attr,
 void
 BobinkNode::handleClientConnectedChanged ()
 {
-  if (!BobinkClient::s_instance)
+  if (!BobinkClient::instance ())
     return;
 
-  if (BobinkClient::s_instance->connected ())
+  if (BobinkClient::instance ()->connected ())
     {
       if (m_componentComplete && isVisible ())
         startMonitoring ();
@@ -262,7 +262,7 @@ BobinkNode::handleClientConnectedChanged ()
 void
 BobinkNode::handleAttributeReadFinished (QOpcUa::NodeAttributes attrs)
 {
-  if (!BobinkClient::s_instance || !m_opcuaNode)
+  if (!BobinkClient::instance () || !m_opcuaNode)
     return;
 
   for (int bit = 0; bit < 27; ++bit)
@@ -274,12 +274,12 @@ BobinkNode::handleAttributeReadFinished (QOpcUa::NodeAttributes attrs)
       auto sc = m_opcuaNode->attributeError (attr);
       QLatin1StringView name = nameFromAttribute (attr);
       if (sc == QOpcUa::UaStatusCode::Good)
-        emit BobinkClient::s_instance->statusMessage (
+        emit BobinkClient::instance () -> statusMessage (
             QStringLiteral ("Read %1.%2 = %3")
                 .arg (m_nodeId, name,
                       m_opcuaNode->attribute (attr).toString ()));
       else
-        emit BobinkClient::s_instance->statusMessage (
+        emit BobinkClient::instance () -> statusMessage (
             QStringLiteral ("Read %1.%2 failed: 0x%3")
                 .arg (m_nodeId, name)
                 .arg (static_cast<quint32> (sc), 8, 16, QLatin1Char ('0')));
@@ -290,32 +290,32 @@ void
 BobinkNode::handleEnableMonitoringFinished (QOpcUa::NodeAttribute,
                                             QOpcUa::UaStatusCode statusCode)
 {
-  if (!BobinkClient::s_instance)
+  if (!BobinkClient::instance ())
     return;
 
   if (statusCode == QOpcUa::Good)
-    emit BobinkClient::s_instance->statusMessage (
+    emit BobinkClient::instance () -> statusMessage (
         QStringLiteral ("Monitoring started: %1").arg (m_nodeId));
   else
-    emit BobinkClient::s_instance->statusMessage (
-        QStringLiteral ("Monitoring failed for %1: 0x%2")
-            .arg (m_nodeId)
-            .arg (static_cast<quint32> (statusCode), 8, 16,
-                  QLatin1Char ('0')));
+    emit BobinkClient::instance ()
+        -> statusMessage (QStringLiteral ("Monitoring failed for %1: 0x%2")
+                              .arg (m_nodeId)
+                              .arg (static_cast<quint32> (statusCode), 8, 16,
+                                    QLatin1Char ('0')));
 }
 
 void
 BobinkNode::handleDisableMonitoringFinished (QOpcUa::NodeAttribute,
                                              QOpcUa::UaStatusCode statusCode)
 {
-  if (!BobinkClient::s_instance)
+  if (!BobinkClient::instance ())
     return;
 
   if (statusCode == QOpcUa::Good)
-    emit BobinkClient::s_instance->statusMessage (
+    emit BobinkClient::instance () -> statusMessage (
         QStringLiteral ("Monitoring stopped: %1").arg (m_nodeId));
   else
-    emit BobinkClient::s_instance->statusMessage (
+    emit BobinkClient::instance () -> statusMessage (
         QStringLiteral ("Stop monitoring failed for %1: 0x%2")
             .arg (m_nodeId)
             .arg (static_cast<quint32> (statusCode), 8, 16,