diff options
author | Yuri Gorshenin <y@maps.me> | 2015-04-24 19:15:50 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:46:26 +0300 |
commit | b3c84850c0d8e5e70fafcd30a0c023dd5b1fd886 (patch) | |
tree | c54f46afc250622847fb9f8ee2931f333647635d /indexer/index.cpp | |
parent | be94193c94643040a3299ca0a67bba3da5423f3f (diff) |
[index] Removed MwmSet::m_name.
Diffstat (limited to 'indexer/index.cpp')
-rw-r--r-- | indexer/index.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indexer/index.cpp b/indexer/index.cpp index 028fef2d6a..38b56ebfb1 100644 --- a/indexer/index.cpp +++ b/indexer/index.cpp @@ -124,7 +124,7 @@ bool Index::DeleteMap(string const & fileName) if (!DeregisterImpl(fileName)) return false; - DeleteMapFiles(GetFullPath(fileName), true); + DeleteMapFiles(GetFullPath(fileName), true /* deleteReady */); } m_observers.ForEach(&Observer::OnMapDeleted, fileName); return true; @@ -174,10 +174,10 @@ void Index::UpdateMwmInfo(MwmId id) case MwmInfo::STATUS_MARKED_TO_DEREGISTER: if (m_info[id].m_lockCount == 0) { - string const name = m_name[id]; - DeleteMapFiles(name, true); + string const fileName = m_info[id].m_fileName; + DeleteMapFiles(fileName, true /* deleteReady */); CHECK(DeregisterImpl(id), ()); - m_observers.ForEach(&Observer::OnMapDeleted, name); + m_observers.ForEach(&Observer::OnMapDeleted, fileName); } break; @@ -185,9 +185,9 @@ void Index::UpdateMwmInfo(MwmId id) if (m_info[id].m_lockCount == 0) { ClearCache(id); - ReplaceFileWithReady(m_name[id]); + ReplaceFileWithReady(m_info[id].m_fileName); m_info[id].SetStatus(MwmInfo::STATUS_UP_TO_DATE); - m_observers.ForEach(&Observer::OnMapUpdated, m_name[id]); + m_observers.ForEach(&Observer::OnMapUpdated, m_info[id].m_fileName); } break; |