[ios, macos] Renamed Objective-C++ headers to .h

Also removed a redundant reference to MGLStyle_Private.h in ios.xcodeproj.

Fixes #5952.

31 files changed, 70 insertions, 69 deletions

diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
index 80f803815c..5ba581869b 100644
--- a/platform/darwin/src/MGLBackgroundStyleLayer.mm
+++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -1,8 +1,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGLBackgroundStyleLayer.h"
 
diff --git a/platform/darwin/src/MGLBaseStyleLayer.mm b/platform/darwin/src/MGLBaseStyleLayer.mm
index 6e13bd29fd..d9d57d661a 100644
--- a/platform/darwin/src/MGLBaseStyleLayer.mm
+++ b/platform/darwin/src/MGLBaseStyleLayer.mm
@@ -1,8 +1,8 @@
 #import "MGLBaseStyleLayer.h"
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
-#import "MGLMapView_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
+#import "MGLMapView_Private.h"
 
 #include <mbgl/style/layer.hpp>
 
diff --git a/platform/darwin/src/MGLBaseStyleLayer_Private.hpp b/platform/darwin/src/MGLBaseStyleLayer_Private.h
index e3d43906a4..e3d43906a4 100644
--- a/platform/darwin/src/MGLBaseStyleLayer_Private.hpp
+++ b/platform/darwin/src/MGLBaseStyleLayer_Private.h
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
index 783b80e77f..d655297131 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -1,8 +1,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGLCircleStyleLayer.h"
 
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index 7127c3a5de..a9c771827f 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -1,8 +1,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGLFillStyleLayer.h"
 
diff --git a/platform/darwin/src/MGLGeoJSONSource.mm b/platform/darwin/src/MGLGeoJSONSource.mm
index 957f632855..202b6409aa 100644
--- a/platform/darwin/src/MGLGeoJSONSource.mm
+++ b/platform/darwin/src/MGLGeoJSONSource.mm
@@ -1,6 +1,6 @@
 #import "MGLGeoJSONSource.h"
 
-#import "MGLSource_Private.hpp"
+#import "MGLSource_Private.h"
 
 #include <mbgl/style/sources/geojson_source.hpp>
 
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index de802a490b..b4ab97e679 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -1,8 +1,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGLLineStyleLayer.h"
 
diff --git a/platform/darwin/src/MGLRasterSource.mm b/platform/darwin/src/MGLRasterSource.mm
index b3e474f36f..ad2530fc82 100644
--- a/platform/darwin/src/MGLRasterSource.mm
+++ b/platform/darwin/src/MGLRasterSource.mm
@@ -1,6 +1,6 @@
 #import "MGLRasterSource.h"
 
-#import "MGLSource_Private.hpp"
+#import "MGLSource_Private.h"
 
 #include <mbgl/style/sources/raster_source.hpp>
 
diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm
index fc2a407054..c15ebd1d45 100644
--- a/platform/darwin/src/MGLRasterStyleLayer.mm
+++ b/platform/darwin/src/MGLRasterStyleLayer.mm
@@ -1,8 +1,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGLRasterStyleLayer.h"
 
diff --git a/platform/darwin/src/MGLSource_Private.hpp b/platform/darwin/src/MGLSource_Private.h
index bbbd556635..bbbd556635 100644
--- a/platform/darwin/src/MGLSource_Private.hpp
+++ b/platform/darwin/src/MGLSource_Private.h
diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm
index c75572052b..39b66acd7a 100644
--- a/platform/darwin/src/MGLStyle.mm
+++ b/platform/darwin/src/MGLStyle.mm
@@ -1,6 +1,6 @@
 #import "MGLStyle.h"
 
-#import "MGLMapView_Private.hpp"
+#import "MGLMapView_Private.h"
 #import "MGLStyleLayer.h"
 #import "MGLFillStyleLayer.h"
 #import "MGLLineStyleLayer.h"
@@ -9,12 +9,12 @@
 #import "MGLRasterStyleLayer.h"
 #import "MGLBackgroundStyleLayer.h"
 
-#import "MGLStyle_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
-#import "MGLSource_Private.hpp"
+#import "MGLStyle_Private.h"
+#import "MGLStyleLayer_Private.h"
+#import "MGLSource_Private.h"
 #import "MGLSource.h"
 
