pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Rename Framework::DeleteMap to DeleteCountry (common signature with other functions).

Browse source
This commit is contained in:
vng 2012-07-08 21:51:50 -07:00 • committed by Alex Zolotarev
parent a4199f80ed
commit 83a0276371
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -212,7 +212,7 @@ Framework::~Framework()
ClearBookmarks();
}
void Framework::DeleteMap(storage::TIndex const & index)
void Framework::DeleteCountry(storage::TIndex const & index)
{
if (!m_storage.DeleteFromDownloader(index))
{
@ -260,7 +260,7 @@ storage::TStatus Framework::GetCountryStatus(storage::TIndex const & index) cons
return res;
}
m2::RectD Framework::GetCountryBounds(string const & file)
m2::RectD Framework::GetCountryBounds(string const & file) const
{
m2::RectD const r = GetSearchEngine()->GetCountryBounds(file);
ASSERT ( r.IsValid(), () );

4
map/framework.hpp
View file

@ -143,13 +143,13 @@ public:
/// @name This functions is used by Downloader UI.
//@{
void DeleteMap(storage::TIndex const & index);
void DeleteCountry(storage::TIndex const & index);
storage::TStatus GetCountryStatus(storage::TIndex const & index) const;
/// Get country rect from borders (not from mwm file).
/// @param[in] file Pass country file name without extension as an id.
m2::RectD GetCountryBounds(string const & file);
m2::RectD GetCountryBounds(string const & file) const;
//@}
void AddBookmark(string const & category, Bookmark const & bm);

6
qt/update_dialog.cpp
View file

@ -135,7 +135,7 @@ namespace qt
st.DownloadCountry(countryIndex);
if (res == btns[1])
m_framework.DeleteMap(countryIndex);
m_framework.DeleteCountry(countryIndex);
}
break;
@ -149,7 +149,7 @@ namespace qt
ask.setDefaultButton(QMessageBox::No);
if (ask.exec() == QMessageBox::Yes)
m_framework.DeleteMap(countryIndex);
m_framework.DeleteCountry(countryIndex);
}
break;
@ -160,7 +160,7 @@ namespace qt
case EInQueue:
case EDownloading:
m_framework.DeleteMap(countryIndex);
m_framework.DeleteCountry(countryIndex);
break;
}
}