consolidate container typedefs in one file (we had a few dupes)

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

5 files changed, 7 insertions, 27 deletions

diff --git a/lib/CommLayer/DBusCommon.h b/lib/CommLayer/DBusCommon.h
index 0addf08f..b3e3af2c 100644
--- a/lib/CommLayer/DBusCommon.h
+++ b/lib/CommLayer/DBusCommon.h
@@ -17,12 +17,13 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
+#ifndef DBUSCOMMON_H_
+#define DBUSCOMMON_H_
+
+#include "CrashTypes.h"
+
 #define CC_DBUS_NAME "com.redhat.abrt"
 #define CC_DBUS_PATH "/com/redhat/abrt"
 #define CC_DBUS_IFACE "com.redhat.abrt"
 
-#include "CrashTypes.h"
-typedef std::map<std::string, std::string> map_string_string_t;
-typedef std::vector<map_string_string_t> vector_map_string_string_t;
-typedef std::map<std::string, std::string> map_plugin_settings_t;
-typedef std::map<std::string, vector_strings_t> report_status_t;
+#endif
diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am
index 1d82d7d3..0db4f79e 100644
--- a/lib/MiddleWare/Makefile.am
+++ b/lib/MiddleWare/Makefile.am
@@ -2,7 +2,6 @@ lib_LTLIBRARIES = libABRTMiddleWare.la
 
 libABRTMiddleWare_la_SOURCES = \
     Plugin.cpp Plugin.h \
-    MiddleWareTypes.h \
     Action.h Database.h Reporter.h Analyzer.h
 libABRTMiddleWare_la_LIBADD = \
     $(DL_LIBS) \
diff --git a/lib/MiddleWare/MiddleWareTypes.h b/lib/MiddleWare/MiddleWareTypes.h
deleted file mode 100644
index a79b12b4..00000000
--- a/lib/MiddleWare/MiddleWareTypes.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MIDDLEWARETYPES_H_
-#define MIDDLEWARETYPES_H_
-
-#include <map>
-#include <set>
-#include <vector>
-#include <string>
-
-typedef std::vector<std::string> vector_strings_t;
-typedef std::pair<std::string, std::string> pair_string_string_t;
-typedef std::vector<pair_string_string_t> vector_pair_string_string_t;
-typedef std::map<std::string, std::string> map_string_string_t;
-typedef std::vector<map_string_string_t> vector_map_string_string_t;
-typedef std::set<std::string> set_strings_t;
-
-#endif /* MIDDLEWARETYPES_H_ */
diff --git a/lib/MiddleWare/Plugin.h b/lib/MiddleWare/Plugin.h
index 638840ff..f3533a1e 100644
--- a/lib/MiddleWare/Plugin.h
+++ b/lib/MiddleWare/Plugin.h
@@ -23,8 +23,7 @@
 #ifndef PLUGIN_H_
 #define PLUGIN_H_
 
-#include <string>
-#include <map>
+#include "abrt_types.h"
 
 #define PLUGINS_MAGIC_NUMBER 6
 
@@ -32,8 +31,6 @@
 #define PLUGINS_LIB_EXTENSION "so"
 #define PLUGINS_LIB_PREFIX "lib"
 
-typedef std::map<std::string, std::string> map_plugin_settings_t;
-
 /**
  * An abstract class. The class defines a common plugin interface. If a plugin
  * has some settings, then a *Settings(*) method has to be written.
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index b7416563..9b10c752 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -426,7 +426,6 @@ I think the below code has absolutely the same effect:
 
 std::string CAnalyzerCCpp::GetLocalUUID(const std::string& pDebugDumpDir)
 {
-///
     update_client("Getting local universal unique identification...");
 
     CDebugDump dd;