From 7004e851172063bb54d9d3251c74f511e45c33b0 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 30 Jul 2019 00:49:17 +0200 Subject: [PATCH] Ref T709, ctor from JSON string --- .../simulation/settings/xswiftbussettingsqtfree.cpp | 5 +++++ .../simulation/settings/xswiftbussettingsqtfree.h | 3 +++ src/xswiftbus/settings.cpp | 3 ++- src/xswiftbus/settings.h | 7 ++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp index 72d67223d..507ef7820 100644 --- a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp +++ b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp @@ -48,6 +48,11 @@ namespace BlackMisc CXSwiftBusSettingsQtFree::CXSwiftBusSettingsQtFree() {} + CXSwiftBusSettingsQtFree::CXSwiftBusSettingsQtFree(const std::string &json) + { + this->parseXSwiftBusString(json); + } + bool CXSwiftBusSettingsQtFree::parseXSwiftBusString(const std::string &json) { if (json.empty()) { return false; } diff --git a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h index 1e6f9a4cb..40fd63edf 100644 --- a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h +++ b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h @@ -27,6 +27,9 @@ namespace BlackMisc //! Constructor. CXSwiftBusSettingsQtFree(); + //! JSON Constructor. + CXSwiftBusSettingsQtFree(const std::string &json); + //! Dtor virtual ~CXSwiftBusSettingsQtFree() {} diff --git a/src/xswiftbus/settings.cpp b/src/xswiftbus/settings.cpp index 22e552733..de074e214 100644 --- a/src/xswiftbus/settings.cpp +++ b/src/xswiftbus/settings.cpp @@ -22,9 +22,10 @@ namespace XSwiftBus // void } - CSettings::~CSettings() + CSettings::CSettings(const std::string &json) : CXSwiftBusSettingsQtFree(json) { // void } + } // ns diff --git a/src/xswiftbus/settings.h b/src/xswiftbus/settings.h index 1c89801f6..a92ae4d78 100644 --- a/src/xswiftbus/settings.h +++ b/src/xswiftbus/settings.h @@ -23,8 +23,13 @@ namespace XSwiftBus //! Constructor. CSettings(); + //! JSON constructor + CSettings(const std::string &json); + //! Destructor; - ~CSettings(); + virtual ~CSettings() {} + }; + }; } // ns