-#import <mbgl/util/default_styles.hpp>
+#include <mbgl/util/default_styles.hpp>
 #include <mbgl/style/layers/fill_layer.hpp>
 #include <mbgl/style/layers/line_layer.hpp>
 #include <mbgl/style/layers/symbol_layer.hpp>
diff --git a/platform/darwin/src/MGLStyleAttribute.hpp b/platform/darwin/src/MGLStyleAttribute.h
index 1f9207f05a..4f2424201e 100644
--- a/platform/darwin/src/MGLStyleAttribute.hpp
+++ b/platform/darwin/src/MGLStyleAttribute.h
@@ -1,8 +1,8 @@
 #import <Foundation/Foundation.h>
 
 #import "MGLStyleAttributeValue.h"
-#import "MGLStyleLayer_Private.hpp"
-#import "MGLStyleAttributeValue_Private.hpp"
+#import "MGLStyleLayer_Private.h"
+#import "MGLStyleAttributeValue_Private.h"
 
 @interface MGLStyleAttribute : NSObject <MGLStyleAttributeValue>
 
diff --git a/platform/darwin/src/MGLStyleAttribute.mm b/platform/darwin/src/MGLStyleAttribute.mm
index 32c0f4e71e..a30ef534f4 100644
--- a/platform/darwin/src/MGLStyleAttribute.mm
+++ b/platform/darwin/src/MGLStyleAttribute.mm
@@ -1,7 +1,7 @@
-#import "MGLStyleAttribute.hpp"
+#import "MGLStyleAttribute.h"
 
-#import "MGLStyleAttributeValue_Private.hpp"
-#import "MGLStyleAttributeFunction_Private.hpp"
+#import "MGLStyleAttributeValue_Private.h"
+#import "MGLStyleAttributeFunction_Private.h"
 
 @interface MGLStyleAttribute()
 @end
diff --git a/platform/darwin/src/MGLStyleAttributeFunction.mm b/platform/darwin/src/MGLStyleAttributeFunction.mm
index d97f8b720f..5216e32d97 100644
--- a/platform/darwin/src/MGLStyleAttributeFunction.mm
+++ b/platform/darwin/src/MGLStyleAttributeFunction.mm
@@ -1,8 +1,8 @@
 #import "MGLStyleAttributeFunction.h"
 
-#import "MGLStyleLayer_Private.hpp"
-#import "MGLStyleAttributeValue_Private.hpp"
-#import "MGLStyleAttributeFunction_Private.hpp"
+#import "MGLStyleLayer_Private.h"
+#import "MGLStyleAttributeValue_Private.h"
+#import "MGLStyleAttributeFunction_Private.h"
 
 @interface MGLStyleAttributeFunction() <MGLStyleAttributeValue_Private>
 @end
diff --git a/platform/darwin/src/MGLStyleAttributeFunction_Private.hpp b/platform/darwin/src/MGLStyleAttributeFunction_Private.h
index a75e17483d..a75e17483d 100644
--- a/platform/darwin/src/MGLStyleAttributeFunction_Private.hpp
+++ b/platform/darwin/src/MGLStyleAttributeFunction_Private.h
diff --git a/platform/darwin/src/MGLStyleAttributeValue_Private.hpp b/platform/darwin/src/MGLStyleAttributeValue_Private.h
index a3c8a1a149..5fd51d09cf 100644
--- a/platform/darwin/src/MGLStyleAttributeValue_Private.hpp
+++ b/platform/darwin/src/MGLStyleAttributeValue_Private.h
@@ -1,7 +1,8 @@
 #import <Foundation/Foundation.h>
 
 #import "MGLTypes.h"
-#import "MGLStyleAttributeFunction_Private.hpp"
+#import "MGLStyleAttributeFunction_Private.h"
+
 #include <array>
 
 @protocol MGLStyleAttributeValue_Private <NSObject>
diff --git a/platform/darwin/src/MGLStyleLayer.mm b/platform/darwin/src/MGLStyleLayer.mm
index cacc11380a..6703226cba 100644
--- a/platform/darwin/src/MGLStyleLayer.mm
+++ b/platform/darwin/src/MGLStyleLayer.mm
@@ -1,5 +1,5 @@
 #import "MGLStyleLayer.h"
 
 #import "MGLTypes.h"
