Fix some cache issues

Author: serhmarch

src/client/gui/dialogs/client_dialogport.cpp

@@ -29,17 +29,6 @@
 #include <project/client_port.h>
 
 
-mbClientDialogPort::Strings::Strings() :
-    cachePrefix(QStringLiteral("Client.Ui.Dialogs.Port."))
-{
-}
-
-const mbClientDialogPort::Strings &mbClientDialogPort::Strings::instance()
-{
-    static const Strings s;
-    return s;
-}
-
 mbClientDialogPort::mbClientDialogPort(QWidget *parent) :
     mbCoreDialogPort(parent),
     ui(new Ui::mbClientDialogPort)

src/client/gui/dialogs/client_dialogport.h

@@ -33,13 +33,6 @@ class mbClientDialogPort : public mbCoreDialogPort
 {
     Q_OBJECT
 
-    struct Strings : public mbCoreDialogPort::Strings
-    {
-        const QString cachePrefix;
-        Strings();
-        static const Strings &instance();
-    };
-
 public:
     explicit mbClientDialogPort(QWidget *parent = nullptr);
     ~mbClientDialogPort();

src/core/project/core_device.cpp

@@ -75,17 +75,17 @@ mbCoreDevice::mbCoreDevice(QObject *parent)
 
     m_project = nullptr;
 
-    m_settingsCore.maxReadCoils                 = d.maxReadCoils           ;
-    m_settingsCore.maxReadDiscreteInputs        = d.maxReadDiscreteInputs  ;
-    m_settingsCore.maxReadHoldingRegisters      = d.maxReadHoldingRegisters;
-    m_settingsCore.maxReadInputRegisters        = d.maxReadInputRegisters  ;
-    m_settingsCore.maxWriteMultipleCoils        = d.maxReadHoldingRegisters;
-    m_settingsCore.maxWriteMultipleRegisters    = d.maxReadInputRegisters  ;
-    m_settingsCore.registerOrder                = d.registerOrder          ;
-    m_settingsCore.byteArrayFormat              = d.byteArrayFormat        ;
-    m_settingsCore.byteArraySeparator           = d.byteArraySeparator     ;
-    m_settingsCore.stringLengthType             = d.stringLengthType       ;
-    m_settingsCore.stringEncoding               = d.stringEncoding         ;
+    m_settingsCore.maxReadCoils                 = d.maxReadCoils             ;
+    m_settingsCore.maxReadDiscreteInputs        = d.maxReadDiscreteInputs    ;
+    m_settingsCore.maxReadHoldingRegisters      = d.maxReadHoldingRegisters  ;
+    m_settingsCore.maxReadInputRegisters        = d.maxReadInputRegisters    ;
+    m_settingsCore.maxWriteMultipleCoils        = d.maxWriteMultipleCoils    ;
+    m_settingsCore.maxWriteMultipleRegisters    = d.maxWriteMultipleRegisters;
+    m_settingsCore.registerOrder                = d.registerOrder            ;
+    m_settingsCore.byteArrayFormat              = d.byteArrayFormat          ;
+    m_settingsCore.byteArraySeparator           = d.byteArraySeparator       ;
+    m_settingsCore.stringLengthType             = d.stringLengthType         ;
+    m_settingsCore.stringEncoding               = d.stringEncoding           ;
 }
 
 void mbCoreDevice::setProjectCore(mbCoreProject *project)

src/server/gui/server_ui.cpp

@@ -54,7 +54,7 @@
 #include "actions/server_actionsui.h"
 
 mbServerUi::Strings::Strings() :
-    settings_format(QStringLiteral("Server.Ui.Format"))
+    cacheFormat(QStringLiteral("Ui.format"))
 {
 }
 
@@ -65,7 +65,7 @@ const mbServerUi::Strings &mbServerUi::Strings::instance()
 }
 
 mbServerUi::Defaults::Defaults() :
-    settings_format(mb::Dec)
+    cacheFormat(mb::Dec)
 {
 }
 
@@ -82,7 +82,7 @@ mbServerUi::mbServerUi(mbServer *core, QWidget *parent) :
 {
     ui->setupUi(this);
 
-    m_format = mbServerUi::Defaults::instance().settings_format;
+    m_format = mbServerUi::Defaults::instance().cacheFormat;
     m_projectUi = nullptr;
     m_actionsUi = nullptr;
     m_dockActions = nullptr;
@@ -277,7 +277,7 @@ MBSETTINGS mbServerUi::cachedSettings() const
 {
     const Strings &s = Strings::instance();
     MBSETTINGS r = mbCoreUi::cachedSettings();
-    r[s.settings_format] = mb::enumDigitalFormatKey(format());
+    r[s.cacheFormat] = mb::enumDigitalFormatKey(format());
     return r;
 }
 
@@ -289,7 +289,7 @@ void mbServerUi::setCachedSettings(const MBSETTINGS &settings)
     MBSETTINGS::const_iterator end = settings.end();
     bool ok;
 
-    it = settings.find(s.settings_format);
+    it = settings.find(s.cacheFormat);
     if (it != end)
     {
         mb::DigitalFormat v = mb::enumDigitalFormatValue(it.value(), &ok);

src/server/gui/server_ui.h

@@ -60,14 +60,14 @@ class mbServerUi : public mbCoreUi
 public:
     struct Strings : public mbCoreUi::Strings
     {
-        const QString settings_format;
+        const QString cacheFormat;
         Strings();
         static const Strings &instance();
     };
 
     struct Defaults : public mbCoreUi::Defaults
     {
-        mb::DigitalFormat settings_format;
+        mb::DigitalFormat cacheFormat;
         Defaults();
         static const Defaults &instance();
     };