diff options
author | Maxim Pimenov <m@maps.me> | 2019-02-12 19:28:06 +0300 |
---|---|---|
committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2019-02-13 14:58:09 +0300 |
commit | 2e44306191426d519ae273abd8075d30bb9cb86a (patch) | |
tree | 05521f888885621b7be2e4ee567c4b752c6d3fe7 /partners_api | |
parent | b1bec1c75c8f6eaa0b16911833a92b2b9ce82ae3 (diff) |
clang-format
Diffstat (limited to 'partners_api')
-rw-r--r-- | partners_api/ads_base.cpp | 3 | ||||
-rw-r--r-- | partners_api/ads_base.hpp | 9 | ||||
-rw-r--r-- | partners_api/ads_engine.cpp | 3 | ||||
-rw-r--r-- | partners_api/ads_engine.hpp | 3 | ||||
-rw-r--r-- | partners_api/megafon_countries.cpp | 82 | ||||
-rw-r--r-- | partners_api/partners_api_tests/taxi_engine_tests.cpp | 5 | ||||
-rw-r--r-- | partners_api/rb_ads.cpp | 17 |
7 files changed, 51 insertions, 71 deletions
diff --git a/partners_api/ads_base.cpp b/partners_api/ads_base.cpp index e646f2e2e3..d42c5c42de 100644 --- a/partners_api/ads_base.cpp +++ b/partners_api/ads_base.cpp @@ -51,8 +51,7 @@ void Container::AppendSupportedUserLanguages(std::initializer_list<std::string> } } -bool Container::HasBanner(feature::TypesHolder const & types, - storage::CountryId const & countryId, +bool Container::HasBanner(feature::TypesHolder const & types, storage::CountryId const & countryId, std::string const & userLanguage) const { if (!m_supportedCountries.empty() && diff --git a/partners_api/ads_base.hpp b/partners_api/ads_base.hpp index 8af1491dd6..d2de17ddb4 100644 --- a/partners_api/ads_base.hpp +++ b/partners_api/ads_base.hpp @@ -22,8 +22,7 @@ class ContainerBase { public: virtual ~ContainerBase() = default; - virtual bool HasBanner(feature::TypesHolder const & types, - storage::CountryId const & countryId, + virtual bool HasBanner(feature::TypesHolder const & types, storage::CountryId const & countryId, std::string const & userLanguage) const = 0; virtual std::string GetBannerId(feature::TypesHolder const & types, storage::CountryId const & countryId, @@ -40,11 +39,9 @@ public: Container(); // ContainerBase overrides: - bool HasBanner(feature::TypesHolder const & types, - storage::CountryId const & countryId, + bool HasBanner(feature::TypesHolder const & types, storage::CountryId const & countryId, std::string const & userLanguage) const override; - std::string GetBannerId(feature::TypesHolder const & types, - storage::CountryId const & countryId, + std::string GetBannerId(feature::TypesHolder const & types, storage::CountryId const & countryId, std::string const & userLanguage) const override; std::string GetBannerIdForOtherTypes() const override; bool HasSearchBanner() const override; diff --git a/partners_api/ads_engine.cpp b/partners_api/ads_engine.cpp index 8d95345ccc..1283289ee7 100644 --- a/partners_api/ads_engine.cpp +++ b/partners_api/ads_engine.cpp @@ -20,8 +20,7 @@ Engine::Engine() m_searchBanners.emplace_back(Banner::Type::Facebook, std::make_unique<Facebook>()); } -bool Engine::HasBanner(feature::TypesHolder const & types, - storage::CountriesVec const & countryIds, +bool Engine::HasBanner(feature::TypesHolder const & types, storage::CountriesVec const & countryIds, std::string const & userLanguage) const { for (auto const & countryId : countryIds) diff --git a/partners_api/ads_engine.hpp b/partners_api/ads_engine.hpp index cc0f3d7541..820ebd1088 100644 --- a/partners_api/ads_engine.hpp +++ b/partners_api/ads_engine.hpp @@ -19,8 +19,7 @@ class Engine public: Engine(); - bool HasBanner(feature::TypesHolder const & types, - storage::CountriesVec const & countryIds, + bool HasBanner(feature::TypesHolder const & types, storage::CountriesVec const & countryIds, std::string const & userLanguage) const; std::vector<Banner> GetBanners(feature::TypesHolder const & types, storage::CountriesVec const & countryIds, diff --git a/partners_api/megafon_countries.cpp b/partners_api/megafon_countries.cpp index e02d10f097..ead48c3912 100644 --- a/partners_api/megafon_countries.cpp +++ b/partners_api/megafon_countries.cpp @@ -7,47 +7,47 @@ namespace ads namespace { storage::CountriesVec const kCountries = { - "Armenia", - "Austria", - "Belarus", - "Bulgaria", - "Croatia", - "Cyprus", - "Czech", - "Czech Republic", - "Denmark", - "Egypt", - "Estonia", - "Finland", - "France", - "Germany", - "Gibraltar", - "Greece", - "Hungary", - "Iceland", - "Israel", - "Italy", - "Kazakhstan", - "Kyrgyzstan", - "Latvia", - "Lithuania", - "Malta", - "Montenegro", - "Netherlands", - "Norway", - "Poland", - "Portugal", - "Romania", - "Saudi Arabia", - "South Korea", - "Spain", - "Sweden", - "Switzerland", - "Thailand", - "Tunisia", - "Turkey", - "Ukraine", - "United Arab Emirates", + "Armenia", + "Austria", + "Belarus", + "Bulgaria", + "Croatia", + "Cyprus", + "Czech", + "Czech Republic", + "Denmark", + "Egypt", + "Estonia", + "Finland", + "France", + "Germany", + "Gibraltar", + "Greece", + "Hungary", + "Iceland", + "Israel", + "Italy", + "Kazakhstan", + "Kyrgyzstan", + "Latvia", + "Lithuania", + "Malta", + "Montenegro", + "Netherlands", + "Norway", + "Poland", + "Portugal", + "Romania", + "Saudi Arabia", + "South Korea", + "Spain", + "Sweden", + "Switzerland", + "Thailand", + "Tunisia", + "Turkey", + "Ukraine", + "United Arab Emirates", }; bool IsRussianLocale(std::string const & currentLocale) diff --git a/partners_api/partners_api_tests/taxi_engine_tests.cpp b/partners_api/partners_api_tests/taxi_engine_tests.cpp index a625dcbb5a..5ed83cf343 100644 --- a/partners_api/partners_api_tests/taxi_engine_tests.cpp +++ b/partners_api/partners_api_tests/taxi_engine_tests.cpp @@ -37,10 +37,7 @@ public: storage::CountriesVec GetCountryIds(m2::PointD const & point) override { return {"Ukraine"}; } std::string GetCityName(m2::PointD const & point) override { return "Odessa"; } - storage::CountryId GetMwmId(m2::PointD const & point) override - { - return "Ukraine_Odessa Oblast"; - } + storage::CountryId GetMwmId(m2::PointD const & point) override { return "Ukraine_Odessa Oblast"; } }; class UkraineMariupolDelegate : public taxi::Delegate diff --git a/partners_api/rb_ads.cpp b/partners_api/rb_ads.cpp index f30ca5b2ff..d24ab87c22 100644 --- a/partners_api/rb_ads.cpp +++ b/partners_api/rb_ads.cpp @@ -14,20 +14,9 @@ auto const kEntertainmentPlacementId = "9"; auto const kBuildingPlacementId = "11"; auto const kBannerIdForOtherTypes = "14"; -std::initializer_list<storage::CountryId> const kSupportedCountries = -{ - "Azerbaijan Region", - "Armenia", - "Belarus", - "Kazakhstan", - "Kyrgyzstan", - "Moldova", - "Russian Federation", - "Tajikistan", - "Turkmenistan", - "Uzbekistan", - "Ukraine" -}; +std::initializer_list<storage::CountryId> const kSupportedCountries = { + "Azerbaijan Region", "Armenia", "Belarus", "Kazakhstan", "Kyrgyzstan", "Moldova", + "Russian Federation", "Tajikistan", "Turkmenistan", "Uzbekistan", "Ukraine"}; std::initializer_list<std::string> const kSupportedLanguages = {"be", "hy", "kk", "ru", "uk"}; } // namespace |