hardcode CPluginManager constructor's parameters, they are constant

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 7 insertions, 21 deletions

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 56c65d9..d5b4b2c 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -596,7 +596,7 @@ int main(int argc, char** argv)
         /* (comment here) */
         g_pMainloop = g_main_loop_new(NULL, FALSE);
         /* (comment here) */
-        g_pPluginManager = new CPluginManager(PLUGINS_CONF_DIR, PLUGINS_LIB_DIR);
+        g_pPluginManager = new CPluginManager();
         g_pPluginManager->LoadPlugins();
         SetUpMW();
         SetUpCron();
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp
index d63d976..de3ca9a 100644
--- a/src/Daemon/PluginManager.cpp
+++ b/src/Daemon/PluginManager.cpp
@@ -41,12 +41,7 @@ static const char* const plugin_type_str_t[] = {
 };
 
 
-CPluginManager::CPluginManager(
-        const std::string& pPluginsConfDir,
-        const std::string& pPluginsLibDir)
-:
-    m_sPluginsConfDir(pPluginsConfDir),
-    m_sPluginsLibDir(pPluginsLibDir)
+CPluginManager::CPluginManager()
 {}
 
 CPluginManager::~CPluginManager()
@@ -54,10 +49,10 @@ CPluginManager::~CPluginManager()
 
 void CPluginManager::LoadPlugins()
 {
-    DIR *dir = opendir(m_sPluginsLibDir.c_str());
-    struct dirent *dent = NULL;
+    DIR *dir = opendir(PLUGINS_LIB_DIR);
     if (dir != NULL)
     {
+        struct dirent *dent;
         while ((dent = readdir(dir)) != NULL)
         {
             // FIXME: need to handle DT_UNKNOWN too
@@ -94,7 +89,7 @@ void CPluginManager::LoadPlugin(const std::string& pName)
         CABRTPlugin* abrtPlugin = NULL;
         try
         {
-            std::string libPath = m_sPluginsLibDir + "/" + PLUGINS_LIB_PREFIX + pName + "." + PLUGINS_LIB_EXTENSION;
+            std::string libPath = PLUGINS_LIB_DIR"/"PLUGINS_LIB_PREFIX + pName + "."PLUGINS_LIB_EXTENSION;
             abrtPlugin = new CABRTPlugin(libPath.c_str());
             if (abrtPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER ||
                 (abrtPlugin->GetType() < ANALYZER && abrtPlugin->GetType() > DATABASE))
@@ -136,7 +131,7 @@ void CPluginManager::RegisterPlugin(const std::string& pName)
             CPlugin* plugin = m_mapABRTPlugins[pName]->PluginNew();
             map_plugin_settings_t pluginSettings;
 
-            LoadPluginSettings(m_sPluginsConfDir + "/" + pName + "." + PLUGINS_CONF_EXTENSION, pluginSettings);
+            LoadPluginSettings(PLUGINS_CONF_DIR"/" + pName + "."PLUGINS_CONF_EXTENSION, pluginSettings);
             try
             {
                 plugin->Init();
diff --git a/src/Daemon/PluginManager.h b/src/Daemon/PluginManager.h
index 47487d6..5ec616c 100644
--- a/src/Daemon/PluginManager.h
+++ b/src/Daemon/PluginManager.h
@@ -52,14 +52,6 @@ class CPluginManager
          * Registered plugins. A key is a plugin name.
          */
         map_plugins_t m_mapPlugins;
-        /**
-         * Plugins configuration directory (e.g. /etc/abrt/plugins, ...).
-         */
-        std::string m_sPluginsConfDir;
-        /**
-         * Plugins library directory (e.g. /usr/lib/abrt/plugins, ...).
-         */
-        std::string m_sPluginsLibDir;
 
     public:
         /**
@@ -67,8 +59,7 @@ class CPluginManager
          * @param pPluginsConfDir A plugins configuration directory.
          * @param pPluginsLibDir A plugins library directory.
          */
-        CPluginManager(const std::string& pPluginsConfDir,
-                                           const std::string& pPluginsLibDir);
+        CPluginManager();
         /**
          * A destructor.
          */