From 83a0276371e741f18bbb7ca8a57825ff88ebe2c5 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sun, 8 Jul 2012 21:51:50 -0700
Subject: [PATCH] Rename Framework::DeleteMap to DeleteCountry (common
 signature with other functions).

---
 map/framework.cpp    | 4 ++--
 map/framework.hpp    | 4 ++--
 qt/update_dialog.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index 0683ac0c06..985ad829be 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -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(), () );
diff --git a/map/framework.hpp b/map/framework.hpp
index e857b61d89..ebfc8b89d6 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -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);
diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp
index eab6537409..2b458a62e8 100644
--- a/qt/update_dialog.cpp
+++ b/qt/update_dialog.cpp
@@ -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;
     }
   }