moved LoadSettings from plugins into PluginManager

2 files changed, 1 insertions, 70 deletions

diff --git a/lib/MiddleWare/Plugin.cpp b/lib/MiddleWare/Plugin.cpp
index cf2dff6..161ead8 100644
--- a/lib/MiddleWare/Plugin.cpp
+++ b/lib/MiddleWare/Plugin.cpp
@@ -18,72 +18,10 @@
     */
 
 #include "Plugin.h"
-#include <fstream>
 
 /* class CPlugin's virtuals */
 CPlugin::~CPlugin() {}
 void CPlugin::Init() {}
 void CPlugin::DeInit() {}
-void CPlugin::LoadSettings(const std::string& pPath) {}
 void CPlugin::SetSettings(const map_plugin_settings_t& pSettings) {}
 map_plugin_settings_t CPlugin::GetSettings() {return map_plugin_settings_t();}
-
-void plugin_load_settings(const std::string& path, map_plugin_settings_t& settings)
-{
-    std::ifstream fIn;
-    fIn.open(path.c_str());
-    if (fIn.is_open())
-    {
-        std::string line;
-        while (!fIn.eof())
-        {
-            getline(fIn, line);
-
-            int ii;
-            bool is_value = false;
-            bool valid = false;
-            bool in_quote = false;
-            std::string key = "";
-            std::string value = "";
-            for (ii = 0; ii < line.length(); ii++)
-            {
-                if (line[ii] == '\"')
-                {
-                    in_quote = in_quote == true ? false : true;
-                }
-                if (isspace(line[ii]) && !in_quote)
-                {
-                    continue;
-                }
-                if (line[ii] == '#' && !in_quote)
-                {
-                    break;
-                }
-                else if (line[ii] == '=' && !in_quote)
-                {
-                    is_value = true;
-                }
-                else if (line[ii] == '=' && is_value && !in_quote)
-                {
-                    key = "";
-                    value = "";
-                    break;
-                }
-                else if (!is_value)
-                {
-                    key += line[ii];
-                }
-                else
-                {
-                    valid = true;
-                    value += line[ii];
-                }
-            }
-            if (valid && !in_quote)
-            {
-                settings[key] = value;
-            }
-        }
-        fIn.close();
-    }
-}
diff --git a/lib/MiddleWare/Plugin.h b/lib/MiddleWare/Plugin.h
index d615fc8..a0b64ae 100644
--- a/lib/MiddleWare/Plugin.h
+++ b/lib/MiddleWare/Plugin.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <map>
 
-#define PLUGINS_MAGIC_NUMBER 4
+#define PLUGINS_MAGIC_NUMBER 5
 
 #define PLUGINS_CONF_EXTENSION "conf"
 #define PLUGINS_LIB_EXTENSION "so"
@@ -54,11 +54,6 @@ class CPlugin
          */
         virtual void DeInit();
         /**
-         * A method, which loads a plugin settings from a file. It is not mandatory method.
-         * @param pPath A path to plugin configuration file.
-         */
-        virtual void LoadSettings(const std::string& pPath);
-        /**
          * A method, which takes a settings and apply them. It is not a mandatory method.
          * @param pSettings Plugin's settings
          */
@@ -112,6 +107,4 @@ typedef struct SPluginInfo
         PLUGINS_MAGIC_NUMBER,\
     };
 
-void plugin_load_settings(const std::string& path, map_plugin_settings_t& settings);
-
 #endif /* PLUGIN_H_ */