From 2b5fc89216af4da328a803ac22a416e8f41b86b7 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Tue, 1 Sep 2015 15:05:56 -0700 Subject: [ios] Fixed includes. --- iphone/Maps/Bookmarks/BookmarksRootVC.mm | 4 +--- iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm | 1 - iphone/Maps/Classes/EAGLView.h | 6 +++--- iphone/Maps/Classes/EAGLView.mm | 16 ++++++++-------- iphone/Maps/Classes/Framework.cpp | 2 -- iphone/Maps/Classes/Framework.h | 3 +-- iphone/Maps/Classes/LocationPredictor.mm | 4 ++-- iphone/Maps/Classes/MWMPlacePageEntity.mm | 2 +- iphone/Maps/Classes/MapCell.h | 4 ++-- iphone/Maps/Classes/MapViewController.mm | 17 ++++++++--------- iphone/Maps/Classes/MapsAppDelegate.h | 2 +- iphone/Maps/Classes/MapsAppDelegate.mm | 1 - iphone/Maps/Classes/MapsObservers.h | 2 +- iphone/Maps/Classes/RenderBuffer.hpp | 4 ++-- iphone/Maps/Classes/RenderBuffer.mm | 5 ++--- iphone/Maps/Classes/RenderContext.hpp | 4 ++-- iphone/Maps/DownloaderParentVC.h | 5 ++--- iphone/Maps/DownloaderParentVC.mm | 1 - iphone/Maps/Settings/Preferences.mm | 2 +- iphone/Maps/Settings/SettingsViewController.mm | 7 ++++--- iphone/Maps/SettingsAndMoreVC.mm | 5 +++-- iphone/Maps/Statistics/AppInfo.mm | 3 ++- iphone/Maps/Statistics/Statistics.mm | 4 ++-- iphone/Maps/main.mm | 6 +++--- 24 files changed, 51 insertions(+), 59 deletions(-) (limited to 'iphone/Maps') diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index e042320f04..51f6320bd2 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -1,12 +1,10 @@ #import "BookmarksRootVC.h" #import "BookmarksVC.h" #import "Common.h" -#import "Statistics.h" #import "UIKitCategories.h" #include "Framework.h" - -#include "../../platform/platform.hpp" +#include "platform/platform.hpp" #define TEXTFIELD_TAG 999 diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index ba2dc68379..d4b71efea3 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -16,7 +16,6 @@ #import "MWMPedestrianShareAlert.h" #import "MWMRateAlert.h" #import "MWMRoutingDisclaimerAlert.h" -#import "Statistics.h" @implementation MWMAlert diff --git a/iphone/Maps/Classes/EAGLView.h b/iphone/Maps/Classes/EAGLView.h index f82517196e..04c7e16a6f 100644 --- a/iphone/Maps/Classes/EAGLView.h +++ b/iphone/Maps/Classes/EAGLView.h @@ -1,8 +1,8 @@ #import -#include "../../std/shared_ptr.hpp" -#include "../../indexer/map_style.hpp" +#include "std/shared_ptr.hpp" +#include "indexer/map_style.hpp" #ifndef USE_DRAPE @@ -25,7 +25,7 @@ namespace graphics #else -#include "../../drape/pointers.hpp" +#include "drape/pointers.hpp" namespace dp { class OGLContextFactory; diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index 732a50edb0..bff4d58fb4 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -10,20 +10,20 @@ #ifndef USE_DRAPE #include "RenderBuffer.hpp" #include "RenderContext.hpp" - #include "../../graphics/resource_manager.hpp" - #include "../../graphics/opengl/opengl.hpp" - #include "../../graphics/data_formats.hpp" - #include "../../indexer/classificator_loader.hpp" + #include "graphics/resource_manager.hpp" + #include "graphics/opengl/opengl.hpp" + #include "graphics/data_formats.hpp" + #include "indexer/classificator_loader.hpp" #else #import "../Platform/opengl/iosOGLContextFactory.h" #endif -#include "../../render/render_policy.hpp" +#include "render/render_policy.hpp" -#include "../../platform/platform.hpp" -#include "../../platform/video_timer.hpp" +#include "platform/platform.hpp" +#include "platform/video_timer.hpp" -#include "../../std/bind.hpp" +#include "std/bind.hpp" @implementation EAGLView diff --git a/iphone/Maps/Classes/Framework.cpp b/iphone/Maps/Classes/Framework.cpp index 758b15d66a..fbf11720ec 100644 --- a/iphone/Maps/Classes/Framework.cpp +++ b/iphone/Maps/Classes/Framework.cpp @@ -1,7 +1,5 @@ #include "Framework.h" -#include "../../../map/framework.hpp" - static Framework * g_framework = 0; Framework & GetFramework() diff --git a/iphone/Maps/Classes/Framework.h b/iphone/Maps/Classes/Framework.h index 491b7a2fdb..caa51d915d 100644 --- a/iphone/Maps/Classes/Framework.h +++ b/iphone/Maps/Classes/Framework.h @@ -1,8 +1,7 @@ // Wraps framework access #pragma once -#include "../../../map/framework.hpp" - +#include "map/framework.hpp" /// Creates framework at first access Framework & GetFramework(); diff --git a/iphone/Maps/Classes/LocationPredictor.mm b/iphone/Maps/Classes/LocationPredictor.mm index 2c2e32999e..25c2b5e799 100644 --- a/iphone/Maps/Classes/LocationPredictor.mm +++ b/iphone/Maps/Classes/LocationPredictor.mm @@ -1,9 +1,9 @@ #import "LocationPredictor.h" #import "Framework.h" -#include "../../../base/timer.hpp" +#include "base/timer.hpp" -#include "../../../map/location_state.hpp" +#include "map/location_state.hpp" namespace diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm index f95f2817aa..d467182f9c 100644 --- a/iphone/Maps/Classes/MWMPlacePageEntity.mm +++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm @@ -11,7 +11,7 @@ #import "MWMPlacePageViewManager.h" #import "MapViewController.h" #import "UIKitCategories.h" -#include "../../../platform/measurement_utils.hpp" +#include "platform/measurement_utils.hpp" extern NSArray * const kBookmarkColorsVariant = @[@"placemark-red", @"placemark-yellow", @"placemark-blue", @"placemark-green", @"placemark-purple", @"placemark-orange", @"placemark-brown", @"placemark-pink"]; extern NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS"; diff --git a/iphone/Maps/Classes/MapCell.h b/iphone/Maps/Classes/MapCell.h index 74cf6443f5..1935cf17a6 100644 --- a/iphone/Maps/Classes/MapCell.h +++ b/iphone/Maps/Classes/MapCell.h @@ -3,8 +3,8 @@ #import "ProgressView.h" #import "BadgeView.h" -#include "../../storage/storage_defines.hpp" -#include "../../platform/country_defines.hpp" +#include "storage/storage_defines.hpp" +#include "platform/country_defines.hpp" using namespace storage; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 398dadfd3c..a581f84d63 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -13,21 +13,20 @@ #import "UIKitCategories.h" #import "UIViewController+Navigation.h" -#import "../../../3party/Alohalytics/src/alohalytics_objc.h" +#import "3party/Alohalytics/src/alohalytics_objc.h" #include "Framework.h" #include "RenderContext.hpp" -#include "../../../anim/controller.hpp" -#include "../../../gui/controller.hpp" -#include "../Statistics/Statistics.h" +#include "anim/controller.hpp" +#include "gui/controller.hpp" -#include "../../../map/country_status_display.hpp" -#include "../../../map/user_mark.hpp" +#include "map/country_status_display.hpp" +#include "map/user_mark.hpp" -#include "../../../platform/file_logging.hpp" -#include "../../../platform/platform.hpp" -#include "../../../platform/settings.hpp" +#include "platform/file_logging.hpp" +#include "platform/platform.hpp" +#include "platform/settings.hpp" extern NSString * const kAlohalyticsTapEventKey = @"$onClick"; diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h index 5f3183dc3d..1f500bc246 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.h +++ b/iphone/Maps/Classes/MapsAppDelegate.h @@ -4,7 +4,7 @@ #import "NavigationController.h" #import "MapsObservers.h" -#include "../../indexer/map_style.hpp" +#include "indexer/map_style.hpp" @class MapViewController; @class LocationManager; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index e923ce04d7..c61daa03dc 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -24,7 +24,6 @@ #include "storage/storage_defines.hpp" #import "platform/http_thread_apple.h" - #include "platform/settings.hpp" #include "platform/platform_ios.hpp" #include "platform/preferred_languages.hpp" diff --git a/iphone/Maps/Classes/MapsObservers.h b/iphone/Maps/Classes/MapsObservers.h index 6b16be5478..63d6947179 100644 --- a/iphone/Maps/Classes/MapsObservers.h +++ b/iphone/Maps/Classes/MapsObservers.h @@ -1,6 +1,6 @@ #include "Framework.h" -#include "../../storage/storage_defines.hpp" +#include "storage/storage_defines.hpp" using namespace storage; diff --git a/iphone/Maps/Classes/RenderBuffer.hpp b/iphone/Maps/Classes/RenderBuffer.hpp index 3226e98a89..8c43178752 100644 --- a/iphone/Maps/Classes/RenderBuffer.hpp +++ b/iphone/Maps/Classes/RenderBuffer.hpp @@ -1,8 +1,8 @@ #pragma once #include "RenderContext.hpp" -#include "../../../std/shared_ptr.hpp" -#include "../../../graphics/render_target.hpp" +#include "std/shared_ptr.hpp" +#include "graphics/render_target.hpp" @class CAEAGLLayer; diff --git a/iphone/Maps/Classes/RenderBuffer.mm b/iphone/Maps/Classes/RenderBuffer.mm index 77ec34c1f0..8b02d36849 100644 --- a/iphone/Maps/Classes/RenderBuffer.mm +++ b/iphone/Maps/Classes/RenderBuffer.mm @@ -1,9 +1,8 @@ #import #include "RenderBuffer.hpp" - -#include "../../../graphics/opengl/opengl.hpp" -#include "../../../graphics/coordinates.hpp" +#include "graphics/opengl/opengl.hpp" +#include "graphics/coordinates.hpp" namespace iphone { diff --git a/iphone/Maps/Classes/RenderContext.hpp b/iphone/Maps/Classes/RenderContext.hpp index 1ace05950d..70125e7fac 100644 --- a/iphone/Maps/Classes/RenderContext.hpp +++ b/iphone/Maps/Classes/RenderContext.hpp @@ -4,8 +4,8 @@ #include #include -#include "../../../graphics/opengl/gl_render_context.hpp" -#include "../../../std/shared_ptr.hpp" +#include "graphics/opengl/gl_render_context.hpp" +#include "std/shared_ptr.hpp" namespace iphone diff --git a/iphone/Maps/DownloaderParentVC.h b/iphone/Maps/DownloaderParentVC.h index 9bff8bf0a1..98673ce5fe 100644 --- a/iphone/Maps/DownloaderParentVC.h +++ b/iphone/Maps/DownloaderParentVC.h @@ -5,9 +5,8 @@ #import "UIKitCategories.h" #import "ViewController.h" -#include "../../storage/storage_defines.hpp" - -#include "../../platform/preferred_languages.hpp" +#include "storage/storage_defines.hpp" +#include "platform/preferred_languages.hpp" typedef NS_ENUM(NSUInteger, DownloaderAction) { diff --git a/iphone/Maps/DownloaderParentVC.mm b/iphone/Maps/DownloaderParentVC.mm index b90d3b3bf5..58a7f8a0a4 100644 --- a/iphone/Maps/DownloaderParentVC.mm +++ b/iphone/Maps/DownloaderParentVC.mm @@ -1,7 +1,6 @@ #import "Common.h" #import "DownloaderParentVC.h" #import "DiskFreeSpace.h" -#import "Statistics.h" #import "MWMAlertViewController.h" #include "platform/platform.hpp" diff --git a/iphone/Maps/Settings/Preferences.mm b/iphone/Maps/Settings/Preferences.mm index 1e6e403b30..1b9dcc084f 100644 --- a/iphone/Maps/Settings/Preferences.mm +++ b/iphone/Maps/Settings/Preferences.mm @@ -4,7 +4,7 @@ #import "../Classes/MapViewController.h" #import "Framework.h" -#include "../../platform/settings.hpp" +#include "platform/settings.hpp" //********************* Helper delegate to handle async dialog message ****************** @interface PrefDelegate : NSObject diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm index b5c2e240da..04ac2cc9fb 100644 --- a/iphone/Maps/Settings/SettingsViewController.mm +++ b/iphone/Maps/Settings/SettingsViewController.mm @@ -5,15 +5,16 @@ #import "LinkCell.h" #import "WebViewController.h" #import "UIKitCategories.h" -#include "../../../platform/settings.hpp" -#include "../../../platform/platform.hpp" -#include "../../../platform/preferred_languages.hpp" #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Framework.h" #import "Statistics.h" #import "MWMMapViewControlsManager.h" +#include "platform/settings.hpp" +#include "platform/platform.hpp" +#include "platform/preferred_languages.hpp" + typedef NS_ENUM(NSUInteger, Section) { SectionMetrics, diff --git a/iphone/Maps/SettingsAndMoreVC.mm b/iphone/Maps/SettingsAndMoreVC.mm index 6b10b7b376..4344f9a451 100644 --- a/iphone/Maps/SettingsAndMoreVC.mm +++ b/iphone/Maps/SettingsAndMoreVC.mm @@ -3,14 +3,15 @@ #import "UIKitCategories.h" #import #import -#include "../../platform/platform.hpp" #import "SettingsViewController.h" #import "UIViewController+Navigation.h" #import "WebViewController.h" #import "CommunityVC.h" #import "RichTextVC.h" -#import "../../3party/Alohalytics/src/alohalytics_objc.h" +#import "3party/Alohalytics/src/alohalytics_objc.h" + +#include "platform/platform.hpp" @interface SettingsAndMoreVC () diff --git a/iphone/Maps/Statistics/AppInfo.mm b/iphone/Maps/Statistics/AppInfo.mm index a56ec23896..50ede5dd82 100644 --- a/iphone/Maps/Statistics/AppInfo.mm +++ b/iphone/Maps/Statistics/AppInfo.mm @@ -4,7 +4,8 @@ #import #import #import -#include "../../../platform/settings.hpp" + +#include "platform/settings.hpp" extern string const kCountryCodeKey = "CountryCode"; extern string const kUniqueIdKey = "UniqueId"; diff --git a/iphone/Maps/Statistics/Statistics.mm b/iphone/Maps/Statistics/Statistics.mm index 7a634dde65..2b8ca92b90 100644 --- a/iphone/Maps/Statistics/Statistics.mm +++ b/iphone/Maps/Statistics/Statistics.mm @@ -1,9 +1,9 @@ - #import "Statistics.h" -#include "../../../platform/settings.hpp" #import "Flurry.h" #import "AppInfo.h" +#include "platform/settings.hpp" + @implementation Statistics - (void)startSessionWithLaunchOptions:(NSDictionary *)launchOptions diff --git a/iphone/Maps/main.mm b/iphone/Maps/main.mm index 0bd9cec366..bc57b5d77f 100644 --- a/iphone/Maps/main.mm +++ b/iphone/Maps/main.mm @@ -3,9 +3,9 @@ #import #import "Common.h" -#include "../../platform/file_logging.hpp" -#include "../../platform/platform.hpp" -#include "../../platform/settings.hpp" +#include "platform/file_logging.hpp" +#include "platform/platform.hpp" +#include "platform/settings.hpp" int main(int argc, char * argv[]) { -- cgit v1.2.3