diff options
| author | vng <viktor.govako@gmail.com> | 2011-07-03 21:16:43 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:20:30 +0300 |
| commit | ae88aa1971d63e506ba54000dc3aa53135534eb2 (patch) | |
| tree | f96aa393b5385ff30707a484e88f455cbe69bf4f /generator | |
| parent | adde2107d1effebd18358b60bc190c7bd4e5d75b (diff) | |
[Refactoring] Use mwm-file descriptor (string name) in Index. Open FileReader only when necessary.
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/dumper.cpp | 4 | ||||
| -rw-r--r-- | generator/dumper.hpp | 2 | ||||
| -rw-r--r-- | generator/statistics.cpp | 8 | ||||
| -rw-r--r-- | generator/statistics.hpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/generator/dumper.cpp b/generator/dumper.cpp index 6693bde894..7161e22080 100644 --- a/generator/dumper.cpp +++ b/generator/dumper.cpp @@ -48,10 +48,10 @@ namespace feature return first.second > second.second; } - void DumpTypes(string const & datFile) + void DumpTypes(string const & fPath) { TypesCollector doClass; - feature::ForEachFromDat(new FileReader(datFile), doClass); + feature::ForEachFromDat(fPath, doClass); typedef vector<stats_elem_type> vec_to_sort; vec_to_sort vecToSort(doClass.m_stats.begin(), doClass.m_stats.end()); diff --git a/generator/dumper.hpp b/generator/dumper.hpp index 48a4bfcd57..01d852a7b3 100644 --- a/generator/dumper.hpp +++ b/generator/dumper.hpp @@ -4,5 +4,5 @@ namespace feature { - void DumpTypes(string const & datFile); + void DumpTypes(string const & fPath); } diff --git a/generator/statistics.cpp b/generator/statistics.cpp index be4a07f761..c0f85e3583 100644 --- a/generator/statistics.cpp +++ b/generator/statistics.cpp @@ -17,9 +17,9 @@ using namespace feature; namespace stats { - void FileContainerStatistic(string const & fName) + void FileContainerStatistic(string const & fPath) { - FilesContainerR cont(fName); + FilesContainerR cont(fPath); vector<string> tags; tags.push_back(DATA_FILE_TAG); @@ -79,10 +79,10 @@ namespace stats } }; - void CalcStatistic(string const & fName, MapInfo & info) + void CalcStatistic(string const & fPath, MapInfo & info) { AccumulateStatistic doProcess(info); - feature::ForEachFromDat(new FileReader(fName), doProcess); + feature::ForEachFromDat(fPath, doProcess); } void PrintInfo(char const * prefix, GeneralInfo const & info) diff --git a/generator/statistics.hpp b/generator/statistics.hpp index 2f4956fd20..74e6622967 100644 --- a/generator/statistics.hpp +++ b/generator/statistics.hpp @@ -69,8 +69,8 @@ namespace stats } }; - void FileContainerStatistic(string const & fName); + void FileContainerStatistic(string const & fPath); - void CalcStatistic(string const & fName, MapInfo & info); + void CalcStatistic(string const & fPath, MapInfo & info); void PrintStatistic(MapInfo & info); } |