From 96ae9794e88e509a6e231e39b3691fcb6d0cc068 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 19 Oct 2017 13:03:44 +0300 Subject: [PATCH] Fixed warnings --- map/framework.cpp | 2 +- map/local_ads_manager.cpp | 4 ++-- qt/editor_dialog.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index c22e7ac934..e662c6baa7 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -360,6 +360,7 @@ void Framework::Migrate(bool keepDownloaded) Framework::Framework(FrameworkParams const & params) : m_startForegroundTime(0.0) , m_storage(platform::migrate::NeedMigrate() ? COUNTRIES_OBSOLETE_FILE : COUNTRIES_FILE) + , m_enabledDiffs(params.m_enableDiffs) , m_bmManager([this]() -> StringsBundle const & { return m_stringsBundle; }) , m_isRenderingEnabled(true) , m_routingManager(RoutingManager::Callbacks([this]() -> Index & { return m_model.GetIndex(); }, @@ -379,7 +380,6 @@ Framework::Framework(FrameworkParams const & params) m_drapeEngine->SetDisplacementMode(mode); }) , m_lastReportedCountry(kInvalidCountryId) - , m_enabledDiffs(params.m_enableDiffs) { m_startBackgroundTime = my::Timer::LocalTime(); diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp index cb9fb31689..f16fa133ee 100644 --- a/map/local_ads_manager.cpp +++ b/map/local_ads_manager.cpp @@ -43,8 +43,8 @@ using namespace base; namespace { -std::array const kMarketingParameters = {marketing::kFrom, marketing::kType, marketing::kName, - marketing::kContent, marketing::kKeyword}; +std::array const kMarketingParameters = {{marketing::kFrom, marketing::kType, marketing::kName, + marketing::kContent, marketing::kKeyword}}; std::string const kServerUrl = LOCAL_ADS_SERVER_URL; std::string const kCampaignPageUrl = LOCAL_ADS_COMPANY_PAGE_URL; diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp index 6f46261add..7545f8bbf1 100644 --- a/qt/editor_dialog.cpp +++ b/qt/editor_dialog.cpp @@ -98,7 +98,7 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo) street += " / " + nearbyStreets[i].m_localizedName; cmb->addItem(street.c_str()); if (emo.GetStreet() == nearbyStreets[i]) - cmb->setCurrentIndex(i); + cmb->setCurrentIndex(static_cast(i)); } cmb->setObjectName(kStreetObjectName); grid->addWidget(cmb, row++, 1);