From fc4721139b2a7fb890f50105ea169ca4fa6544ac Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 27 Aug 2009 15:57:17 +0200
Subject: consolidate container typedefs in one file (we had a few dupes)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 inc/CrashTypes.h |  7 ++-----
 inc/abrt_types.h | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 inc/abrt_types.h

(limited to 'inc')

diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h
index 6197503..e5001f6 100644
--- a/inc/CrashTypes.h
+++ b/inc/CrashTypes.h
@@ -1,9 +1,7 @@
 #ifndef CRASHTYPES_H_
 #define CRASHTYPES_H_
 
-#include <string>
-#include <map>
-#include <vector>
+#include "abrt_types.h"
 
 // SYS - system value, should not be displayed
 // BIN - binary value, should be displayed as a path to binary file
@@ -39,8 +37,7 @@
 #define CD_MWUUID       "_MWUUID"
 #define CD_MWDDD        "_MWDDD"
 
-// now, size of a vecor is always 3 -> <type, editable, content>
-typedef std::vector<std::string> vector_strings_t;
+// currently, vector always has exactly 3 elements -> <type, editable, content>
 // <key, data>
 typedef std::map<std::string, vector_strings_t> map_crash_data_t;
 
diff --git a/inc/abrt_types.h b/inc/abrt_types.h
new file mode 100644
index 0000000..76d0327
--- /dev/null
+++ b/inc/abrt_types.h
@@ -0,0 +1,42 @@
+/*
+    Copyright (C) 2009  Denys Vlasenko (dvlasenk@redhat.com)
+    Copyright (C) 2009  RedHat inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    */
+
+#ifndef ABRT_TYPES_H_
+#define ABRT_TYPES_H_
+
+#include <map>
+#include <set>
+#include <vector>
+#include <string>
+
+typedef std::vector<std::string> vector_strings_t;
+typedef std::set<std::string> set_strings_t;
+typedef std::pair<std::string, std::string> pair_string_string_t;
+typedef std::map<std::string, std::string> map_string_string_t;
+
+typedef std::vector<pair_string_string_t> vector_pair_string_string_t;
+typedef std::vector<map_string_string_t> vector_map_string_string_t;
+typedef std::map<std::string, vector_pair_string_string_t> map_vector_pair_string_string_t;
+
+/* Report() method return type */
+typedef std::map<std::string, vector_strings_t> report_status_t;
+/* Holds result of .conf file parsing */
+typedef std::map<std::string, std::string> map_plugin_settings_t;
+
+#endif
-- 
cgit