style cleanups in preparation for PluginManager move

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

2 files changed, 77 insertions, 73 deletions

diff --git a/lib/MiddleWare/PluginManager.cpp b/lib/MiddleWare/PluginManager.cpp
index 81207f94..7224c4e9 100644
--- a/lib/MiddleWare/PluginManager.cpp
+++ b/lib/MiddleWare/PluginManager.cpp
@@ -28,9 +28,14 @@
 #include <sys/types.h>
 
 /**
- * Text reprezentation of plugin types.
+ * Text representation of plugin types.
  */
-static const char* const plugin_type_str_t[] = { "Analyzer", "Action", "Reporter", "Database" };
+static const char* const plugin_type_str_t[] = {
+    "Analyzer",
+    "Action",
+    "Reporter",
+    "Database"
+};
 
 
 CPluginManager::CPluginManager(
@@ -52,10 +57,11 @@ void CPluginManager::LoadPlugins()
     {
         while ((dent = readdir(dir)) != NULL)
         {
+            // FIXME: need to handle DT_UNKNOWN too
             if (dent->d_type == DT_REG)
             {
                 std::string name = dent->d_name;
-                std::string extension = name.substr(name.length()-sizeof(PLUGINS_LIB_EXTENSION)+1);
+                std::string extension = name.substr(name.length() - sizeof(PLUGINS_LIB_EXTENSION) + 1);
                 if (extension == PLUGINS_LIB_EXTENSION)
                 {
                     name.erase(0, sizeof(PLUGINS_LIB_PREFIX) - 1);
@@ -71,11 +77,11 @@ void CPluginManager::LoadPlugins()
 void CPluginManager::UnLoadPlugins()
 {
     map_abrt_plugins_t::iterator it_p;
-      while ((it_p = m_mapABRTPlugins.begin()) != m_mapABRTPlugins.end())
-      {
-          std::string pluginName = it_p->first;
-          UnLoadPlugin(pluginName);
-      }
+    while ((it_p = m_mapABRTPlugins.begin()) != m_mapABRTPlugins.end())
+    {
+        std::string pluginName = it_p->first;
+        UnLoadPlugin(pluginName);
+    }
 }
 
 void CPluginManager::LoadPlugin(const std::string& pName)
@@ -118,7 +124,6 @@ void CPluginManager::UnLoadPlugin(const std::string& pName)
     }
 }
 
-
 void CPluginManager::RegisterPlugin(const std::string& pName)
 {
     if (m_mapABRTPlugins.find(pName) != m_mapABRTPlugins.end())
@@ -252,7 +257,6 @@ vector_map_string_string_t CPluginManager::GetPluginsInfo()
         plugin_info["WWW"] = it_abrt_plugin->second->GetWWW();
         plugin_info["GTKBuilder"] = it_abrt_plugin->second->GetGTKBuilder();
         ret.push_back(plugin_info);
-
     }
     return ret;
 }
diff --git a/lib/MiddleWare/PluginManager.h b/lib/MiddleWare/PluginManager.h
index 0be90d41..53ec77c9 100644
--- a/lib/MiddleWare/PluginManager.h
+++ b/lib/MiddleWare/PluginManager.h
@@ -40,61 +40,61 @@
  */
 class CPluginManager
 {
-	private:
-		typedef std::map<std::string, CABRTPlugin*> map_abrt_plugins_t;
-		typedef std::map<std::string, CPlugin*> map_plugins_t;
+    private:
+        typedef std::map<std::string, CABRTPlugin*> map_abrt_plugins_t;
+        typedef std::map<std::string, CPlugin*> map_plugins_t;
 
-		/**
-		 * Loaded plugins. A key is a plugin name.
-		 */
-		map_abrt_plugins_t m_mapABRTPlugins;
-		/**
-		 * 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;
+        /**
+         * Loaded plugins. A key is a plugin name.
+         */
+        map_abrt_plugins_t m_mapABRTPlugins;
+        /**
+         * 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:
-	    /**
-	     * A constructor.
-	     * @param pPluginsConfDir A plugins configuration directory.
-	     * @param pPluginsLibDir A plugins library directory.
-	     */
-		CPluginManager(const std::string& pPluginsConfDir,
-					   const std::string& pPluginsLibDir);
-		/**
-		 * A destructor.
-		 */
-		~CPluginManager();
-		/**
-		 * A method, which loads all plugins in plugins library direcotry.
-		 */
-		void LoadPlugins();
-		/**
-		 * A method, which unregister and unload all loaded plugins.
-		 */
-		void UnLoadPlugins();
-		/**
-		 * A method, which loads particular plugin.
-		 * @param pName A plugin name.
-		 */
-		void LoadPlugin(const std::string& pName);
-		/**
-		 * A method, which unloads particular plugin.
-		 * @param pName A plugin name.
-		 */
-		void UnLoadPlugin(const std::string& pName);
-		/**
-		 * A method, which registers particular plugin.
-		 * @param pName A plugin name.
-		 */
+    public:
+        /**
+         * A constructor.
+         * @param pPluginsConfDir A plugins configuration directory.
+         * @param pPluginsLibDir A plugins library directory.
+         */
+        CPluginManager(const std::string& pPluginsConfDir,
+                                           const std::string& pPluginsLibDir);
+        /**
+         * A destructor.
+         */
+        ~CPluginManager();
+        /**
+         * A method, which loads all plugins in plugins library direcotry.
+         */
+        void LoadPlugins();
+        /**
+         * A method, which unregister and unload all loaded plugins.
+         */
+        void UnLoadPlugins();
+        /**
+         * A method, which loads particular plugin.
+         * @param pName A plugin name.
+         */
+        void LoadPlugin(const std::string& pName);
+        /**
+         * A method, which unloads particular plugin.
+         * @param pName A plugin name.
+         */
+        void UnLoadPlugin(const std::string& pName);
+        /**
+         * A method, which registers particular plugin.
+         * @param pName A plugin name.
+         */
         void RegisterPlugin(const std::string& pName);
         /**
          * A method, which unregister particular plugin.
@@ -106,31 +106,31 @@ class CPluginManager
          * @param pName A plugin name.
          * @return An analyzer plugin.
          */
-		CAnalyzer* GetAnalyzer(const std::string& pName);
+        CAnalyzer* GetAnalyzer(const std::string& pName);
         /**
          * A method, which returns instance of particular reporter plugin.
          * @param pName A plugin name.
          * @return A reporter plugin.
          */
-		CReporter* GetReporter(const std::string& pName);
+        CReporter* GetReporter(const std::string& pName);
         /**
          * A method, which returns instance of particular action plugin.
          * @param pName A plugin name.
          * @return An action plugin.
          */
-		CAction* GetAction(const std::string& pName);
+        CAction* GetAction(const std::string& pName);
         /**
          * A method, which returns instance of particular database plugin.
          * @param pName A plugin name.
          * @return A database plugin.
          */
-		CDatabase* GetDatabase(const std::string& pName);
-		/**
-		 * A method, which returns type of particular plugin.
-		 * @param pName A plugin name.
-		 * @return A plugin type.
-		 */
-		plugin_type_t GetPluginType(const std::string& pName);
+        CDatabase* GetDatabase(const std::string& pName);
+        /**
+         * A method, which returns type of particular plugin.
+         * @param pName A plugin name.
+         * @return A plugin type.
+         */
+        plugin_type_t GetPluginType(const std::string& pName);
         /**
          * A method, which gets all plugins info (event those plugins which are
          * disabled). It can be send via DBus to GUI and displayed to an user.