From aa361b5b0d95c7023b272c2c423af9d71c930787 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 20 Aug 2016 13:29:56 +0300 Subject: [PATCH 1/1] Post-merge fixes. --- projects/stargazer/settings_impl.cpp | 39 ---------------------------- projects/stargazer/settings_impl.h | 2 -- 2 files changed, 41 deletions(-) diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp index 8c728fdc..f7994149 100644 --- a/projects/stargazer/settings_impl.cpp +++ b/projects/stargazer/settings_impl.cpp @@ -185,45 +185,6 @@ SETTINGS_IMPL & SETTINGS_IMPL::operator=(const SETTINGS_IMPL & rhs) return *this; } //----------------------------------------------------------------------------- -int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector * params) -{ -const DOTCONFDocumentNode * childNode; -PARAM_VALUE pv; -const char * value; - -pv.param = node->getName(); - -if (node->getValue(1)) - { - strError = "Unexpected value \'" + std::string(node->getValue(1)) + "\'."; - return -1; - } - -value = node->getValue(0); - -if (!value) - { - strError = "Module name expected."; - return -1; - } - -childNode = node->getChildNode(); -while (childNode) - { - pv.param = childNode->getName(); - int i = 0; - while ((value = childNode->getValue(i++)) != NULL) - { - pv.value.push_back(value); - } - params->push_back(pv); - pv.value.clear(); - childNode = childNode->getNextNode(); - } - -return 0; -} -//----------------------------------------------------------------------------- void SETTINGS_IMPL::ErrorCallback(void * data, const char * buf) { printfd(__FILE__, "SETTINGS_IMPL::ErrorCallback() - %s\n", buf); diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h index 68fb9b0d..418777d5 100644 --- a/projects/stargazer/settings_impl.h +++ b/projects/stargazer/settings_impl.h @@ -85,8 +85,6 @@ public: { return modulesSettings; } const std::vector & GetScriptParams() const { return scriptParams; } - int ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector * params); - private: static void ErrorCallback(void * data, const char * buf); -- 2.44.2