Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/iphone
diff options
context:
space:
mode:
authorIlya Grechuhin <i.grechuhin@mapswithme.com>2015-09-18 18:13:48 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:06:34 +0300
commit838054feadf0f3ef61b35cb2f24adad229a9fc4c (patch)
tree52668f9c5658d7b573f6a6293e505667d181f908 /iphone
parent87e1c2abce165278fda2e6ea2387dae02b734c4b (diff)
[ios] Standardized Framework.h includes.
Diffstat (limited to 'iphone')
-rw-r--r--iphone/Maps/Bookmarks/AddSetVC.mm3
-rw-r--r--iphone/Maps/Bookmarks/SelectSetVC.mm3
-rw-r--r--iphone/Maps/Classes/LocalNotificationManager.mm3
-rw-r--r--iphone/Maps/Classes/LocationPredictor.mm4
-rw-r--r--iphone/Maps/Classes/MWMPlacePageEntity.h2
-rw-r--r--iphone/Maps/Classes/RouteState/RouteState.mm3
-rw-r--r--iphone/Maps/Settings/Preferences.mm5
-rw-r--r--iphone/Maps/Settings/SettingsViewController.mm3
8 files changed, 15 insertions, 11 deletions
diff --git a/iphone/Maps/Bookmarks/AddSetVC.mm b/iphone/Maps/Bookmarks/AddSetVC.mm
index a59d774e73..37bc3ea163 100644
--- a/iphone/Maps/Bookmarks/AddSetVC.mm
+++ b/iphone/Maps/Bookmarks/AddSetVC.mm
@@ -1,8 +1,9 @@
#import "AddSetVC.h"
-#import "Framework.h"
#import "UIViewController+Navigation.h"
+#include "Framework.h"
+
#define TEXT_FIELD_TAG 666
@implementation AddSetVC
diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm
index 3dcd95d1ce..3d92b8201b 100644
--- a/iphone/Maps/Bookmarks/SelectSetVC.mm
+++ b/iphone/Maps/Bookmarks/SelectSetVC.mm
@@ -1,11 +1,12 @@
#import "SelectSetVC.h"
-#import "Framework.h"
#import "AddSetVC.h"
#import "MWMPlacePageViewManager.h"
#import "MWMPlacePageEntity.h"
#import "UIViewController+Navigation.h"
+#include "Framework.h"
+
@interface SelectSetVC () <AddSetVCDelegate>
@property (weak, nonatomic) MWMPlacePageViewManager * manager;
diff --git a/iphone/Maps/Classes/LocalNotificationManager.mm b/iphone/Maps/Classes/LocalNotificationManager.mm
index e98e4c0b4b..6a1eb3f537 100644
--- a/iphone/Maps/Classes/LocalNotificationManager.mm
+++ b/iphone/Maps/Classes/LocalNotificationManager.mm
@@ -1,5 +1,4 @@
#import "Common.h"
-#import "Framework.h"
#import "LocalNotificationManager.h"
#import "LocationManager.h"
#import "MapsAppDelegate.h"
@@ -9,6 +8,8 @@
#import "3party/Alohalytics/src/alohalytics_objc.h"
+#include "Framework.h"
+
#include "platform/platform.hpp"
#include "storage/storage_defines.hpp"
diff --git a/iphone/Maps/Classes/LocationPredictor.mm b/iphone/Maps/Classes/LocationPredictor.mm
index 25c2b5e799..2fed7c2f83 100644
--- a/iphone/Maps/Classes/LocationPredictor.mm
+++ b/iphone/Maps/Classes/LocationPredictor.mm
@@ -1,11 +1,11 @@
#import "LocationPredictor.h"
-#import "Framework.h"
+
+#include "Framework.h"
#include "base/timer.hpp"
#include "map/location_state.hpp"
-
namespace
{
NSTimeInterval const PREDICTION_INTERVAL = 0.2; // in seconds
diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.h b/iphone/Maps/Classes/MWMPlacePageEntity.h
index c44e49557a..82e6e73625 100644
--- a/iphone/Maps/Classes/MWMPlacePageEntity.h
+++ b/iphone/Maps/Classes/MWMPlacePageEntity.h
@@ -1,6 +1,6 @@
#import <Foundation/Foundation.h>
-#import "Framework.h"
+#include "Framework.h"
#include "map/user_mark.hpp"
diff --git a/iphone/Maps/Classes/RouteState/RouteState.mm b/iphone/Maps/Classes/RouteState/RouteState.mm
index f4087fef81..13eee66d9e 100644
--- a/iphone/Maps/Classes/RouteState/RouteState.mm
+++ b/iphone/Maps/Classes/RouteState/RouteState.mm
@@ -1,5 +1,6 @@
#import "RouteState.h"
-#import "Framework.h"
+
+#include "Framework.h"
static NSString * const kEndPointKey = @"endPoint";
static NSString * const kETAKey = @"eta";
diff --git a/iphone/Maps/Settings/Preferences.mm b/iphone/Maps/Settings/Preferences.mm
index 1b9dcc084f..d080b3402e 100644
--- a/iphone/Maps/Settings/Preferences.mm
+++ b/iphone/Maps/Settings/Preferences.mm
@@ -1,8 +1,7 @@
#import "Preferences.h"
-#import <Foundation/Foundation.h>
-#import <UIKit/UIAlertView.h>
#import "../Classes/MapViewController.h"
-#import "Framework.h"
+
+#include "Framework.h"
#include "platform/settings.hpp"
diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm
index b1fc9da54c..a3863a5185 100644
--- a/iphone/Maps/Settings/SettingsViewController.mm
+++ b/iphone/Maps/Settings/SettingsViewController.mm
@@ -6,10 +6,11 @@
#import "WebViewController.h"
#import "MapViewController.h"
#import "MapsAppDelegate.h"
-#import "Framework.h"
#import "Statistics.h"
#import "MWMMapViewControlsManager.h"
+#include "Framework.h"
+
#include "platform/settings.hpp"
#include "platform/platform.hpp"
#include "platform/preferred_languages.hpp"