Minor fixes - just to make sources compile.

2 files changed, 12 insertions, 12 deletions

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 9f9b8743..026e15ae 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -171,7 +171,7 @@ static void InstallDebugInfos(const std::string& pPackage)
             close(pipeout[0]);
             kill(child, SIGTERM);
             wait(NULL);
-            throw CABRTException(EXCEP_PLUGIN, string(__func__) + ": cannot install debuginfos for " + pPackage);
+            throw CABRTException(EXCEP_PLUGIN, std::string(__func__) + ": cannot install debuginfos for " + pPackage);
         }
         if (strstr(buff, "Total download size") != NULL)
         {
@@ -182,7 +182,7 @@ static void InstallDebugInfos(const std::string& pPackage)
                 close(pipeout[0]);
                 kill(child, SIGTERM);
                 wait(NULL);
-                throw CABRTException(EXCEP_PLUGIN, string(__func__) + ": cannot install debuginfos for " + pPackage);
+                throw CABRTException(EXCEP_PLUGIN, std::string(__func__) + ": cannot install debuginfos for " + pPackage);
             }
             comm_layer_inner_status("Downloading and installing debug-info packages...");
         }
@@ -362,7 +362,7 @@ static pid_t ExecVP(const char* pCommand, char* const pArgs[], uid_t uid, std::s
     struct passwd* pw = getpwuid(uid);
     if (!pw)
     {
-        throw CABRTException(EXCEP_PLUGIN, string(__func__) + ": cannot get GID for UID.");
+        throw CABRTException(EXCEP_PLUGIN, std::string(__func__) + ": cannot get GID for UID.");
     }
 
     pipe(pipeout);  /* error check? */
@@ -371,7 +371,7 @@ static pid_t ExecVP(const char* pCommand, char* const pArgs[], uid_t uid, std::s
     {
         close(pipeout[0]);
         close(pipeout[1]);
-        throw CABRTException(EXCEP_PLUGIN, string(__func__) + ": fork failed.");
+        throw CABRTException(EXCEP_PLUGIN, std::string(__func__) + ": fork failed.");
     }
     if (child == 0)
     {
diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am
index 740b40f7..7c1ddbb1 100644
--- a/lib/Plugins/Makefile.am
+++ b/lib/Plugins/Makefile.am
@@ -31,7 +31,7 @@ install-data-hook:
 	    $(DESTDIR)$(sysconfdir)/abrt/plugins/Logger.conf
 
 # CCpp
-libCCpp_la_SOURCES = CCpp.cpp CCpp.h PluginSettings.h
+libCCpp_la_SOURCES = CCpp.cpp CCpp.h 
 libCCpp_la_LDFLAGS = -avoid-version
 libCCpp_la_LIBADD = $(NSS_LIBS)
 libCCpp_la_CPPFLAGS =  -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\" -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(NSS_CFLAGS)
@@ -42,29 +42,29 @@ libKerneloops_la_LDFLAGS = -avoid-version
 libKerneloops_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils
 
 # KerneloopsReporter
-libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h PluginSettings.h
+libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h 
 libKerneloopsReporter_la_LDFLAGS = -avoid-version
 libKerneloopsReporter_la_LIBADD = $(CURL_LIBS)
 libKerneloopsReporter_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\"
 
 # KerneloopsScanner
-libKerneloopsScanner_la_SOURCES = KerneloopsScanner.cpp KerneloopsScanner.h KerneloopsSysLog.cpp KerneloopsSysLog.h PluginSettings.h
+libKerneloopsScanner_la_SOURCES = KerneloopsScanner.cpp KerneloopsScanner.h KerneloopsSysLog.cpp KerneloopsSysLog.h 
 libKerneloopsScanner_la_LDFLAGS = -avoid-version
 libKerneloopsScanner_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\"
 
 # Mailx
-libMailx_la_SOURCES = Mailx.cpp Mailx.h PluginSettings.h
+libMailx_la_SOURCES = Mailx.cpp Mailx.h 
 libMailx_la_LDFLAGS = -avoid-version
 libMailx_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\"
 
 # SQLite3
-libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h PluginSettings.h
+libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h 
 libSQLite3_la_LDFLAGS = -avoid-version
 libSQLite3_la_LIBADD = $(SQLITE3_LIBS)
 libSQLite3_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(SQLITE3_CFLAGS) -DLOCALSTATEDIR='"$(localstatedir)"'
 
 # Logger
-libLogger_la_SOURCES = Logger.cpp Logger.h PluginSettings.h
+libLogger_la_SOURCES = Logger.cpp Logger.h 
 libLogger_la_LDFLAGS = -avoid-version
 libLogger_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\"
 
@@ -77,7 +77,7 @@ libSOSreport_la_SOURCES = SOSreport.cpp SOSreport.h
 libSOSreport_la_LDFLAGS = -avoid-version
 
 # Bugzilla
-libBugzilla_la_SOURCES = Bugzilla.h Bugzilla.cpp PluginSettings.h
+libBugzilla_la_SOURCES = Bugzilla.h Bugzilla.cpp 
 libBugzilla_la_LIBADD = $(XMLRPC_CPP_LIBS) $(XMLRPC_CLIENT_CPP_LIBS) $(NSS_LIBS)
 libBugzilla_la_LDFLAGS = -avoid-version
 libBugzilla_la_CPPFLAGS = $(XMLRPC_CPP_CFLAGS) $(XMLRPC_CLIENT_CPP_CFLAGS) $(NSS_CFLAGS) -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\"
@@ -89,7 +89,7 @@ libPython_la_LDFLAGS = -avoid-version
 libPython_la_CPPFLAGS = $(NSS_CFLAGS) -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils
 
 # FileTrasfer
-libFileTransfer_la_SOURCES = FileTransfer.cpp FileTransfer.h PluginSettings.h
+libFileTransfer_la_SOURCES = FileTransfer.cpp FileTransfer.h 
 libFileTransfer_la_LDFLAGS = -avoid-version
 libFileTransfer_la_LIBADD = $(CURL_LIBS)
 libFileTransfer_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(CURL_CFLAGS) -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\"