replace old project name by new one

7 files changed, 45 insertions, 45 deletions

diff --git a/lib/MiddleWare/ABRTPlugin.cpp b/lib/MiddleWare/ABRTPlugin.cpp
index 04ff3a82..788d5c9e 100644
--- a/lib/MiddleWare/ABRTPlugin.cpp
+++ b/lib/MiddleWare/ABRTPlugin.cpp
@@ -1,5 +1,5 @@
 /*
-    CrashCatcherPlugin.cpp
+    ABRTPlugin.cpp
 
     Copyright (C) 2009  Zdenek Prikryl (zprikryl@redhat.com)
     Copyright (C) 2009  RedHat inc.
@@ -19,9 +19,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-#include "CrashCatcherPlugin.h"
+#include "ABRTPlugin.h"
 
-CCrashCatcherPlugin::CCrashCatcherPlugin(const std::string& pLibPath) :
+CABRTPlugin::CABRTPlugin(const std::string& pLibPath) :
     m_pDynamicLibrary(NULL),
     m_pPluginInfo(NULL),
     m_pFnPluginNew(NULL)
@@ -42,7 +42,7 @@ CCrashCatcherPlugin::CCrashCatcherPlugin(const std::string& pLibPath) :
     }
 }
 
-CCrashCatcherPlugin::~CCrashCatcherPlugin()
+CABRTPlugin::~CABRTPlugin()
 {
     if (m_pDynamicLibrary != NULL)
     {
@@ -50,42 +50,42 @@ CCrashCatcherPlugin::~CCrashCatcherPlugin()
     }
 }
 
-const std::string& CCrashCatcherPlugin::GetVersion()
+const std::string& CABRTPlugin::GetVersion()
 {
     return m_pPluginInfo->m_sVersion;
 }
 
-const int CCrashCatcherPlugin::GetMagicNumber()
+const int CABRTPlugin::GetMagicNumber()
 {
     return m_pPluginInfo->m_nMagicNumber;
 }
 
-const std::string& CCrashCatcherPlugin::GetName()
+const std::string& CABRTPlugin::GetName()
 {
     return m_pPluginInfo->m_sName;
 }
 
-const std::string& CCrashCatcherPlugin::GetDescription()
+const std::string& CABRTPlugin::GetDescription()
 {
     return m_pPluginInfo->m_sDescription;
 }
 
-const std::string& CCrashCatcherPlugin::GetEmail()
+const std::string& CABRTPlugin::GetEmail()
 {
     return m_pPluginInfo->m_sEmail;
 }
 
-const std::string& CCrashCatcherPlugin::GetWWW()
+const std::string& CABRTPlugin::GetWWW()
 {
     return m_pPluginInfo->m_sWWW;
 }
 
-const plugin_type_t CCrashCatcherPlugin::GetType()
+const plugin_type_t CABRTPlugin::GetType()
 {
     return m_pPluginInfo->m_Type;
 }
 
-CPlugin* CCrashCatcherPlugin::PluginNew()
+CPlugin* CABRTPlugin::PluginNew()
 {
     return m_pFnPluginNew();
 }
diff --git a/lib/MiddleWare/ABRTPlugin.h b/lib/MiddleWare/ABRTPlugin.h
index 43e59af9..0bf078bf 100644
--- a/lib/MiddleWare/ABRTPlugin.h
+++ b/lib/MiddleWare/ABRTPlugin.h
@@ -1,5 +1,5 @@
 /*
-    CrashCatcherPlugin.h - header file for CrashCatcher plugin. It takes care
+    ABRTPlugin.h - header file for abrt plugin. It takes care
                            of reporting thinks which has loaded plugin.
 
     Copyright (C) 2009  Zdenek Prikryl (zprikryl@redhat.com)
@@ -21,14 +21,14 @@
     */
 
 
-#ifndef CRASHCATCHERPLUGIN_H_
-#define CRASHCATCHERPLUGIN_H_
+#ifndef ABRTPLUGIN_H_
+#define ABRTPLUGIN_H_
 
 #include <string>
 #include "DynamicLibrary.h"
 #include "Plugin.h"
 
-class CCrashCatcherPlugin
+class CABRTPlugin
 {
     private:
 
@@ -40,8 +40,8 @@ class CCrashCatcherPlugin
         p_fn_plugin_new_t m_pFnPluginNew;
 
     public:
-        CCrashCatcherPlugin(const std::string& pLibPath);
-        ~CCrashCatcherPlugin();
+        CABRTPlugin(const std::string& pLibPath);
+        ~CABRTPlugin();
 
         const std::string& GetVersion();
         const int GetMagicNumber();
@@ -54,4 +54,4 @@ class CCrashCatcherPlugin
         CPlugin* PluginNew();
 };
 
