diff options
author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-11-03 15:56:09 -0700 |
---|---|---|
committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-11-03 15:56:09 -0700 |
commit | fff90aa827a839154bb0d52bf9e4399ed48522d0 (patch) | |
tree | e4d0cc72d2fe8f97156beba1e7fba6a829b05e9f /SmartDeviceLink/SDLUpdateTurnList.h | |
parent | 23ac8f8607e2161bbc5610767079018843f029da (diff) | |
parent | 63f0945009fae4896cabb28e124153201c15e9a3 (diff) | |
download | sdl_ios-fff90aa827a839154bb0d52bf9e4399ed48522d0.tar.gz |
Merge remote-tracking branch 'origin/master' into develop
* origin/master: (26 commits)
Update to v4.3.0 final
Run clang-format
Added a fix for when a navigation app is attempting to connect to a non-navigation capable core that would cause a crash on RAI.
Missing forward class declaration for SDLProxy.
Add documentation around the reason there is an SDLProxy property on SDLManager
Add a passthrough SDLProxy property to SDLManager for minor backcompat cases
Update the example app to log out example permissions
Fixed issue related RAI failing due to missing parameter in SDLAppInfo.
removed double set property in initializer.
Updated RAI to include missing properties in initializers.
Fix a crasher bug when an RAIR errors
Added support for deprecating SDLTTSChunkFactory in favor of SDLTTSChunk inits.
Added missing generic.
Updated spec to use non-nsnumbers in initializers.
Added missing generics and removed remaining NSNumbers used in initializers
Removed imports and put in superclass.
Add generics to initializers
Added missing initializer for SDLTTSChunk
Fixed misstype in spec.
Removed NSNumbers in favor of their primitive types for initializers.
...
# Conflicts:
# SmartDeviceLink/SDLAddCommand.h
# SmartDeviceLink/SDLAddCommand.m
# SmartDeviceLink/SDLAddSubMenu.m
# SmartDeviceLink/SDLAlert.h
# SmartDeviceLink/SDLAlertManeuver.h
# SmartDeviceLink/SDLAlertManeuver.m
# SmartDeviceLink/SDLChangeRegistration.m
# SmartDeviceLink/SDLChoice.m
# SmartDeviceLink/SDLCreateInteractionChoiceSet.m
# SmartDeviceLink/SDLDeleteCommand.m
# SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
# SmartDeviceLink/SDLDeleteSubMenu.m
# SmartDeviceLink/SDLDeviceInfo.m
# SmartDeviceLink/SDLDiagnosticMessage.m
# SmartDeviceLink/SDLDialNumber.h
# SmartDeviceLink/SDLGetDTCs.h
# SmartDeviceLink/SDLGetDTCs.m
# SmartDeviceLink/SDLGetVehicleData.m
# SmartDeviceLink/SDLImage.m
# SmartDeviceLink/SDLKeyboardProperties.h
# SmartDeviceLink/SDLKeyboardProperties.m
# SmartDeviceLink/SDLMenuParams.h
# SmartDeviceLink/SDLMenuParams.m
# SmartDeviceLink/SDLPerformAudioPassThru.m
# SmartDeviceLink/SDLPerformInteraction.h
# SmartDeviceLink/SDLPermissionManager.m
# SmartDeviceLink/SDLRPCRequestFactory.h
# SmartDeviceLink/SDLRPCRequestFactory.m
# SmartDeviceLink/SDLReadDID.m
# SmartDeviceLink/SDLRegisterAppInterface.h
# SmartDeviceLink/SDLResetGlobalProperties.h
# SmartDeviceLink/SDLResetGlobalProperties.m
# SmartDeviceLink/SDLSendLocation.h
# SmartDeviceLink/SDLSendLocation.m
# SmartDeviceLink/SDLSetGlobalProperties.m
# SmartDeviceLink/SDLShow.h
# SmartDeviceLink/SDLShowConstantTBT.h
# SmartDeviceLink/SDLSlider.m
# SmartDeviceLink/SDLSoftButton.m
# SmartDeviceLink/SDLSpeak.m
# SmartDeviceLink/SDLStartTime.m
# SmartDeviceLink/SDLSubscribeButton.h
# SmartDeviceLink/SDLSubscribeButton.m
# SmartDeviceLink/SDLSubscribeVehicleData.m
# SmartDeviceLink/SDLSyncMsgVersion.m
# SmartDeviceLink/SDLSystemRequest.h
# SmartDeviceLink/SDLSystemRequest.m
# SmartDeviceLink/SDLTTSChunk.m
# SmartDeviceLink/SDLTTSChunkFactory.h
# SmartDeviceLink/SDLTTSChunkFactory.m
# SmartDeviceLink/SDLTurn.m
# SmartDeviceLink/SDLUnsubscribeButton.m
# SmartDeviceLink/SDLUnsubscribeVehicleData.m
# SmartDeviceLink/SDLUpdateTurnList.m
# SmartDeviceLink/SDLVrHelpItem.m
# SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m
# SmartDeviceLink_Example/Classes/ProxyManager.m
Diffstat (limited to 'SmartDeviceLink/SDLUpdateTurnList.h')
-rw-r--r-- | SmartDeviceLink/SDLUpdateTurnList.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/SmartDeviceLink/SDLUpdateTurnList.h b/SmartDeviceLink/SDLUpdateTurnList.h index 7f33d68ce..873459967 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.h +++ b/SmartDeviceLink/SDLUpdateTurnList.h @@ -14,6 +14,8 @@ */ @interface SDLUpdateTurnList : SDLRPCRequest +- (instancetype)initWithTurnList:(NSArray<SDLTurn *> *)turnList softButtons:(NSArray<SDLSoftButton *> *)softButtons; + /** * Optional, SDLTurn, 1 - 100 entries */ |