From a1f5ebeee2634499f90760676c6d6e41c27d7d92 Mon Sep 17 00:00:00 2001 From: Evgeniy Dushistov Date: Sun, 7 Jul 2013 15:24:28 +0000 Subject: [PATCH] remove typedef to simplify code --- src/lib/file.cpp | 6 +++--- src/lib/file.hpp | 6 ++---- src/lib/lib.cpp | 22 +++++++++++----------- src/lib/lib.hpp | 14 ++++++-------- src/sdcv.cpp | 10 +++++----- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/lib/file.cpp b/src/lib/file.cpp index 8339777..4bb0178 100644 --- a/src/lib/file.cpp +++ b/src/lib/file.cpp @@ -5,7 +5,7 @@ #include "file.hpp" static void __for_each_file(const std::string& dirname, const std::string& suff, - const List& order_list, const List& disable_list, + const std::list& order_list, const std::list& disable_list, const std::function& f) { GDir *dir = g_dir_open(dirname.c_str(), 0, nullptr); @@ -30,8 +30,8 @@ static void __for_each_file(const std::string& dirname, const std::string& suff, } -void for_each_file(const List& dirs_list, const std::string& suff, - const List& order_list, const List& disable_list, +void for_each_file(const std::list& dirs_list, const std::string& suff, + const std::list& order_list, const std::list& disable_list, const std::function& f) { for (const std::string & item : order_list) { diff --git a/src/lib/file.hpp b/src/lib/file.hpp index 9ae7278..4657968 100644 --- a/src/lib/file.hpp +++ b/src/lib/file.hpp @@ -4,9 +4,7 @@ #include #include -typedef std::list List; - -extern void for_each_file(const List& dirs_list, const std::string& suff, - const List& order_list, const List& disable_list, +extern void for_each_file(const std::list& dirs_list, const std::string& suff, + const std::list& order_list, const std::list& disable_list, const std::function& f); diff --git a/src/lib/lib.cpp b/src/lib/lib.cpp index 4503417..1aaaf68 100644 --- a/src/lib/lib.cpp +++ b/src/lib/lib.cpp @@ -482,7 +482,7 @@ namespace { const gchar *get_first_on_page_key(glong page_idx); bool load_cache(const std::string& url); bool save_cache(const std::string& url); - static strlist_t get_cache_variant(const std::string& url); + static std::list get_cache_variant(const std::string& url); }; const char *OffsetIndex::CACHE_MAGIC = "StarDict's Cache, Version: 0.1"; @@ -548,7 +548,7 @@ namespace { bool OffsetIndex::load_cache(const std::string& url) { - const strlist_t vars = get_cache_variant(url); + const std::list vars = get_cache_variant(url); for (const std::string& item : vars) { struct ::stat idxstat, cachestat; @@ -570,9 +570,9 @@ namespace { return false; } - strlist_t OffsetIndex::get_cache_variant(const std::string& url) + std::list OffsetIndex::get_cache_variant(const std::string& url) { - strlist_t res = {url + ".oft"}; + std::list res = {url + ".oft"}; if (!g_file_test(g_get_user_cache_dir(), G_FILE_TEST_EXISTS) && g_mkdir(g_get_user_cache_dir(), 0700)==-1) return res; @@ -593,7 +593,7 @@ namespace { bool OffsetIndex::save_cache(const std::string& url) { - const strlist_t vars = get_cache_variant(url); + const std::list vars = get_cache_variant(url); for (const std::string& item : vars) { FILE *out=fopen(item.c_str(), "wb"); if (!out) @@ -897,9 +897,9 @@ void Libs::load_dict(const std::string& url) delete lib; } -void Libs::load(const strlist_t& dicts_dirs, - const strlist_t& order_list, - const strlist_t& disable_list) +void Libs::load(const std::list& dicts_dirs, + const std::list& order_list, + const std::list& disable_list) { for_each_file(dicts_dirs, ".ifo", order_list, disable_list, [this](const std::string& url, bool disable) -> void { @@ -908,9 +908,9 @@ void Libs::load(const strlist_t& dicts_dirs, }); } -void Libs::reload(const strlist_t& dicts_dirs, - const strlist_t& order_list, - const strlist_t& disable_list) +void Libs::reload(const std::list& dicts_dirs, + const std::list& order_list, + const std::list& disable_list) { std::vector prev(oLib); oLib.clear(); diff --git a/src/lib/lib.hpp b/src/lib/lib.hpp index 4cd0c78..6ce4292 100644 --- a/src/lib/lib.hpp +++ b/src/lib/lib.hpp @@ -111,8 +111,6 @@ private: bool load_ifofile(const std::string& ifofilename, gulong &idxfilesize); }; -typedef std::list strlist_t; - class Libs { public: Libs(std::function f = std::function()) { @@ -124,12 +122,12 @@ public: Libs& operator=(const Libs&) = delete; void load_dict(const std::string& url); - void load(const strlist_t& dicts_dirs, - const strlist_t& order_list, - const strlist_t& disable_list); - void reload(const strlist_t& dicts_dirs, - const strlist_t& order_list, - const strlist_t& disable_list); + void load(const std::list& dicts_dirs, + const std::list& order_list, + const std::list& disable_list); + void reload(const std::list& dicts_dirs, + const std::list& order_list, + const std::list& disable_list); glong narticles(int idict) const { return oLib[idict]->narticles(); } const std::string& dict_name(int idict) const { return oLib[idict]->dict_name(); } diff --git a/src/sdcv.cpp b/src/sdcv.cpp index b50673b..fdf1f7f 100644 --- a/src/sdcv.cpp +++ b/src/sdcv.cpp @@ -130,14 +130,14 @@ int main(int argc, char *argv[]) if (!homedir) homedir = g_get_home_dir (); - const strlist_t dicts_dir_list = { + const std::list dicts_dir_list = { std::string(homedir) + G_DIR_SEPARATOR + ".stardict" + G_DIR_SEPARATOR + "dic", data_dir }; if (show_list_dicts) { printf(_("Dictionary's name Word count\n")); - strlist_t order_list, disable_list; + std::list order_list, disable_list; for_each_file(dicts_dir_list, ".ifo", order_list, disable_list, [](const std::string& filename, bool) -> void { DictInfo dict_info; @@ -150,10 +150,10 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } - strlist_t disable_list; + std::list disable_list; if (use_dict_list) { - strlist_t empty_list; + std::list empty_list; for_each_file(dicts_dir_list, ".ifo", empty_list, empty_list, [&disable_list, &use_dict_list](const std::string& filename, bool) -> void { @@ -175,7 +175,7 @@ int main(int argc, char *argv[]) Library lib(utf8_input, utf8_output, colorize); - strlist_t empty_list; + std::list empty_list; lib.load(dicts_dir_list, empty_list, disable_list); std::unique_ptr io(create_readline_object());