Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Rename Objective-C++ headers back to .h #6020

Merged
merged 2 commits into from
Aug 17, 2016
Merged

Rename Objective-C++ headers back to .h #6020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5539a90
[ios, macos] Renamed Objective-C++ headers to .h
1ec5 Aug 15, 2016
0062cf2
[ios, macos] Added MGLBaseStyleLayer_Private.h to project
1ec5 Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLBackgroundStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
6 changes: 3 additions & 3 deletions platform/darwin/src/MGLBaseStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
0 .../darwin/src/MGLBaseStyleLayer_Private.hpp → ...rm/darwin/src/MGLBaseStyleLayer_Private.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLCircleStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLFillStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion platform/darwin/src/MGLGeoJSONSource.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "MGLGeoJSONSource.h"

#import "MGLSource_Private.hpp"
#import "MGLSource_Private.h"

#include <mbgl/style/sources/geojson_source.hpp>

Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLLineStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion platform/darwin/src/MGLRasterSource.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "MGLRasterSource.h"

#import "MGLSource_Private.hpp"
#import "MGLSource_Private.h"

#include <mbgl/style/sources/raster_source.hpp>

Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLRasterStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
0 platform/darwin/src/MGLSource_Private.hpp → platform/darwin/src/MGLSource_Private.h
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions platform/darwin/src/MGLStyle.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "MGLStyle.h"

#import "MGLMapView_Private.hpp"
#import "MGLMapView_Private.h"
#import "MGLStyleLayer.h"
#import "MGLFillStyleLayer.h"
#import "MGLLineStyleLayer.h"
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLStyleAttribute.hpp → platform/darwin/src/MGLStyleAttribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
6 changes: 3 additions & 3 deletions platform/darwin/src/MGLStyleAttribute.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions platform/darwin/src/MGLStyleAttributeFunction.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...src/MGLStyleAttributeFunction_Private.hpp → ...n/src/MGLStyleAttributeFunction_Private.h
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...in/src/MGLStyleAttributeValue_Private.hpp → ...rwin/src/MGLStyleAttributeValue_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLStyleLayer.mm.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
30 changes: 30 additions & 0 deletions platform/darwin/src/MGLStyleLayer_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
30 changes: 0 additions & 30 deletions platform/darwin/src/MGLStyleLayer_Private.hpp
View file
Open in desktop

This file was deleted.

0 platform/darwin/src/MGLStyle_Private.hpp → platform/darwin/src/MGLStyle_Private.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLSymbolStyleLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/NSArray+MGLStyleAttributeAdditions.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
0 ...ay+MGLStyleAttributeAdditions_Private.hpp → ...rray+MGLStyleAttributeAdditions_Private.h
View file
Open in desktop
File renamed without changes.
0 ...or+MGLStyleAttributeAdditions_Private.hpp → ...olor+MGLStyleAttributeAdditions_Private.h
View file
Open in desktop
File renamed without changes.
0 ...er+MGLStyleAttributeAdditions_Private.hpp → ...mber+MGLStyleAttributeAdditions_Private.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion platform/darwin/src/NSString+MGLStyleAttributeAdditions.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "NSString+MGLStyleAttributeAdditions.h"

#import "NSString+MGLStyleAttributeAdditions_Private.hpp"
#import "NSString+MGLStyleAttributeAdditions_Private.h"

@implementation NSString (MGLStyleAttributeAdditions)

Expand Down
0 ...ng+MGLStyleAttributeAdditions_Private.hpp → ...ring+MGLStyleAttributeAdditions_Private.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "NSValue+MGLStyleAttributeAdditions.h"

#import "NSValue+MGLStyleAttributeAdditions_Private.hpp"
#import "NSValue+MGLStyleAttributeAdditions_Private.h"

@implementation NSValue (MGLStyleAttributeAdditions)

Expand Down
0 ...ue+MGLStyleAttributeAdditions_Private.hpp → ...alue+MGLStyleAttributeAdditions_Private.h
View file
Open in desktop
File renamed without changes.
0 ...or+MGLStyleAttributeAdditions_Private.hpp → ...olor+MGLStyleAttributeAdditions_Private.h
View file
Open in desktop
File renamed without changes.
Loading