From cbc943c2c21d768e465aed025c73158e365cd4d3 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Fri, 13 Mar 2020 13:24:31 +0300 Subject: [PATCH] [ads] all ads-related files are moved into own directory --- android/jni/com/mapswithme/maps/Framework.cpp | 6 ++-- .../com/mapswithme/maps/UserMarkHelper.cpp | 4 +-- map/framework.cpp | 2 +- map/framework.hpp | 2 +- map/place_page_info.cpp | 4 +-- partners_api/CMakeLists.txt | 30 +++++++++---------- partners_api/{ => ads}/ads_base.cpp | 2 +- partners_api/{ => ads}/ads_base.hpp | 2 +- partners_api/{ => ads}/ads_engine.cpp | 12 ++++---- partners_api/{ => ads}/ads_engine.hpp | 4 +-- partners_api/{ => ads}/ads_utils.cpp | 2 +- partners_api/{ => ads}/ads_utils.hpp | 0 partners_api/{ => ads}/banner.hpp | 0 partners_api/{ => ads}/facebook_ads.cpp | 2 +- partners_api/{ => ads}/facebook_ads.hpp | 2 +- partners_api/{ => ads}/google_ads.cpp | 2 +- partners_api/{ => ads}/google_ads.hpp | 2 +- partners_api/{ => ads}/mopub_ads.cpp | 4 +-- partners_api/{ => ads}/mopub_ads.hpp | 2 +- partners_api/{ => ads}/rb_ads.cpp | 2 +- partners_api/{ => ads}/rb_ads.hpp | 2 +- .../partners_api_tests/ads_engine_tests.cpp | 10 +++---- .../partners_api_tests/facebook_tests.cpp | 2 +- .../partners_api_tests/google_tests.cpp | 2 +- .../partners_api_tests/mopub_tests.cpp | 2 +- partners_api/partners_api_tests/rb_tests.cpp | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) rename partners_api/{ => ads}/ads_base.cpp (98%) rename partners_api/{ => ads}/ads_base.hpp (98%) rename partners_api/{ => ads}/ads_engine.cpp (89%) rename partners_api/{ => ads}/ads_engine.hpp (94%) rename partners_api/{ => ads}/ads_utils.cpp (96%) rename partners_api/{ => ads}/ads_utils.hpp (100%) rename partners_api/{ => ads}/banner.hpp (100%) rename partners_api/{ => ads}/facebook_ads.cpp (94%) rename partners_api/{ => ads}/facebook_ads.hpp (92%) rename partners_api/{ => ads}/google_ads.cpp (90%) rename partners_api/{ => ads}/google_ads.hpp (88%) rename partners_api/{ => ads}/mopub_ads.cpp (97%) rename partners_api/{ => ads}/mopub_ads.hpp (89%) rename partners_api/{ => ads}/rb_ads.cpp (98%) rename partners_api/{ => ads}/rb_ads.hpp (86%) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 8cf9b572af..e8494d30c9 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -13,11 +13,11 @@ #include "map/user_mark.hpp" #include "map/purchase.hpp" -#include "partners_api/ads_engine.hpp" -#include "partners_api/banner.hpp" +#include "partners_api/ads/ads_engine.hpp" +#include "partners_api/ads/banner.hpp" +#include "partners_api/ads/mopub_ads.hpp" #include "partners_api/booking_block_params.hpp" #include "partners_api/downloader_promo.hpp" -#include "partners_api/mopub_ads.hpp" #include "partners_api/megafon_countries.hpp" #include "web_api/utils.hpp" diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index 358489c428..85345af8e0 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -3,8 +3,8 @@ #include "map/elevation_info.hpp" #include "map/place_page_info.hpp" -#include "partners_api/ads_engine.hpp" -#include "partners_api/banner.hpp" +#include "partners_api/ads/ads_engine.hpp" +#include "partners_api/ads/banner.hpp" #include "base/string_utils.hpp" diff --git a/map/framework.cpp b/map/framework.cpp index 563180a177..b36e86fe36 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -94,7 +94,7 @@ #include "geometry/tree4d.hpp" #include "geometry/triangle2d.hpp" -#include "partners_api/ads_engine.hpp" +#include "partners_api/ads/ads_engine.hpp" #include "partners_api/opentable_api.hpp" #include "partners_api/partners.hpp" diff --git a/map/framework.hpp b/map/framework.hpp index 5066f1cd95..050f9e5452 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -62,7 +62,7 @@ #include "tracking/reporter.hpp" -#include "partners_api/banner.hpp" +#include "partners_api/ads/banner.hpp" #include "partners_api/booking_api.hpp" #include "partners_api/locals_api.hpp" #include "partners_api/promo_api.hpp" diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index cc612015eb..99990a15da 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -4,8 +4,8 @@ #include "descriptions/loader.hpp" -#include "partners_api/ads_engine.hpp" -#include "partners_api/banner.hpp" +#include "partners_api/ads/ads_engine.hpp" +#include "partners_api/ads/banner.hpp" #include "partners_api/partners.hpp" #include "editor/osm_editor.hpp" diff --git a/partners_api/CMakeLists.txt b/partners_api/CMakeLists.txt index 6b54dbae0b..37b6d1e66b 100644 --- a/partners_api/CMakeLists.txt +++ b/partners_api/CMakeLists.txt @@ -4,13 +4,21 @@ include_directories(${OMIM_ROOT}/3party/jansson/src) set( SRC - ads_base.cpp - ads_base.hpp - ads_engine.cpp - ads_engine.hpp - ads_utils.cpp - ads_utils.hpp - banner.hpp + ads/ads_base.cpp + ads/ads_base.hpp + ads/ads_engine.cpp + ads/ads_engine.hpp + ads/ads_utils.cpp + ads/ads_utils.hpp + ads/banner.hpp + ads/facebook_ads.cpp + ads/facebook_ads.hpp + ads/google_ads.cpp + ads/google_ads.hpp + ads/mopub_ads.cpp + ads/mopub_ads.hpp + ads/rb_ads.cpp + ads/rb_ads.hpp booking_api.cpp booking_api.hpp booking_availability_params.cpp @@ -20,20 +28,14 @@ set( booking_params_base.hpp downloader_promo.cpp downloader_promo.hpp - facebook_ads.cpp - facebook_ads.hpp freenow_api.cpp freenow_api.hpp - google_ads.cpp - google_ads.hpp locals_api.cpp locals_api.hpp maxim_api.cpp maxim_api.hpp megafon_countries.cpp megafon_countries.hpp - mopub_ads.cpp - mopub_ads.hpp opentable_api.cpp opentable_api.hpp partners.cpp @@ -42,8 +44,6 @@ set( promo_api.hpp promo_catalog_types.cpp promo_catalog_types.hpp - rb_ads.cpp - rb_ads.hpp rutaxi_api.cpp rutaxi_api.hpp taxi_base.cpp diff --git a/partners_api/ads_base.cpp b/partners_api/ads/ads_base.cpp similarity index 98% rename from partners_api/ads_base.cpp rename to partners_api/ads/ads_base.cpp index 2534f86327..4a86ff4694 100644 --- a/partners_api/ads_base.cpp +++ b/partners_api/ads/ads_base.cpp @@ -1,4 +1,4 @@ -#include "partners_api/ads_base.hpp" +#include "partners_api/ads/ads_base.hpp" #include "partners_api/promo_catalog_types.hpp" diff --git a/partners_api/ads_base.hpp b/partners_api/ads/ads_base.hpp similarity index 98% rename from partners_api/ads_base.hpp rename to partners_api/ads/ads_base.hpp index ef33040d66..125e89a187 100644 --- a/partners_api/ads_base.hpp +++ b/partners_api/ads/ads_base.hpp @@ -1,6 +1,6 @@ #pragma once -#include "partners_api/ads_utils.hpp" +#include "partners_api/ads/ads_utils.hpp" #include "storage/storage_defines.hpp" diff --git a/partners_api/ads_engine.cpp b/partners_api/ads/ads_engine.cpp similarity index 89% rename from partners_api/ads_engine.cpp rename to partners_api/ads/ads_engine.cpp index 3d6011786f..cc9824453a 100644 --- a/partners_api/ads_engine.cpp +++ b/partners_api/ads/ads_engine.cpp @@ -1,8 +1,9 @@ -#include "partners_api/ads_engine.hpp" -#include "partners_api/facebook_ads.hpp" -#include "partners_api/google_ads.hpp" -#include "partners_api/mopub_ads.hpp" -#include "partners_api/rb_ads.hpp" +#include "partners_api/ads/ads_engine.hpp" + +#include "partners_api/ads/facebook_ads.hpp" +#include "partners_api/ads/google_ads.hpp" +#include "partners_api/ads/mopub_ads.hpp" +#include "partners_api/ads/rb_ads.hpp" #include "indexer/feature_data.hpp" @@ -17,7 +18,6 @@ Engine::Engine() m_poiBanners.emplace_back(Banner::Type::Mopub, std::make_unique()); m_searchBanners.emplace_back(Banner::Type::Facebook, std::make_unique()); - } std::vector Engine::GetPoiBanners(feature::TypesHolder const & types, diff --git a/partners_api/ads_engine.hpp b/partners_api/ads/ads_engine.hpp similarity index 94% rename from partners_api/ads_engine.hpp rename to partners_api/ads/ads_engine.hpp index 7fba6152e1..d38b506298 100644 --- a/partners_api/ads_engine.hpp +++ b/partners_api/ads/ads_engine.hpp @@ -1,7 +1,7 @@ #pragma once -#include "partners_api/ads_base.hpp" -#include "partners_api/banner.hpp" +#include "partners_api/ads/ads_base.hpp" +#include "partners_api/ads/banner.hpp" #include #include diff --git a/partners_api/ads_utils.cpp b/partners_api/ads/ads_utils.cpp similarity index 96% rename from partners_api/ads_utils.cpp rename to partners_api/ads/ads_utils.cpp index 4b30e0e789..17eeb8244c 100644 --- a/partners_api/ads_utils.cpp +++ b/partners_api/ads/ads_utils.cpp @@ -1,4 +1,4 @@ -#include "partners_api/ads_utils.hpp" +#include "partners_api/ads/ads_utils.hpp" #include "coding/string_utf8_multilang.hpp" diff --git a/partners_api/ads_utils.hpp b/partners_api/ads/ads_utils.hpp similarity index 100% rename from partners_api/ads_utils.hpp rename to partners_api/ads/ads_utils.hpp diff --git a/partners_api/banner.hpp b/partners_api/ads/banner.hpp similarity index 100% rename from partners_api/banner.hpp rename to partners_api/ads/banner.hpp diff --git a/partners_api/facebook_ads.cpp b/partners_api/ads/facebook_ads.cpp similarity index 94% rename from partners_api/facebook_ads.cpp rename to partners_api/ads/facebook_ads.cpp index 0643257f65..19b2c59ab5 100644 --- a/partners_api/facebook_ads.cpp +++ b/partners_api/ads/facebook_ads.cpp @@ -1,4 +1,4 @@ -#include "partners_api/facebook_ads.hpp" +#include "partners_api/ads/facebook_ads.hpp" namespace { diff --git a/partners_api/facebook_ads.hpp b/partners_api/ads/facebook_ads.hpp similarity index 92% rename from partners_api/facebook_ads.hpp rename to partners_api/ads/facebook_ads.hpp index 536d4ecdcd..6c00c73c02 100644 --- a/partners_api/facebook_ads.hpp +++ b/partners_api/ads/facebook_ads.hpp @@ -1,6 +1,6 @@ #pragma once -#include "partners_api/ads_base.hpp" +#include "partners_api/ads/ads_base.hpp" namespace ads { diff --git a/partners_api/google_ads.cpp b/partners_api/ads/google_ads.cpp similarity index 90% rename from partners_api/google_ads.cpp rename to partners_api/ads/google_ads.cpp index 0329d3780a..b5367526a8 100644 --- a/partners_api/google_ads.cpp +++ b/partners_api/ads/google_ads.cpp @@ -1,4 +1,4 @@ -#include "partners_api/google_ads.hpp" +#include "partners_api/ads/google_ads.hpp" namespace { diff --git a/partners_api/google_ads.hpp b/partners_api/ads/google_ads.hpp similarity index 88% rename from partners_api/google_ads.hpp rename to partners_api/ads/google_ads.hpp index 7126e3f644..469d052f8e 100644 --- a/partners_api/google_ads.hpp +++ b/partners_api/ads/google_ads.hpp @@ -1,6 +1,6 @@ #pragma once -#include "partners_api/ads_base.hpp" +#include "partners_api/ads/ads_base.hpp" namespace ads { diff --git a/partners_api/mopub_ads.cpp b/partners_api/ads/mopub_ads.cpp similarity index 97% rename from partners_api/mopub_ads.cpp rename to partners_api/ads/mopub_ads.cpp index 8aeb9c14c0..8bcedbc1dd 100644 --- a/partners_api/mopub_ads.cpp +++ b/partners_api/ads/mopub_ads.cpp @@ -1,7 +1,7 @@ -#include "partners_api/mopub_ads.hpp" +#include "partners_api/ads/mopub_ads.hpp" #include "partners_api/partners.hpp" -#include "private.h" +#include "std/target_os.hpp" namespace { diff --git a/partners_api/mopub_ads.hpp b/partners_api/ads/mopub_ads.hpp similarity index 89% rename from partners_api/mopub_ads.hpp rename to partners_api/ads/mopub_ads.hpp index 03505e06eb..b172bbf43a 100644 --- a/partners_api/mopub_ads.hpp +++ b/partners_api/ads/mopub_ads.hpp @@ -1,6 +1,6 @@ #pragma once -#include "partners_api/ads_base.hpp" +#include "partners_api/ads/ads_base.hpp" #include diff --git a/partners_api/rb_ads.cpp b/partners_api/ads/rb_ads.cpp similarity index 98% rename from partners_api/rb_ads.cpp rename to partners_api/ads/rb_ads.cpp index 78ac17c981..b0ff0be84c 100644 --- a/partners_api/rb_ads.cpp +++ b/partners_api/ads/rb_ads.cpp @@ -1,4 +1,4 @@ -#include "partners_api/rb_ads.hpp" +#include "partners_api/ads/rb_ads.hpp" namespace { diff --git a/partners_api/rb_ads.hpp b/partners_api/ads/rb_ads.hpp similarity index 86% rename from partners_api/rb_ads.hpp rename to partners_api/ads/rb_ads.hpp index 5f13e76a54..571c400280 100644 --- a/partners_api/rb_ads.hpp +++ b/partners_api/ads/rb_ads.hpp @@ -1,6 +1,6 @@ #pragma once -#include "partners_api/ads_base.hpp" +#include "partners_api/ads/ads_base.hpp" namespace ads { diff --git a/partners_api/partners_api_tests/ads_engine_tests.cpp b/partners_api/partners_api_tests/ads_engine_tests.cpp index 5a9efaee05..ae454bc145 100644 --- a/partners_api/partners_api_tests/ads_engine_tests.cpp +++ b/partners_api/partners_api_tests/ads_engine_tests.cpp @@ -4,11 +4,11 @@ #include "indexer/classificator_loader.hpp" #include "indexer/feature_data.hpp" -#include "partners_api/ads_engine.hpp" -#include "partners_api/facebook_ads.hpp" -#include "partners_api/google_ads.hpp" -#include "partners_api/mopub_ads.hpp" -#include "partners_api/rb_ads.hpp" +#include "partners_api/ads/ads_engine.hpp" +#include "partners_api/ads/facebook_ads.hpp" +#include "partners_api/ads/google_ads.hpp" +#include "partners_api/ads/mopub_ads.hpp" +#include "partners_api/ads/rb_ads.hpp" namespace { diff --git a/partners_api/partners_api_tests/facebook_tests.cpp b/partners_api/partners_api_tests/facebook_tests.cpp index 8655561634..c3eee61416 100644 --- a/partners_api/partners_api_tests/facebook_tests.cpp +++ b/partners_api/partners_api_tests/facebook_tests.cpp @@ -4,7 +4,7 @@ #include "indexer/classificator_loader.hpp" #include "indexer/feature_data.hpp" -#include "partners_api/facebook_ads.hpp" +#include "partners_api/ads/facebook_ads.hpp" namespace { diff --git a/partners_api/partners_api_tests/google_tests.cpp b/partners_api/partners_api_tests/google_tests.cpp index 7d685b8f9c..ae62be22b8 100644 --- a/partners_api/partners_api_tests/google_tests.cpp +++ b/partners_api/partners_api_tests/google_tests.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "partners_api/google_ads.hpp" +#include "partners_api/ads/google_ads.hpp" UNIT_TEST(Google_BannerInSearch) { diff --git a/partners_api/partners_api_tests/mopub_tests.cpp b/partners_api/partners_api_tests/mopub_tests.cpp index c84b24aa87..25db690a8a 100644 --- a/partners_api/partners_api_tests/mopub_tests.cpp +++ b/partners_api/partners_api_tests/mopub_tests.cpp @@ -4,7 +4,7 @@ #include "indexer/classificator_loader.hpp" #include "indexer/feature_data.hpp" -#include "partners_api/mopub_ads.hpp" +#include "partners_api/ads/mopub_ads.hpp" namespace { diff --git a/partners_api/partners_api_tests/rb_tests.cpp b/partners_api/partners_api_tests/rb_tests.cpp index 9933a5be85..3f0bdf8ae9 100644 --- a/partners_api/partners_api_tests/rb_tests.cpp +++ b/partners_api/partners_api_tests/rb_tests.cpp @@ -4,7 +4,7 @@ #include "indexer/classificator_loader.hpp" #include "indexer/feature_data.hpp" -#include "partners_api/rb_ads.hpp" +#include "partners_api/ads/rb_ads.hpp" namespace {