diff options
author | Maxim Pimenov <m@maps.me> | 2016-08-16 19:35:11 +0300 |
---|---|---|
committer | Maxim Pimenov <m@maps.me> | 2016-08-26 11:29:18 +0300 |
commit | 27047e77bbbe00d1f134dd7d0ca7642b85da6577 (patch) | |
tree | 38fa29fa8e81d089e308bfe9c5a7a7eea84847d4 /qt | |
parent | 9bb96c840c00be0d33fec3db8b2301bd5e015e6d (diff) |
Several renamings in framework.
Diffstat (limited to 'qt')
-rw-r--r-- | qt/draw_widget.cpp | 6 | ||||
-rw-r--r-- | qt/search_panel.cpp | 2 | ||||
-rw-r--r-- | qt/update_dialog.cpp | 2 | ||||
-rw-r--r-- | qt/update_dialog.hpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 9c649fb0e5..4c3b9717ed 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -124,14 +124,14 @@ void DrawWidget::UpdateCountryStatus(storage::TCountryId const & countryId) if (m_currentCountryChanged != nullptr) { string countryName = countryId; - auto status = m_framework->Storage().CountryStatusEx(countryId); + auto status = m_framework->GetStorage().CountryStatusEx(countryId); uint8_t progressInPercentage = 0; storage::MapFilesDownloader::TProgress progressInByte = make_pair(0, 0); if (!countryId.empty()) { storage::NodeAttrs nodeAttrs; - m_framework->Storage().GetNodeAttrs(countryId, nodeAttrs); + m_framework->GetStorage().GetNodeAttrs(countryId, nodeAttrs); progressInByte = nodeAttrs.m_downloadingProgress; if (progressInByte.second != 0) progressInPercentage = static_cast<int8_t>(100 * progressInByte.first / progressInByte.second); @@ -155,7 +155,7 @@ void DrawWidget::SetCurrentCountryChangedListener(DrawWidget::TCurrentCountryCha void DrawWidget::DownloadCountry(storage::TCountryId const & countryId) { - m_framework->Storage().DownloadNode(countryId); + m_framework->GetStorage().DownloadNode(countryId); if (!m_countryId.empty()) UpdateCountryStatus(m_countryId); } diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index 6cf1654c12..bee34ae791 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -219,7 +219,7 @@ bool SearchPanel::TryMigrate(QString const & str) auto const stateChanged = [&](storage::TCountryId const & id) { - storage::Status const nextStatus = m_pDrawWidget->GetFramework().Storage().GetPrefetchStorage()->CountryStatusEx(id); + storage::Status const nextStatus = m_pDrawWidget->GetFramework().GetStorage().GetPrefetchStorage()->CountryStatusEx(id); LOG_SHORT(LINFO, (id, "status :", nextStatus)); if (nextStatus == storage::Status::EOnDisk) { diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index 8d4743c10c..0449738eba 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -402,7 +402,7 @@ namespace qt m_tree->setSortingEnabled(false); m_tree->clear(); - TCountryId const rootId = m_framework.Storage().GetRootId(); + TCountryId const rootId = m_framework.GetStorage().GetRootId(); FillTreeImpl(nullptr /* parent */, rootId, filter); // Expand the root. diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp index 275c8b5f6b..bcc03b3b43 100644 --- a/qt/update_dialog.hpp +++ b/qt/update_dialog.hpp @@ -55,7 +55,7 @@ namespace qt storage::TCountryId GetCountryIdByTreeItem(QTreeWidgetItem *); private: - inline storage::Storage & GetStorage() const { return m_framework.Storage(); } + inline storage::Storage & GetStorage() const { return m_framework.GetStorage(); } QTreeWidget * m_tree; Framework & m_framework; |