diff options
author | Jordan Kiley <jmkiley@users.noreply.github.com> | 2018-02-16 16:20:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-16 16:20:08 -0800 |
commit | 9459cf6a91f98266f77960a8cf328cb9c0ec3034 (patch) | |
tree | 2f367251cd4440585e760a1ee48260eb8dc80ad8 /platform/macos | |
parent | 604931247e8c78570058981ea17c034947c4430f (diff) | |
download | qtlocation-mapboxgl-9459cf6a91f98266f77960a8cf328cb9c0ec3034.tar.gz |
[ios, macos] Mark deprecated methods as unavailable (#11205)
Fixes #10735
Diffstat (limited to 'platform/macos')
-rw-r--r-- | platform/macos/CHANGELOG.md | 1 | ||||
-rw-r--r-- | platform/macos/app/Base.lproj/MainMenu.xib | 10 | ||||
-rw-r--r-- | platform/macos/app/Base.lproj/MapDocument.xib | 17 | ||||
-rw-r--r-- | platform/macos/app/MapDocument.m | 14 |
4 files changed, 7 insertions, 35 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index 316e09b5ae..06fedf7cc7 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -31,6 +31,7 @@ * Added Danish and Hebrew localizations. ([#10967](https://github.com/mapbox/mapbox-gl-native/pull/10967), [#11136](https://github.com/mapbox/mapbox-gl-native/pull/11134)) * Feature querying results now account for the `MGLSymbolStyleLayer.circleStrokeWidth` property. ([#10897](https://github.com/mapbox/mapbox-gl-native/pull/10897)) +* Removed methods, properties, and constants that had been deprecated as of v0.6.1. ([#11205](https://github.com/mapbox/mapbox-gl-native/pull/11205)) ## v0.6.1 - January 16, 2018 diff --git a/platform/macos/app/Base.lproj/MainMenu.xib b/platform/macos/app/Base.lproj/MainMenu.xib index 72e9c5a189..4cf8d87653 100644 --- a/platform/macos/app/Base.lproj/MainMenu.xib +++ b/platform/macos/app/Base.lproj/MainMenu.xib @@ -402,16 +402,6 @@ <action selector="showStyle:" target="-1" id="NTT-Y1-EqU"/> </connections> </menuItem> - <menuItem title="Traffic Day" tag="7" keyEquivalent="7" id="m9S-sv-Dch"> - <connections> - <action selector="showStyle:" target="-1" id="lXM-BW-dDw"/> - </connections> - </menuItem> - <menuItem title="Traffic Night" tag="8" keyEquivalent="8" id="yVS-VL-Xsy"> - <connections> - <action selector="showStyle:" target="-1" id="eAD-br-oBB"/> - </connections> - </menuItem> <menuItem title="Custom Style…" id="L0h-86-2cU"> <modifierMask key="keyEquivalentModifierMask"/> <connections> diff --git a/platform/macos/app/Base.lproj/MapDocument.xib b/platform/macos/app/Base.lproj/MapDocument.xib index 0394f38533..5d0525a29d 100644 --- a/platform/macos/app/Base.lproj/MapDocument.xib +++ b/platform/macos/app/Base.lproj/MapDocument.xib @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/> + <deployment identifier="macosx"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -48,7 +49,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="388" y="211" width="642" height="480"/> - <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> <view key="contentView" id="TuG-C5-zLS"> <rect key="frame" x="0.0" y="0.0" width="642" height="480"/> <autoresizingMask key="autoresizingMask"/> @@ -70,7 +71,7 @@ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <tableColumns> - <tableColumn editable="NO" width="16" minWidth="16" maxWidth="1000" id="P3U-a3-c8q"> + <tableColumn identifier="" editable="NO" width="16" minWidth="16" maxWidth="1000" id="P3U-a3-c8q"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> @@ -87,7 +88,7 @@ </binding> </connections> </tableColumn> - <tableColumn editable="NO" width="141" minWidth="40" maxWidth="1000" id="BwD-ww-7uw"> + <tableColumn identifier="" editable="NO" width="141" minWidth="40" maxWidth="1000" id="BwD-ww-7uw"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> @@ -204,12 +205,6 @@ <menuItem title="Satellite Streets" tag="6" id="7ly-oA-0ND"> <modifierMask key="keyEquivalentModifierMask"/> </menuItem> - <menuItem title="Traffic Day" tag="7" id="Vz7-9Z-EFq"> - <modifierMask key="keyEquivalentModifierMask"/> - </menuItem> - <menuItem title="Traffic Night" tag="8" id="zh7-LM-dmF"> - <modifierMask key="keyEquivalentModifierMask"/> - </menuItem> </items> </menu> </popUpButtonCell> diff --git a/platform/macos/app/MapDocument.m b/platform/macos/app/MapDocument.m index 7d39f93347..03557caca2 100644 --- a/platform/macos/app/MapDocument.m +++ b/platform/macos/app/MapDocument.m @@ -265,12 +265,6 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio case 6: styleURL = [MGLStyle satelliteStreetsStyleURL]; break; - case 7: - styleURL = [NSURL URLWithString:@"mapbox://styles/mapbox/traffic-day-v2"]; - break; - case 8: - styleURL = [NSURL URLWithString:@"mapbox://styles/mapbox/traffic-night-v2"]; - break; default: NSAssert(NO, @"Cannot set style from control with tag %li", (long)tag); break; @@ -981,12 +975,6 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio case 6: state = [styleURL isEqual:[MGLStyle satelliteStreetsStyleURL]]; break; - case 7: - state = [styleURL isEqual:[NSURL URLWithString:@"mapbox://styles/mapbox/traffic-day-v2"]]; - break; - case 8: - state = [styleURL isEqual:[NSURL URLWithString:@"mapbox://styles/mapbox/traffic-night-v2"]]; - break; default: return NO; } @@ -1160,8 +1148,6 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio [MGLStyle darkStyleURL], [MGLStyle satelliteStyleURL], [MGLStyle satelliteStreetsStyleURL], - [MGLStyle trafficDayStyleURL], - [MGLStyle trafficNightStyleURL], ]; return [styleURLs indexOfObject:self.mapView.styleURL]; } |