-#endif /*CRASHCATCHERPLUGIN_H_*/
+#endif /*ABRTPLUGIN_H_*/
diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am
index ee292376..d1eb98b6 100644
--- a/lib/MiddleWare/Makefile.am
+++ b/lib/MiddleWare/Makefile.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libMiddleWare.la
 libMiddleWare_la_SOURCES = MiddleWare.cpp MiddleWare.h PluginManager.cpp \
-                           PluginManager.h CrashCatcherPlugin.cpp \
-                           CrashCatcherPlugin.h DynamicLibrary.cpp \
+                           PluginManager.h ABRTPlugin.cpp \
+                           ABRTPlugin.h DynamicLibrary.cpp \
                            DynamicLibrary.h Settings.h Settings.cpp \
                            RPMInfo.cpp RPMInfo.h Plugin.h CrashTypes.h \
                            MiddleWareTypes.h Application.h Database.h \
diff --git a/lib/MiddleWare/PluginManager.cpp b/lib/MiddleWare/PluginManager.cpp
index 08cd1136..7d8eb4ef 100644
--- a/lib/MiddleWare/PluginManager.cpp
+++ b/lib/MiddleWare/PluginManager.cpp
@@ -60,8 +60,8 @@ void CPluginManager::LoadPlugins()
 
 void CPluginManager::UnLoadPlugins()
 {
-    map_crash_catcher_plugins_t::iterator it_p;
-      while ((it_p = m_mapCrashCatcherPlugins.begin()) != m_mapCrashCatcherPlugins.end())
+    map_abrt_plugins_t::iterator it_p;
+      while ((it_p = m_mapABRTPlugins.begin()) != m_mapABRTPlugins.end())
       {
           std::string pluginName = it_p->first;
           UnLoadPlugin(pluginName);
@@ -70,26 +70,26 @@ void CPluginManager::UnLoadPlugins()
 
 void CPluginManager::LoadPlugin(const std::string& pName)
 {
-	if (m_mapCrashCatcherPlugins.find(pName) == m_mapCrashCatcherPlugins.end())
+	if (m_mapABRTPlugins.find(pName) == m_mapABRTPlugins.end())
 	{
-		CCrashCatcherPlugin* crashCatcherPlugin = NULL;
+		CABRTPlugin* abrtPlugin = NULL;
 		try
 		{
 			std::string libPath = m_sPlugisLibDir + "/lib" + pName + "." + PLUGINS_LIB_EXTENSIONS;
-			crashCatcherPlugin = new CCrashCatcherPlugin(libPath);
-			if (crashCatcherPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER ||
-			    (crashCatcherPlugin->GetType() < LANGUAGE && crashCatcherPlugin->GetType() > DATABASE))
+			abrtPlugin = new CABRTPlugin(libPath);
+			if (abrtPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER ||
+			    (abrtPlugin->GetType() < LANGUAGE && abrtPlugin->GetType() > DATABASE))
 			{
 				throw std::string("non-compatible plugin");
 			}
-			std::cerr << "Plugin " << pName << " (" << crashCatcherPlugin->GetVersion() << ") " << "succesfully loaded." << std::endl;
-			m_mapCrashCatcherPlugins[pName] = crashCatcherPlugin;
+			std::cerr << "Plugin " << pName << " (" << abrtPlugin->GetVersion() << ") " << "succesfully loaded." << std::endl;
+			m_mapABRTPlugins[pName] = abrtPlugin;
 		}
 		catch (std::string sError)
 		{
-			if (crashCatcherPlugin != NULL)
+			if (abrtPlugin != NULL)
 			{
-				delete crashCatcherPlugin;
+				delete abrtPlugin;
 			}
 			std::cerr << "Failed to load plugin " << pName << " (" << sError << ")." << std::endl;
 		}
@@ -98,11 +98,11 @@ void CPluginManager::LoadPlugin(const std::string& pName)
 
 void CPluginManager::UnLoadPlugin(const std::string& pName)
 {
-	if (m_mapCrashCatcherPlugins.find(pName) != m_mapCrashCatcherPlugins.end())
+	if (m_mapABRTPlugins.find(pName) != m_mapABRTPlugins.end())
 	{
 		UnRegisterPlugin(pName);
-		delete m_mapCrashCatcherPlugins[pName];
-		m_mapCrashCatcherPlugins.erase(pName);
+		delete m_mapABRTPlugins[pName];
+		m_mapABRTPlugins.erase(pName);
 		std::cerr << "Plugin " << pName << " sucessfully unloaded." << std::endl;
 	}
 }
@@ -110,19 +110,19 @@ void CPluginManager::UnLoadPlugin(const std::string& pName)
 
 void CPluginManager::RegisterPlugin(const std::string& pName)
 {
-    if (m_mapCrashCatcherPlugins.find(pName) != m_mapCrashCatcherPlugins.end())
+    if (m_mapABRTPlugins.find(pName) != m_mapABRTPlugins.end())
     {
         if (m_mapPlugins.find(pName) == m_mapPlugins.end())
         {
             map_settings_t settings;
             std::string path = m_sPlugisConfDir + "/" + pName + "." + PLUGINS_CONF_EXTENSION;
             load_settings(path, settings);
-            CPlugin* plugin = m_mapCrashCatcherPlugins[pName]->PluginNew();
+            CPlugin* plugin = m_mapABRTPlugins[pName]->PluginNew();
             plugin->Init();
             plugin->SetSettings(settings);
             m_mapPlugins[pName] = plugin;
             std::cerr << "Registred plugin " << pName << "("
-                      << plugin_type_str_t[m_mapCrashCatcherPlugins[pName]->GetType()]
+                      << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]
                       << ")" << std::endl;
         }
     }
@@ -130,7 +130,7 @@ void CPluginManager::RegisterPlugin(const std::string& pName)
 
 void CPluginManager::UnRegisterPlugin(const std::string& pName)
 {
-    if (m_mapCrashCatcherPlugins.find(pName) != m_mapCrashCatcherPlugins.end())
+    if (m_mapABRTPlugins.find(pName) != m_mapABRTPlugins.end())
     {
         if (m_mapPlugins.find(pName) != m_mapPlugins.end())
         {
@@ -138,7 +138,7 @@ void CPluginManager::UnRegisterPlugin(const std::string& pName)
             delete m_mapPlugins[pName];
             m_mapPlugins.erase(pName);
             std::cerr << "UnRegistred plugin " << pName << "("
-                      << plugin_type_str_t[m_mapCrashCatcherPlugins[pName]->GetType()]
+                      << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]
                       << ")" << std::endl;
         }
     }
diff --git a/lib/MiddleWare/PluginManager.h b/lib/MiddleWare/PluginManager.h
index c064c0c2..9f5979a1 100644
--- a/lib/MiddleWare/PluginManager.h
+++ b/lib/MiddleWare/PluginManager.h
@@ -25,7 +25,7 @@
 
 #include <map>
 #include <string>
-#include "CrashCatcherPlugin.h"
+#include "ABRTPlugin.h"
 #include "Plugin.h"
 #include "Language.h"
 #include "Reporter.h"
@@ -35,11 +35,11 @@
 class CPluginManager
 {
 	private:
-		typedef std::map<std::string, CCrashCatcherPlugin*> map_crash_catcher_plugins_t;
+		typedef std::map<std::string, CABRTPlugin*> map_abrt_plugins_t;
 		typedef std::map<std::string, CPlugin*> map_plugins_t;
 
 
-		map_crash_catcher_plugins_t m_mapCrashCatcherPlugins;
+		map_abrt_plugins_t m_mapABRTPlugins;
 		map_plugins_t m_mapPlugins;
 
 		std::string m_sPlugisConfDir;
diff --git a/lib/MiddleWare/Settings.cpp b/lib/MiddleWare/Settings.cpp
index 92e22eab..65b7f16c 100644
--- a/lib/MiddleWare/Settings.cpp
+++ b/lib/MiddleWare/Settings.cpp
@@ -85,7 +85,7 @@ void save_settings(const std::string& path, const map_settings_t& settings)
     fOut.open(path.c_str());
     if (fOut.is_open())
     {
-        fOut << "# !DO NOT EDIT THIS FILE BY HAND. IT IS GENERATED BY CRASHCATCHER!" << std::endl;
+        fOut << "# !DO NOT EDIT THIS FILE BY HAND. IT IS GENERATED BY ABRT!" << std::endl;
         for (it = settings.begin(); it != settings.end(); it++)
         {
             fOut << it->first << " = " << it->second << std::endl << std::endl;
diff --git a/lib/MiddleWare/test.cpp b/lib/MiddleWare/test.cpp
index e21da3a2..e5c9b38a 100644
--- a/lib/MiddleWare/test.cpp
+++ b/lib/MiddleWare/test.cpp
@@ -35,7 +35,7 @@ int main(int argc, char** argv)
     {
         CMiddleWare middleWare(PLUGINS_CONF_DIR,
                                PLUGINS_LIB_DIR,
-                               std::string(CONF_DIR) + "/crash-catcher.conf");
+                               std::string(CONF_DIR) + "/abrt.conf");
         /* Create DebugDump */
         CDebugDump dd;
         char pid[100];