-#import "MGLStyleLayer_Private.hpp"
-#import "MGLMapView_Private.hpp"
+#import "MGLStyleLayer_Private.h"
+#import "MGLMapView_Private.h"
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index cf0cbc6e1a..c35d254caf 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -6,8 +6,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGL<%- camelize(type) %>StyleLayer.h"
 
diff --git a/platform/darwin/src/MGLStyleLayer_Private.h b/platform/darwin/src/MGLStyleLayer_Private.h
new file mode 100644
index 0000000000..bc3d87bcb7
--- /dev/null
+++ b/platform/darwin/src/MGLStyleLayer_Private.h
@@ -0,0 +1,30 @@
+#import <Foundation/Foundation.h>
+#include <mbgl/style/layer.hpp>
+
+#import "MGLStyleLayer.h"
+#import "MGLStyleAttribute.h"
+
+#import "NSNumber+MGLStyleAttributeAdditions_Private.h"
+#import "NSArray+MGLStyleAttributeAdditions_Private.h"
+#import "NSString+MGLStyleAttributeAdditions_Private.h"
+#import "NSValue+MGLStyleAttributeAdditions_Private.h"
+#import "MGLStyleAttributeFunction_Private.h"
+#import "MGLStyleAttributeValue_Private.h"
+
+#if TARGET_OS_IPHONE
+    #import "UIColor+MGLAdditions.h"
+    #import "UIColor+MGLStyleAttributeAdditions_Private.h"
+#else
+    #import "NSColor+MGLAdditions.h"
+    #import "NSColor+MGLStyleAttributeAdditions_Private.h"
+#endif
+
+@class MGLMapView;
+
+@protocol MGLStyleLayer_Private <MGLStyleLayer>
+
+@property (nonatomic, weak) MGLMapView *mapView;
+@property (nonatomic, readwrite, copy) NSString *layerIdentifier;
+@property (nonatomic) mbgl::style::Layer *layer;
+
+@end
diff --git a/platform/darwin/src/MGLStyleLayer_Private.hpp b/platform/darwin/src/MGLStyleLayer_Private.hpp
deleted file mode 100644
index b62093d321..0000000000
--- a/platform/darwin/src/MGLStyleLayer_Private.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#import <Foundation/Foundation.h>
-#include <mbgl/style/layer.hpp>
-
-#import "MGLStyleLayer.h"
-#import "MGLStyleAttribute.hpp"
-
-#import "NSNumber+MGLStyleAttributeAdditions_Private.hpp"
-#import "NSArray+MGLStyleAttributeAdditions_Private.hpp"
-#import "NSString+MGLStyleAttributeAdditions_Private.hpp"
-#import "NSValue+MGLStyleAttributeAdditions_Private.hpp"
-#import "MGLStyleAttributeFunction_Private.hpp"
-#import "MGLStyleAttributeValue_Private.hpp"
-
-#if TARGET_OS_IPHONE
-#import "UIColor+MGLAdditions.hpp"
-#import "UIColor+MGLStyleAttributeAdditions_Private.hpp"
-#else
-#import "NSColor+MGLAdditions.hpp"
-#import "NSColor+MGLStyleAttributeAdditions_Private.hpp"
-#endif
-
-@class MGLMapView;
-
-@protocol MGLStyleLayer_Private <MGLStyleLayer>
-
-@property (nonatomic, weak) MGLMapView *mapView;
-@property (nonatomic, readwrite, copy) NSString *layerIdentifier;
-@property (nonatomic) mbgl::style::Layer *layer;
-
-@end
diff --git a/platform/darwin/src/MGLStyle_Private.hpp b/platform/darwin/src/MGLStyle_Private.h
index ed0122bf73..ed0122bf73 100644
--- a/platform/darwin/src/MGLStyle_Private.hpp
+++ b/platform/darwin/src/MGLStyle_Private.h
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
index 030ed81e44..c15a869c00 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -1,8 +1,8 @@
 // This file is generated. 
 // Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
 
-#import "MGLBaseStyleLayer_Private.hpp"
-#import "MGLStyleLayer_Private.hpp"
+#import "MGLBaseStyleLayer_Private.h"
+#import "MGLStyleLayer_Private.h"
 #import "MGLStyleAttributeValue.h"
 #import "MGLSymbolStyleLayer.h"
 
