diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-27 15:57:17 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-27 15:57:17 +0200 |
| commit | fc4721139b2a7fb890f50105ea169ca4fa6544ac (patch) | |
| tree | 987a9941ed8437fd49409f542407d505df77d425 /inc | |
| parent | 27fa2ecd754cc383b5aecbc11feb6b59323f6397 (diff) | |
| download | abrt-fc4721139b2a7fb890f50105ea169ca4fa6544ac.tar.gz abrt-fc4721139b2a7fb890f50105ea169ca4fa6544ac.tar.xz abrt-fc4721139b2a7fb890f50105ea169ca4fa6544ac.zip | |
consolidate container typedefs in one file (we had a few dupes)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/CrashTypes.h | 7 | ||||
| -rw-r--r-- | inc/abrt_types.h | 42 |
2 files changed, 44 insertions, 5 deletions
diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h index 61975037..e5001f69 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 00000000..76d03275 --- /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 |