move all FILENAME_xxx defines to inc/CrashTypes.h

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

9 files changed, 6 insertions, 40 deletions

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index ab29fbb..28e6bac 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -40,10 +40,6 @@ using namespace std;
 #define CORE_PATTERN_IFACE      "/proc/sys/kernel/core_pattern"
 #define CORE_PATTERN            "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u %c"
 
-#define FILENAME_COREDUMP       "coredump"
-#define FILENAME_BACKTRACE      "backtrace"
-#define FILENAME_MEMORYMAP      "memorymap"
-
 #define DEBUGINFO_CACHE_DIR     LOCALSTATEDIR"/cache/abrt-di"
 
 CAnalyzerCCpp::CAnalyzerCCpp() :
@@ -233,7 +229,7 @@ static int rate_backtrace(const char *backtrace)
         }
     }
 
-    /* Bogus "backtrace" with zero frames? */
+    /* Bogus 'backtrace' with zero frames? */
     if (best_possible_rating == 0)
         return 0;
 
diff --git a/lib/Plugins/Firefox.cpp b/lib/Plugins/Firefox.cpp
index d980755..e8b12f5 100644
--- a/lib/Plugins/Firefox.cpp
+++ b/lib/Plugins/Firefox.cpp
@@ -36,10 +36,6 @@
 #define CORE_PATTERN_IFACE      "/proc/sys/kernel/core_pattern"
 #define CORE_PATTERN            "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u"
 
-#define FILENAME_COREDUMP       "coredump"
-#define FILENAME_BACKTRACE      "backtrace"
-#define FILENAME_MEMORYMAP      "memorymap"
-
 #define DEBUGINFO_CACHE_DIR     LOCALSTATEDIR"/cache/abrt-di"
 
 CAnalyzerFirefox::CAnalyzerFirefox() :
@@ -227,7 +223,7 @@ static int rate_backtrace(const char *backtrace)
         }
     }
 
-    /* Bogus "backtrace" with zero frames? */
+    /* Bogus 'backtrace' with zero frames? */
     if (best_possible_rating == 0)
         return 0;
 
diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp
index 2e28cf4..bcb7a72 100644
--- a/lib/Plugins/Kerneloops.cpp
+++ b/lib/Plugins/Kerneloops.cpp
@@ -30,8 +30,6 @@
 #include "ABRTException.h"
 #include "CommLayerInner.h"
 
-#define FILENAME_KERNELOOPS  "kerneloops"
-
 std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
 {
 	log(_("Getting local universal unique identification"));
diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp
index 7c48836..18932ae 100644
--- a/lib/Plugins/KerneloopsReporter.cpp
+++ b/lib/Plugins/KerneloopsReporter.cpp
@@ -30,8 +30,6 @@
 #include "CommLayerInner.h"
 #include "ABRTException.h"
 
-#define FILENAME_KERNELOOPS "kerneloops"
-
 /* helpers */
 static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
 {
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp
index 1bb45ab..fe780a0 100644
--- a/lib/Plugins/KerneloopsScanner.cpp
+++ b/lib/Plugins/KerneloopsScanner.cpp
@@ -36,8 +36,6 @@
 
 #include <limits.h>
 
-#define FILENAME_KERNELOOPS  "kerneloops"
-
 // TODO: https://fedorahosted.org/abrt/ticket/78
 
 CKerneloopsScanner::CKerneloopsScanner()
diff --git a/lib/Plugins/Python.cpp b/lib/Plugins/Python.cpp
index 23d6f5c..79247d6 100644
--- a/lib/Plugins/Python.cpp
+++ b/lib/Plugins/Python.cpp
@@ -1,15 +1,14 @@
+#include "abrtlib.h"
 #include "Python.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
 
-#define FILENAME_BACKTRACE      "backtrace"
-
 static std::string CreateHash(const char *pDebugDumpDir)
 {
 	std::string uuid;
 	CDebugDump dd;
 	dd.Open(pDebugDumpDir);
-	dd.LoadText("uuid", uuid);
+	dd.LoadText(FILENAME_UUID, uuid);
 	return uuid;
 }
 
diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp
index e2147e2..77f5d3c 100644
--- a/lib/Plugins/RunApp.cpp
+++ b/lib/Plugins/RunApp.cpp
@@ -19,7 +19,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-
+#include "abrtlib.h"
 #include "RunApp.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
diff --git a/lib/Utils/DebugDump.h b/lib/Utils/DebugDump.h
index d3eebb4..60d3bd3 100644
--- a/lib/Utils/DebugDump.h
+++ b/lib/Utils/DebugDump.h
@@ -24,25 +24,6 @@
 #define DEBUGDUMP_H_
 
 #include <string>
-#include <dirent.h>
-#include <stdint.h>
-
-#define FILENAME_ARCHITECTURE       "architecture"
-#define FILENAME_KERNEL             "kernel"
-#define FILENAME_TIME               "time"
-#define FILENAME_UID                "uid"
-#define FILENAME_PACKAGE            "package"
-#define FILENAME_COMPONENT          "component"
-#define FILENAME_DESCRIPTION        "description"
-#define FILENAME_ANALYZER           "analyzer"
-#define FILENAME_RELEASE            "release"
-#define FILENAME_EXECUTABLE         "executable"
-#define FILENAME_REASON             "reason"
-#define FILENAME_COMMENT            "comment"
-#define FILENAME_REPRODUCE          "reproduce"
-#define FILENAME_RATING             "rating"
-#define FILENAME_CMDLINE            "cmdline"
-
 
 class CDebugDump
 {
diff --git a/lib/Utils/daemon.cpp b/lib/Utils/daemon.cpp
index 0527062..7d60ce3 100644
--- a/lib/Utils/daemon.cpp
+++ b/lib/Utils/daemon.cpp
@@ -16,7 +16,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "abrtlib.h"
-#define FILENAME_CMDLINE        "cmdline"
+
 #define VAR_RUN_PID_FILE        VAR_RUN"/abrt.pid"
 
 static char *append_escaped(char *start, const char *s)