diff --git a/platform/darwin/src/NSArray+MGLStyleAttributeAdditions.mm b/platform/darwin/src/NSArray+MGLStyleAttributeAdditions.mm
index c0c9a4027a..1456068938 100644
--- a/platform/darwin/src/NSArray+MGLStyleAttributeAdditions.mm
+++ b/platform/darwin/src/NSArray+MGLStyleAttributeAdditions.mm
@@ -1,7 +1,7 @@
 #import "NSArray+MGLStyleAttributeAdditions.h"
 
-#import "NSArray+MGLStyleAttributeAdditions_Private.hpp"
-#import "MGLStyleAttributeValue_Private.hpp"
+#import "NSArray+MGLStyleAttributeAdditions_Private.h"
+#import "MGLStyleAttributeValue_Private.h"
 
 #include <array>
 
diff --git a/platform/darwin/src/NSArray+MGLStyleAttributeAdditions_Private.hpp b/platform/darwin/src/NSArray+MGLStyleAttributeAdditions_Private.h
index 1be02c01d2..1be02c01d2 100644
--- a/platform/darwin/src/NSArray+MGLStyleAttributeAdditions_Private.hpp
+++ b/platform/darwin/src/NSArray+MGLStyleAttributeAdditions_Private.h
diff --git a/platform/darwin/src/NSColor+MGLStyleAttributeAdditions_Private.hpp b/platform/darwin/src/NSColor+MGLStyleAttributeAdditions_Private.h
index 9a714cbd83..9a714cbd83 100644
--- a/platform/darwin/src/NSColor+MGLStyleAttributeAdditions_Private.hpp
+++ b/platform/darwin/src/NSColor+MGLStyleAttributeAdditions_Private.h
diff --git a/platform/darwin/src/NSNumber+MGLStyleAttributeAdditions_Private.hpp b/platform/darwin/src/NSNumber+MGLStyleAttributeAdditions_Private.h
index 73e40bb3ad..73e40bb3ad 100644
--- a/platform/darwin/src/NSNumber+MGLStyleAttributeAdditions_Private.hpp
+++ b/platform/darwin/src/NSNumber+MGLStyleAttributeAdditions_Private.h
diff --git a/platform/darwin/src/NSString+MGLStyleAttributeAdditions.mm b/platform/darwin/src/NSString+MGLStyleAttributeAdditions.mm
index 84453217ab..ff88f5501a 100644
--- a/platform/darwin/src/NSString+MGLStyleAttributeAdditions.mm
+++ b/platform/darwin/src/NSString+MGLStyleAttributeAdditions.mm
@@ -1,6 +1,6 @@
 #import "NSString+MGLStyleAttributeAdditions.h"
 
-#import "NSString+MGLStyleAttributeAdditions_Private.hpp"
+#import "NSString+MGLStyleAttributeAdditions_Private.h"
 
 @implementation NSString (MGLStyleAttributeAdditions)
 
diff --git a/platform/darwin/src/NSString+MGLStyleAttributeAdditions_Private.hpp b/platform/darwin/src/NSString+MGLStyleAttributeAdditions_Private.h
index 8e401e2996..8e401e2996 100644
--- a/platform/darwin/src/NSString+MGLStyleAttributeAdditions_Private.hpp
+++ b/platform/darwin/src/NSString+MGLStyleAttributeAdditions_Private.h
diff --git a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
index 3349ca211f..633a74d276 100644
--- a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
+++ b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
@@ -1,6 +1,6 @@
 #import "NSValue+MGLStyleAttributeAdditions.h"
 
-#import "NSValue+MGLStyleAttributeAdditions_Private.hpp"
+#import "NSValue+MGLStyleAttributeAdditions_Private.h"
 
 @implementation NSValue (MGLStyleAttributeAdditions)
 
diff --git a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.hpp b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h
index 5bca9407ac..5bca9407ac 100644
--- a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.hpp
+++ b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h
diff --git a/platform/darwin/src/UIColor+MGLStyleAttributeAdditions_Private.hpp b/platform/darwin/src/UIColor+MGLStyleAttributeAdditions_Private.h
index ef886dca5d..ef886dca5d 100644
--- a/platform/darwin/src/UIColor+MGLStyleAttributeAdditions_Private.hpp
+++ b/platform/darwin/src/UIColor+MGLStyleAttributeAdditions_Private.h