diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-16 16:49:29 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-17 10:16:22 -0800 |
commit | a7e4e6bb1c738f20f8585249fe3ab61cbbf85f71 (patch) | |
tree | 3dad4e104afa95af55860cbbafac6adc8d801048 | |
parent | 7a4e7376e1422964cb7a456f772104e28003f4d2 (diff) | |
download | qtlocation-mapboxgl-a7e4e6bb1c738f20f8585249fe3ab61cbbf85f71.tar.gz |
[ios] Move source to src folder, matching osx
-rw-r--r-- | gyp/platform-ios.gypi | 34 | ||||
-rw-r--r-- | platform/ios/src/MGLAccountManager.m (renamed from platform/ios/MGLAccountManager.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLAccountManager_Private.h (renamed from platform/ios/MGLAccountManager_Private.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLAnnotationImage.m (renamed from platform/ios/MGLAnnotationImage.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLAnnotationImage_Private.h (renamed from platform/ios/MGLAnnotationImage_Private.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLCategoryLoader.h (renamed from platform/ios/MGLCategoryLoader.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLCategoryLoader.m (renamed from platform/ios/MGLCategoryLoader.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm (renamed from platform/ios/MGLMapView.mm) | 4 | ||||
-rw-r--r-- | platform/ios/src/MGLMapboxEvents.h (renamed from platform/ios/MGLMapboxEvents.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLMapboxEvents.m (renamed from platform/ios/MGLMapboxEvents.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocation.m (renamed from platform/ios/MGLUserLocation.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocationAnnotationView.h (renamed from platform/ios/MGLUserLocationAnnotationView.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocationAnnotationView.m (renamed from platform/ios/MGLUserLocationAnnotationView.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocation_Private.h (renamed from platform/ios/MGLUserLocation_Private.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/NSBundle+MGLAdditions.h (renamed from platform/ios/NSBundle+MGLAdditions.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/NSBundle+MGLAdditions.m (renamed from platform/ios/NSBundle+MGLAdditions.m) | 0 | ||||
-rw-r--r-- | platform/ios/src/NSProcessInfo+MGLAdditions.h (renamed from platform/ios/NSProcessInfo+MGLAdditions.h) | 0 | ||||
-rw-r--r-- | platform/ios/src/NSProcessInfo+MGLAdditions.m (renamed from platform/ios/NSProcessInfo+MGLAdditions.m) | 0 |
18 files changed, 19 insertions, 19 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 22a44dd31a..8707a4272f 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -46,29 +46,29 @@ '../include/mbgl/darwin/MGLMapCamera.h', '../platform/darwin/MGLMapCamera.mm', '../include/mbgl/ios/Mapbox.h', - '../platform/ios/MGLMapboxEvents.h', - '../platform/ios/MGLMapboxEvents.m', + '../platform/ios/src/MGLMapboxEvents.h', + '../platform/ios/src/MGLMapboxEvents.m', '../include/mbgl/ios/MGLMapView.h', '../include/mbgl/ios/MGLMapView+IBAdditions.h', '../include/mbgl/ios/MGLMapView+MGLCustomStyleLayerAdditions.h', - '../platform/ios/MGLMapView.mm', + '../platform/ios/src/MGLMapView.mm', '../include/mbgl/ios/MGLAccountManager.h', - '../platform/ios/MGLAccountManager_Private.h', - '../platform/ios/MGLAccountManager.m', + '../platform/ios/src/MGLAccountManager_Private.h', + '../platform/ios/src/MGLAccountManager.m', '../include/mbgl/ios/MGLUserLocation.h', - '../platform/ios/MGLUserLocation_Private.h', - '../platform/ios/MGLUserLocation.m', - '../platform/ios/MGLUserLocationAnnotationView.h', - '../platform/ios/MGLUserLocationAnnotationView.m', + '../platform/ios/src/MGLUserLocation_Private.h', + '../platform/ios/src/MGLUserLocation.m', + '../platform/ios/src/MGLUserLocationAnnotationView.h', + '../platform/ios/src/MGLUserLocationAnnotationView.m', '../include/mbgl/ios/MGLAnnotationImage.h', - '../platform/ios/MGLAnnotationImage_Private.h', - '../platform/ios/MGLAnnotationImage.m', - '../platform/ios/MGLCategoryLoader.h', - '../platform/ios/MGLCategoryLoader.m', - '../platform/ios/NSBundle+MGLAdditions.h', - '../platform/ios/NSBundle+MGLAdditions.m', - '../platform/ios/NSProcessInfo+MGLAdditions.h', - '../platform/ios/NSProcessInfo+MGLAdditions.m', + '../platform/ios/src/MGLAnnotationImage_Private.h', + '../platform/ios/src/MGLAnnotationImage.m', + '../platform/ios/src/MGLCategoryLoader.h', + '../platform/ios/src/MGLCategoryLoader.m', + '../platform/ios/src/NSBundle+MGLAdditions.h', + '../platform/ios/src/NSBundle+MGLAdditions.m', + '../platform/ios/src/NSProcessInfo+MGLAdditions.h', + '../platform/ios/src/NSProcessInfo+MGLAdditions.m', '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', '../platform/ios/vendor/Fabric/FABAttributes.h', diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/src/MGLAccountManager.m index 8bfe1d68b3..8bfe1d68b3 100644 --- a/platform/ios/MGLAccountManager.m +++ b/platform/ios/src/MGLAccountManager.m diff --git a/platform/ios/MGLAccountManager_Private.h b/platform/ios/src/MGLAccountManager_Private.h index 3cc05b09f0..3cc05b09f0 100644 --- a/platform/ios/MGLAccountManager_Private.h +++ b/platform/ios/src/MGLAccountManager_Private.h diff --git a/platform/ios/MGLAnnotationImage.m b/platform/ios/src/MGLAnnotationImage.m index 374ed162fb..374ed162fb 100644 --- a/platform/ios/MGLAnnotationImage.m +++ b/platform/ios/src/MGLAnnotationImage.m diff --git a/platform/ios/MGLAnnotationImage_Private.h b/platform/ios/src/MGLAnnotationImage_Private.h index f22a9ac4e2..f22a9ac4e2 100644 --- a/platform/ios/MGLAnnotationImage_Private.h +++ b/platform/ios/src/MGLAnnotationImage_Private.h diff --git a/platform/ios/MGLCategoryLoader.h b/platform/ios/src/MGLCategoryLoader.h index 874450d148..874450d148 100644 --- a/platform/ios/MGLCategoryLoader.h +++ b/platform/ios/src/MGLCategoryLoader.h diff --git a/platform/ios/MGLCategoryLoader.m b/platform/ios/src/MGLCategoryLoader.m index 50309436b7..50309436b7 100644 --- a/platform/ios/MGLCategoryLoader.m +++ b/platform/ios/src/MGLCategoryLoader.m diff --git a/platform/ios/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 63bd41e7d6..e506ce16fa 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -27,8 +27,8 @@ #include <mbgl/util/default_styles.hpp> #import "Mapbox.h" -#import "../darwin/MGLGeometry_Private.h" -#import "../darwin/MGLMultiPoint_Private.h" +#import "../../darwin/MGLGeometry_Private.h" +#import "../../darwin/MGLMultiPoint_Private.h" #import "NSBundle+MGLAdditions.h" #import "NSString+MGLAdditions.h" diff --git a/platform/ios/MGLMapboxEvents.h b/platform/ios/src/MGLMapboxEvents.h index 920a2227fd..920a2227fd 100644 --- a/platform/ios/MGLMapboxEvents.h +++ b/platform/ios/src/MGLMapboxEvents.h diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index 259cfb3def..259cfb3def 100644 --- a/platform/ios/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m diff --git a/platform/ios/MGLUserLocation.m b/platform/ios/src/MGLUserLocation.m index 36d71c13b0..36d71c13b0 100644 --- a/platform/ios/MGLUserLocation.m +++ b/platform/ios/src/MGLUserLocation.m diff --git a/platform/ios/MGLUserLocationAnnotationView.h b/platform/ios/src/MGLUserLocationAnnotationView.h index 1eb50b7740..1eb50b7740 100644 --- a/platform/ios/MGLUserLocationAnnotationView.h +++ b/platform/ios/src/MGLUserLocationAnnotationView.h diff --git a/platform/ios/MGLUserLocationAnnotationView.m b/platform/ios/src/MGLUserLocationAnnotationView.m index cc4f58804c..cc4f58804c 100644 --- a/platform/ios/MGLUserLocationAnnotationView.m +++ b/platform/ios/src/MGLUserLocationAnnotationView.m diff --git a/platform/ios/MGLUserLocation_Private.h b/platform/ios/src/MGLUserLocation_Private.h index 48f6d40e8c..48f6d40e8c 100644 --- a/platform/ios/MGLUserLocation_Private.h +++ b/platform/ios/src/MGLUserLocation_Private.h diff --git a/platform/ios/NSBundle+MGLAdditions.h b/platform/ios/src/NSBundle+MGLAdditions.h index a86e85f79b..a86e85f79b 100644 --- a/platform/ios/NSBundle+MGLAdditions.h +++ b/platform/ios/src/NSBundle+MGLAdditions.h diff --git a/platform/ios/NSBundle+MGLAdditions.m b/platform/ios/src/NSBundle+MGLAdditions.m index d5842ea596..d5842ea596 100644 --- a/platform/ios/NSBundle+MGLAdditions.m +++ b/platform/ios/src/NSBundle+MGLAdditions.m diff --git a/platform/ios/NSProcessInfo+MGLAdditions.h b/platform/ios/src/NSProcessInfo+MGLAdditions.h index b97979ddb4..b97979ddb4 100644 --- a/platform/ios/NSProcessInfo+MGLAdditions.h +++ b/platform/ios/src/NSProcessInfo+MGLAdditions.h diff --git a/platform/ios/NSProcessInfo+MGLAdditions.m b/platform/ios/src/NSProcessInfo+MGLAdditions.m index 1f12f7256e..1f12f7256e 100644 --- a/platform/ios/NSProcessInfo+MGLAdditions.m +++ b/platform/ios/src/NSProcessInfo+MGLAdditions.m |