Post-merge fixes.

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index 8c728fdc9f4d9938dcd68cb77c4861d8a9afb225..f79941495adf40289ab68211f81187d0fd38337f 100644 (file)
--- 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;
 }
 //-----------------------------------------------------------------------------
     return *this;
 }
 //-----------------------------------------------------------------------------

-int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * 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);
 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 68fb9b0de7defa2491da639a429f8384e8d0d0aa..418777d51d5b8fe24e3e18b9c075a51e69347312 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -85,8 +85,6 @@ public:
         { return modulesSettings; }
     const std::vector<std::string> & GetScriptParams() const { return scriptParams; }
 
         { return modulesSettings; }
     const std::vector<std::string> & GetScriptParams() const { return scriptParams; }
 

-    int ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * params);
-

 private:
 
     static void ErrorCallback(void * data, const char * buf);
 private:
 
     static void ErrorCallback(void * data, const char * buf);