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

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

8 files changed, 31 insertions, 48 deletions

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 1ee5364..4f6065c 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include "abrtlib.h"
 #include "ABRTException.h"
+#include "RPM.h"
 #include "CrashWatcher.h"
 #include "Daemon.h"
 
@@ -156,7 +157,7 @@ static void SetUpMW()
     {
         g_pPluginManager->RegisterPlugin(*it_p);
     }
-    vector_pair_strings_t::iterator it_ar = g_settings_vectorActionsAndReporters.begin();
+    vector_pair_string_string_t::iterator it_ar = g_settings_vectorActionsAndReporters.begin();
     for (; it_ar != g_settings_vectorActionsAndReporters.end(); it_ar++)
     {
         AddActionOrReporter((*it_ar).first, (*it_ar).second);
@@ -164,7 +165,7 @@ static void SetUpMW()
     map_analyzer_actions_and_reporters_t::iterator it_aar = g_settings_mapAnalyzerActionsAndReporters.begin();
     for (; it_aar != g_settings_mapAnalyzerActionsAndReporters.end(); it_aar++)
     {
-        vector_pair_strings_t::iterator it_ar = it_aar->second.begin();
+        vector_pair_string_string_t::iterator it_ar = it_aar->second.begin();
         for (; it_ar != it_aar->second.end(); it_ar++)
         {
             AddAnalyzerActionOrReporter(it_aar->first, (*it_ar).first, (*it_ar).second);
@@ -211,8 +212,8 @@ static int SetUpCron()
 
         if (nS != -1)
         {
-            vector_pair_strings_t::iterator it_ar;
-            for (it_ar = it_c->second.begin(); it_ar != it_c->second.end(); it_ar++)
+            vector_pair_string_string_t::iterator it_ar = it_c->second.begin();
+            for (; it_ar != it_c->second.end(); it_ar++)
             {
                 cron_callback_data_t* cronPeriodicCallbackData = new cron_callback_data_t((*it_ar).first, (*it_ar).second, timeout);
                 g_timeout_add_seconds_full(G_PRIORITY_DEFAULT,
@@ -245,8 +246,8 @@ static int SetUpCron()
             {
                 timeout = nextTime - actTime;
             }
-            vector_pair_strings_t::iterator it_ar;
-            for (it_ar = it_c->second.begin(); it_ar != it_c->second.end(); it_ar++)
+            vector_pair_string_string_t::iterator it_ar = it_c->second.begin();
+            for (; it_ar != it_c->second.end(); it_ar++)
             {
                 cron_callback_data_t* cronOneCallbackData = new cron_callback_data_t((*it_ar).first, (*it_ar).second, timeout);
                 g_timeout_add_seconds_full(G_PRIORITY_DEFAULT,
diff --git a/src/Daemon/Daemon.h b/src/Daemon/Daemon.h
index c47d162..74f4a82 100644
--- a/src/Daemon/Daemon.h
+++ b/src/Daemon/Daemon.h
@@ -21,7 +21,7 @@
 #define DAEMON_H_
 
 #include <pthread.h>
-#include "MiddleWareTypes.h"
+#include "abrt_types.h"
 #include "CrashTypes.h"
 
 class CCrashWatcher;
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 4d4b8c6..308331d 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -22,6 +22,7 @@
 #include "abrtlib.h"
 #include "Daemon.h"
 #include "Settings.h"
+#include "RPM.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
 #include "CommLayerInner.h"
@@ -50,6 +51,7 @@ set_strings_t g_setBlackList;
  * action or reporter plugins. These are activated when a crash, which
  * is maintained by particular analyzer, occurs.
  */
+typedef std::map<std::string, vector_pair_string_string_t> map_analyzer_actions_and_reporters_t;
 static map_analyzer_actions_and_reporters_t s_mapAnalyzerActionsAndReporters;
 /**
  * A vector of one or more action or reporter plugins. These are
@@ -248,8 +250,8 @@ void RunAction(const std::string& pActionDir,
 
 void RunActionsAndReporters(const std::string& pDebugDumpDir)
 {
-    vector_pair_string_string_t::iterator it_ar;
-    for (it_ar = s_vectorActionsAndReporters.begin(); it_ar != s_vectorActionsAndReporters.end(); it_ar++)
+    vector_pair_string_string_t::iterator it_ar = s_vectorActionsAndReporters.begin();
+    for (; it_ar != s_vectorActionsAndReporters.end(); it_ar++)
     {
         try
         {
@@ -402,9 +404,8 @@ static bool IsDebugDumpSaved(const std::string& pUID,
                                    const std::string& pDebugDumpDir)
 {
     CDatabase* database = g_pPluginManager->GetDatabase(g_settings_sDatabase);
-    vector_database_rows_t rows;
     database->Connect();
-    rows = database->GetUIDData(pUID);
+    vector_database_rows_t rows = database->GetUIDData(pUID);
     database->DisConnect();
 
     int ii;
@@ -504,10 +505,8 @@ static void RunAnalyzerActions(const std::string& pAnalyzer, const std::string&
 {
     if (s_mapAnalyzerActionsAndReporters.find(pAnalyzer) != s_mapAnalyzerActionsAndReporters.end())
     {
-        vector_pair_string_string_t::iterator it_a;
-        for (it_a = s_mapAnalyzerActionsAndReporters[pAnalyzer].begin();
-             it_a != s_mapAnalyzerActionsAndReporters[pAnalyzer].end();
-             it_a++)
+        vector_pair_string_string_t::iterator it_a = s_mapAnalyzerActionsAndReporters[pAnalyzer].begin();
+        for (; it_a != s_mapAnalyzerActionsAndReporters[pAnalyzer].end(); it_a++)
         {
             try
             {
diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h
index b781e65..a127c23 100644
--- a/src/Daemon/MiddleWare.h
+++ b/src/Daemon/MiddleWare.h
@@ -23,10 +23,8 @@
 #ifndef MIDDLEWARE_H_
 #define MIDDLEWARE_H_
 
+#include "abrt_types.h"
 #include "PluginManager.h"
-#include "CrashTypes.h"
-#include "MiddleWareTypes.h"
-#include "RPM.h"
 
 /**
  * An enum contains all return codes.
@@ -52,9 +50,6 @@ typedef enum {
     RS_MESSAGE
 } report_status_items_t;
 
-typedef std::map<std::string, vector_strings_t> report_status_t;
-typedef std::map<std::string, vector_pair_string_string_t> map_analyzer_actions_and_reporters_t;
-
 
 /**
  * Takes care of getting all additional data needed
diff --git a/src/Daemon/PluginManager.h b/src/Daemon/PluginManager.h
index 6cf84f3..75a1bb2 100644
--- a/src/Daemon/PluginManager.h
+++ b/src/Daemon/PluginManager.h
@@ -23,15 +23,13 @@
 #ifndef PLUGINMANAGER_H_
 #define PLUGINMANAGER_H_
 
-#include <map>
-#include <string>
+#include "abrt_types.h"
 #include "ABRTPlugin.h"
 #include "Plugin.h"
 #include "Analyzer.h"
 #include "Reporter.h"
 #include "Database.h"
 #include "Action.h"
-#include "MiddleWareTypes.h"
 
 /**
  * A class. It takes care of loading, registering and manipulating with
diff --git a/src/Daemon/RPM.h b/src/Daemon/RPM.h
index 1be0eb1..a7a9d2e 100644
--- a/src/Daemon/RPM.h
+++ b/src/Daemon/RPM.h
@@ -23,11 +23,10 @@
 #ifndef RPM_H_
 #define RPM_H_
 
-#include "MiddleWareTypes.h"
-
 #include <rpm/rpmcli.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmdb.h>
+#include "abrt_types.h"
 
 /**
  * A class. It is used for additional checks of package, which contains
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 468213d..83aad1e 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -18,6 +18,7 @@ vector_pair_string_string_t g_settings_vectorActionsAndReporters;
 map_analyzer_actions_and_reporters_t g_settings_mapAnalyzerActionsAndReporters;
 
 
+typedef std::map<std::string, std::string> map_settings_t;
 static map_settings_t s_mapSettingsCommon;
 static map_settings_t s_mapSettingsAnalyzerActionsAndReporters;
 static map_settings_t s_mapSettingsCron;
@@ -47,9 +48,9 @@ static set_strings_t ParseList(const std::string& pList)
    return set;
 }
 
-static vector_pair_strings_t ParseListWithArgs(const std::string& pValue)
+static vector_pair_string_string_t ParseListWithArgs(const std::string& pValue)
 {
-    vector_pair_strings_t pluginsWithArgs;
+    vector_pair_string_string_t pluginsWithArgs;
     unsigned int ii;
     std::string item = "";
     std::string action = "";
@@ -132,7 +133,7 @@ static void ParseCron()
     map_settings_t::iterator it = s_mapSettingsCron.begin();
     for (; it != s_mapSettingsCron.end(); it++)
     {
-        vector_pair_strings_t actionsAndReporters = ParseListWithArgs(it->second);
+        vector_pair_string_string_t actionsAndReporters = ParseListWithArgs(it->second);
         g_settings_mapCron[it->first] = actionsAndReporters;
     }
 }
@@ -185,7 +186,7 @@ static void ParseAnalyzerActionsAndReporters()
     for (; it != s_mapSettingsAnalyzerActionsAndReporters.end(); it++)
     {
         set_strings_t keys = ParseKey(it->first);
-        vector_pair_strings_t actionsAndReporters = ParseListWithArgs(it->second);
+        vector_pair_string_string_t actionsAndReporters = ParseListWithArgs(it->second);
         set_strings_t::iterator it_keys = keys.begin();
         for (; it_keys != keys.end(); it_keys++)
         {
@@ -288,13 +289,13 @@ void LoadSettings(const char* pPath)
 
 static void SaveSetString(const std::string& pKey, const set_strings_t& pSet, std::ofstream& pFOut, bool pNewLine = true)
 {
-    set_strings_t::const_iterator it_set;
     if (pKey != "")
     {
         pFOut << pKey << " = ";
     }
     int ii = 0;
-    for (it_set = pSet.begin(); it_set != pSet.end(); it_set++)
+    set_strings_t::const_iterator it_set = pSet.begin();
+    for (; it_set != pSet.end(); it_set++)
     {
         pFOut << (*it_set);
         ii++;
@@ -334,10 +335,10 @@ static void SaveVectorPairStrings(const std::string& pKey, const vector_pair_str
     }
 }
 
-static void SaveMapVectorPairStrings(const map_vector_pair_strings_t& pMap, std::ofstream& pFOut, bool pNewLine = true)
+static void SaveMapVectorPairStrings(const map_vector_pair_string_string_t& pMap, std::ofstream& pFOut, bool pNewLine = true)
 {
-    map_vector_pair_strings_t::const_iterator it;
-    for (it = pMap.begin(); it != pMap.end(); it++)
+    map_vector_pair_string_string_t::const_iterator it = pMap.begin();
+    for (; it != pMap.end(); it++)
     {
         pFOut << it->first << " = ";
         SaveVectorPairStrings("", it->second, pFOut, false);
diff --git a/src/Daemon/Settings.h b/src/Daemon/Settings.h
index 3d3154f..d80bed0 100644
--- a/src/Daemon/Settings.h
+++ b/src/Daemon/Settings.h
@@ -1,20 +1,10 @@
 #ifndef SETTINGS_H_
 #define SETTINGS_H_
 
-#include <string>
-#include <map>
-#include <set>
-#include <vector>
+#include "abrt_types.h"
 
-#include "MiddleWareTypes.h"
-
-typedef std::map<std::string, std::string> map_settings_t;
-typedef std::set<std::string> set_strings_t;
-typedef std::pair<std::string, std::string> pair_string_string_t;
-typedef std::vector<pair_string_string_t> vector_pair_strings_t;
-typedef std::map<std::string, vector_pair_strings_t> map_vector_pair_strings_t;
-typedef map_vector_pair_strings_t map_analyzer_actions_and_reporters_t;
-typedef map_vector_pair_strings_t map_cron_t;
+typedef map_vector_pair_string_string_t map_analyzer_actions_and_reporters_t;
+typedef map_vector_pair_string_string_t map_cron_t;
 
 void LoadSettings(const char* pPath);
 void SaveSettings(const char* pPath);