summaryrefslogtreecommitdiff
path: root/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2
diff options
context:
space:
mode:
Diffstat (limited to 'SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2')
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp180
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp181
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp134
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp141
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp112
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp165
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp276
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp248
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp149
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp117
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp27
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc171
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp116
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp26
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc165
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc96
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp107
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp17
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp118
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp144
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp122
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp32
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc207
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc93
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp101
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp128
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp20
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc153
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp126
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp168
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp114
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp24
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc179
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp106
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp146
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp77
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp175
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp95
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp129
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp112
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp22
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc167
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp91
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp149
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp76
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc148
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp120
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp176
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp115
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp25
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc178
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc93
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp93
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp134
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp76
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp111
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp21
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc153
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp157
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc273
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp306
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp279
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp120
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp131
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp121
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp177
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp89
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp670
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp376
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp20
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc156
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp313
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp294
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp20
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc151
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp105
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp165
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc93
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp95
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp129
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc97
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp126
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp36
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc219
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp76
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp133
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp182
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp1362
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp111
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp21
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc154
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp149
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp146
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp89
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp76
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp114
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp138
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp114
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp138
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp101
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp128
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp89
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp152
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp161
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp115
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp139
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp101
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp128
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp137
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp89
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp534
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp345
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp120
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp30
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc178
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp104
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp158
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h44
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp208
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp202
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp267
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp303
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp146
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp168
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp139
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp20
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc98
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp81
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp159
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp152
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp91
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp149
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp138
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp155
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp161
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp210
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp282
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp284
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp491
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp414
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp137
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp78
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp136
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp46
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc234
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp20
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc151
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp153
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp168
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp127
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp88
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp87
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp118
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp76
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp203
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp232
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp123
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp134
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp272
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp231
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp381
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp300
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp111
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp21
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc98
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp95
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp129
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp167
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp181
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp96
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp137
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp192
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp117
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp143
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp175
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc147
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp137
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp111
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp21
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc103
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp138
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp89
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp137
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp120
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp177
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp96
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp130
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc65
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp113
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp23
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc160
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp116
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp26
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc169
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp95
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp129
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc96
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp124
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp150
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp126
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp36
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc214
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc148
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc93
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp161
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp175
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp108
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp18
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp122
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp133
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp76
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp110
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp74
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp89
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp94
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp137
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp119
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp177
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp111
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp21
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc155
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp112
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp165
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp75
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp140
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp96
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp114
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp24
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc166
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp130
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp122
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp32
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc199
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp189
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp163
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp107
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp17
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc91
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp139
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h67
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp109
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp19
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h90
-rw-r--r--SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc93
508 files changed, 0 insertions, 56519 deletions
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp
deleted file mode 100644
index d7ceff755..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-#include "AddCommand_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ImageMarshaller.h"
-#include "MenuParamsMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddCommand_request& AddCommand_request::operator =(const AddCommand_request& c)
-{
- cmdID= c.cmdID;
- menuParams= c.menuParams ? new MenuParams(c.menuParams[0]) : 0;
- vrCommands= c.vrCommands ? new std::vector<std::string>(c.vrCommands[0]) : 0;
- cmdIcon= c.cmdIcon ? new Image(c.cmdIcon[0]) : 0;
-
- return *this;
-}
-
-
-AddCommand_request::~AddCommand_request(void)
-{
- if(menuParams)
- delete menuParams;
- if(vrCommands)
- delete vrCommands;
- if(cmdIcon)
- delete cmdIcon;
-}
-
-
-AddCommand_request::AddCommand_request(const AddCommand_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool AddCommand_request::checkIntegrity(void)
-{
- return AddCommand_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AddCommand_request::AddCommand_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- menuParams(0),
- vrCommands(0),
- cmdIcon(0)
-{
-}
-
-
-
-bool AddCommand_request::set_cmdID(unsigned int cmdID_)
-{
- if(cmdID_>2000000000) return false;
- cmdID=cmdID_;
- return true;
-}
-
-bool AddCommand_request::set_menuParams(const MenuParams& menuParams_)
-{
- if(!MenuParamsMarshaller::checkIntegrityConst(menuParams_)) return false;
- delete menuParams;
- menuParams=0;
-
- menuParams=new MenuParams(menuParams_);
- return true;
-}
-
-void AddCommand_request::reset_menuParams(void)
-{
- if(menuParams)
- delete menuParams;
- menuParams=0;
-}
-
-bool AddCommand_request::set_vrCommands(const std::vector<std::string>& vrCommands_)
-{
- unsigned int i=vrCommands_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(vrCommands_[i].length()>99) return false;
- }
- delete vrCommands;
- vrCommands=0;
-
- vrCommands=new std::vector<std::string>(vrCommands_);
- return true;
-}
-
-void AddCommand_request::reset_vrCommands(void)
-{
- if(vrCommands)
- delete vrCommands;
- vrCommands=0;
-}
-
-bool AddCommand_request::set_cmdIcon(const Image& cmdIcon_)
-{
- if(!ImageMarshaller::checkIntegrityConst(cmdIcon_)) return false;
- delete cmdIcon;
- cmdIcon=0;
-
- cmdIcon=new Image(cmdIcon_);
- return true;
-}
-
-void AddCommand_request::reset_cmdIcon(void)
-{
- if(cmdIcon)
- delete cmdIcon;
- cmdIcon=0;
-}
-
-
-
-
-unsigned int AddCommand_request::get_cmdID(void) const
-{
- return cmdID;
-}
-
-const MenuParams* AddCommand_request::get_menuParams(void) const
-{
- return menuParams;
-}
-
-const std::vector<std::string>* AddCommand_request::get_vrCommands(void) const
-{
- return vrCommands;
-}
-
-const Image* AddCommand_request::get_cmdIcon(void) const
-{
- return cmdIcon;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp
deleted file mode 100644
index c7bbbe2b8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-#include "ImageMarshaller.h"
-#include "MenuParamsMarshaller.h"
-
-#include "AddCommand_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddCommand_requestMarshaller::checkIntegrity(AddCommand_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool AddCommand_requestMarshaller::fromString(const std::string& s,AddCommand_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string AddCommand_requestMarshaller::toString(const AddCommand_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommand_requestMarshaller::checkIntegrityConst(const AddCommand_request& s)
-{
- if(s.cmdID>2000000000) return false;
- if(s.menuParams && !MenuParamsMarshaller::checkIntegrityConst(*s.menuParams)) return false;
- if(s.vrCommands)
- {
- unsigned int i=s.vrCommands[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.vrCommands[0][i].length()>99) return false;
- }
- }
- if(s.cmdIcon && !ImageMarshaller::checkIntegrityConst(*s.cmdIcon)) return false;
- return true;
-}
-
-Json::Value AddCommand_requestMarshaller::toJSON(const AddCommand_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["cmdID"]=Json::Value(e.cmdID);
-
- if(e.menuParams)
- json["menuParams"]=MenuParamsMarshaller::toJSON(*e.menuParams);
-
- if(e.vrCommands)
- {
- unsigned int sz=e.vrCommands->size();
- json["vrCommands"]=Json::Value(Json::arrayValue);
- json["vrCommands"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["vrCommands"][i]=Json::Value(e.vrCommands[0][i]);
- }
-
- if(e.cmdIcon)
- json["cmdIcon"]=ImageMarshaller::toJSON(*e.cmdIcon);
-
- return json;
-}
-
-
-bool AddCommand_requestMarshaller::fromJSON(const Json::Value& json,AddCommand_request& c)
-{
- if(c.menuParams) delete c.menuParams;
- c.menuParams=0;
-
- if(c.vrCommands) delete c.vrCommands;
- c.vrCommands=0;
-
- if(c.cmdIcon) delete c.cmdIcon;
- c.cmdIcon=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("cmdID")) return false;
- {
- const Json::Value& j=json["cmdID"];
- if(!j.isInt()) return false;
- c.cmdID=j.asInt();
- }
- if(json.isMember("menuParams"))
- {
- const Json::Value& j=json["menuParams"];
- c.menuParams=new MenuParams();
- if(!MenuParamsMarshaller::fromJSON(j,c.menuParams[0]))
- return false;
- }
- if(json.isMember("vrCommands"))
- {
- const Json::Value& j=json["vrCommands"];
- if(!j.isArray()) return false;
- c.vrCommands=new std::vector<std::string>();
- c.vrCommands->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.vrCommands[0][i]=j[i].asString();
- }
- if(json.isMember("cmdIcon"))
- {
- const Json::Value& j=json["cmdIcon"];
- c.cmdIcon=new Image();
- if(!ImageMarshaller::fromJSON(j,c.cmdIcon[0]))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h
deleted file mode 100644
index 699c5a922..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDCOMMAND_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDCOMMAND_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct AddCommand_requestMarshaller
- {
- static bool checkIntegrity(AddCommand_request& e);
- static bool checkIntegrityConst(const AddCommand_request& e);
-
- static bool fromString(const std::string& s,AddCommand_request& e);
- static const std::string toString(const AddCommand_request& e);
-
- static bool fromJSON(const Json::Value& s,AddCommand_request& e);
- static Json::Value toJSON(const AddCommand_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp
deleted file mode 100644
index 69111bee5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-#include "AddCommand_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddCommand_response& AddCommand_response::operator =(const AddCommand_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-AddCommand_response::~AddCommand_response(void)
-{}
-
-AddCommand_response::AddCommand_response(const AddCommand_response& c)
-{
- *this = c;
-}
-
-
-bool AddCommand_response::checkIntegrity(void)
-{
- return AddCommand_responseMarshaller::checkIntegrity(*this);
-}
-
-AddCommand_response::AddCommand_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp
deleted file mode 100644
index d37a912eb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-#include "ResultMarshaller.h"
-
-#include "AddCommand_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddCommand_responseMarshaller::checkIntegrity(AddCommand_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool AddCommand_responseMarshaller::fromString(const std::string& s,AddCommand_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string AddCommand_responseMarshaller::toString(const AddCommand_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommand_responseMarshaller::checkIntegrityConst(const AddCommand_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value AddCommand_responseMarshaller::toJSON(const AddCommand_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool AddCommand_responseMarshaller::fromJSON(const Json::Value& json,AddCommand_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h
deleted file mode 100644
index 1354ed558..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDCOMMAND_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDCOMMAND_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct AddCommand_responseMarshaller
- {
- static bool checkIntegrity(AddCommand_response& e);
- static bool checkIntegrityConst(const AddCommand_response& e);
-
- static bool fromString(const std::string& s,AddCommand_response& e);
- static const std::string toString(const AddCommand_response& e);
-
- static bool fromJSON(const Json::Value& s,AddCommand_response& e);
- static Json::Value toJSON(const AddCommand_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp
deleted file mode 100644
index f74a7a45f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-#include "AddSubMenu_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddSubMenu_request& AddSubMenu_request::operator =(const AddSubMenu_request& c)
-{
- menuID= c.menuID;
- position= c.position ? new unsigned int(c.position[0]) : 0;
- menuName= c.menuName;
-
- return *this;
-}
-
-
-AddSubMenu_request::~AddSubMenu_request(void)
-{
- if(position)
- delete position;
-}
-
-
-AddSubMenu_request::AddSubMenu_request(const AddSubMenu_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool AddSubMenu_request::checkIntegrity(void)
-{
- return AddSubMenu_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AddSubMenu_request::AddSubMenu_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- position(0)
-{
-}
-
-
-
-bool AddSubMenu_request::set_menuID(unsigned int menuID_)
-{
- if(menuID_>2000000000) return false;
- menuID=menuID_;
- return true;
-}
-
-bool AddSubMenu_request::set_position(unsigned int position_)
-{
- if(position_>1000) return false;
- delete position;
- position=0;
-
- position=new unsigned int(position_);
- return true;
-}
-
-void AddSubMenu_request::reset_position(void)
-{
- if(position)
- delete position;
- position=0;
-}
-
-bool AddSubMenu_request::set_menuName(const std::string& menuName_)
-{
- if(menuName_.length()>500) return false;
- menuName=menuName_;
- return true;
-}
-
-
-
-
-unsigned int AddSubMenu_request::get_menuID(void) const
-{
- return menuID;
-}
-
-const unsigned int* AddSubMenu_request::get_position(void) const
-{
- return position;
-}
-
-const std::string& AddSubMenu_request::get_menuName(void) const
-{
- return menuName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp
deleted file mode 100644
index be12c3c34..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-
-
-#include "AddSubMenu_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddSubMenu_requestMarshaller::checkIntegrity(AddSubMenu_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenu_requestMarshaller::fromString(const std::string& s,AddSubMenu_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string AddSubMenu_requestMarshaller::toString(const AddSubMenu_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenu_requestMarshaller::checkIntegrityConst(const AddSubMenu_request& s)
-{
- if(s.menuID>2000000000) return false;
- if(s.position && *s.position>1000) return false;
- if(s.menuName.length()>500) return false;
- return true;
-}
-
-Json::Value AddSubMenu_requestMarshaller::toJSON(const AddSubMenu_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["menuID"]=Json::Value(e.menuID);
-
- if(e.position)
- json["position"]=Json::Value(*e.position);
-
- json["menuName"]=Json::Value(e.menuName);
-
- return json;
-}
-
-
-bool AddSubMenu_requestMarshaller::fromJSON(const Json::Value& json,AddSubMenu_request& c)
-{
- if(c.position) delete c.position;
- c.position=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("menuID")) return false;
- {
- const Json::Value& j=json["menuID"];
- if(!j.isInt()) return false;
- c.menuID=j.asInt();
- }
- if(json.isMember("position"))
- {
- const Json::Value& j=json["position"];
- if(!j.isInt()) return false;
- c.position=new unsigned int(j.asInt());
- }
- if(!json.isMember("menuName")) return false;
- {
- const Json::Value& j=json["menuName"];
- if(!j.isString()) return false;
- c.menuName=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h
deleted file mode 100644
index be0cb7608..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDSUBMENU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDSUBMENU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct AddSubMenu_requestMarshaller
- {
- static bool checkIntegrity(AddSubMenu_request& e);
- static bool checkIntegrityConst(const AddSubMenu_request& e);
-
- static bool fromString(const std::string& s,AddSubMenu_request& e);
- static const std::string toString(const AddSubMenu_request& e);
-
- static bool fromJSON(const Json::Value& s,AddSubMenu_request& e);
- static Json::Value toJSON(const AddSubMenu_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp
deleted file mode 100644
index 560b0727d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-#include "AddSubMenu_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddSubMenu_response& AddSubMenu_response::operator =(const AddSubMenu_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-AddSubMenu_response::~AddSubMenu_response(void)
-{}
-
-AddSubMenu_response::AddSubMenu_response(const AddSubMenu_response& c)
-{
- *this = c;
-}
-
-
-bool AddSubMenu_response::checkIntegrity(void)
-{
- return AddSubMenu_responseMarshaller::checkIntegrity(*this);
-}
-
-AddSubMenu_response::AddSubMenu_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp
deleted file mode 100644
index ea75481ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-#include "ResultMarshaller.h"
-
-#include "AddSubMenu_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddSubMenu_responseMarshaller::checkIntegrity(AddSubMenu_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenu_responseMarshaller::fromString(const std::string& s,AddSubMenu_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string AddSubMenu_responseMarshaller::toString(const AddSubMenu_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenu_responseMarshaller::checkIntegrityConst(const AddSubMenu_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value AddSubMenu_responseMarshaller::toJSON(const AddSubMenu_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool AddSubMenu_responseMarshaller::fromJSON(const Json::Value& json,AddSubMenu_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h
deleted file mode 100644
index ae04a3d02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDSUBMENU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDSUBMENU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct AddSubMenu_responseMarshaller
- {
- static bool checkIntegrity(AddSubMenu_response& e);
- static bool checkIntegrityConst(const AddSubMenu_response& e);
-
- static bool fromString(const std::string& s,AddSubMenu_response& e);
- static const std::string toString(const AddSubMenu_response& e);
-
- static bool fromJSON(const Json::Value& s,AddSubMenu_response& e);
- static Json::Value toJSON(const AddSubMenu_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp
deleted file mode 100644
index bc4955ad9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-#include "AlertManeuver_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-AlertManeuver_request::~AlertManeuver_request(void)
-{
-}
-
-
-AlertManeuver_request::AlertManeuver_request(const AlertManeuver_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool AlertManeuver_request::checkIntegrity(void)
-{
- return AlertManeuver_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AlertManeuver_request::AlertManeuver_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool AlertManeuver_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
- unsigned int i=ttsChunks_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i])) return false;
- }
- ttsChunks=ttsChunks_;
- return true;
-}
-
-bool AlertManeuver_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
- unsigned int i=softButtons_.size();
- if(i>3 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i])) return false;
- }
- softButtons=softButtons_;
- return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& AlertManeuver_request::get_ttsChunks(void) const
-{
- return ttsChunks;
-}
-
-const std::vector<SoftButton>& AlertManeuver_request::get_softButtons(void) const
-{
- return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp
deleted file mode 100644
index 55cf7e96b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "AlertManeuver_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AlertManeuver_requestMarshaller::checkIntegrity(AlertManeuver_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool AlertManeuver_requestMarshaller::fromString(const std::string& s,AlertManeuver_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string AlertManeuver_requestMarshaller::toString(const AlertManeuver_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertManeuver_requestMarshaller::checkIntegrityConst(const AlertManeuver_request& s)
-{
- {
- unsigned int i=s.ttsChunks.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[i])) return false;
- }
- }
- {
- unsigned int i=s.softButtons.size();
- if(i>3 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value AlertManeuver_requestMarshaller::toJSON(const AlertManeuver_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["ttsChunks"]=Json::Value(Json::arrayValue);
- json["ttsChunks"].resize(e.ttsChunks.size());
- for(unsigned int i=0;i<e.ttsChunks.size();i++)
- json["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
- json["softButtons"]=Json::Value(Json::arrayValue);
- json["softButtons"].resize(e.softButtons.size());
- for(unsigned int i=0;i<e.softButtons.size();i++)
- json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
- return json;
-}
-
-
-bool AlertManeuver_requestMarshaller::fromJSON(const Json::Value& json,AlertManeuver_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("ttsChunks")) return false;
- {
- const Json::Value& j=json["ttsChunks"];
- if(!j.isArray()) return false;
- c.ttsChunks.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.ttsChunks[i]=t;
- }
-
- }
- if(!json.isMember("softButtons")) return false;
- {
- const Json::Value& j=json["softButtons"];
- if(!j.isArray()) return false;
- c.softButtons.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButton t;
- if(!SoftButtonMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtons[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h
deleted file mode 100644
index f4427ea0b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct AlertManeuver_requestMarshaller
- {
- static bool checkIntegrity(AlertManeuver_request& e);
- static bool checkIntegrityConst(const AlertManeuver_request& e);
-
- static bool fromString(const std::string& s,AlertManeuver_request& e);
- static const std::string toString(const AlertManeuver_request& e);
-
- static bool fromJSON(const Json::Value& s,AlertManeuver_request& e);
- static Json::Value toJSON(const AlertManeuver_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp
deleted file mode 100644
index b3483e233..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-#include "AlertManeuver_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AlertManeuver_response& AlertManeuver_response::operator =(const AlertManeuver_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-AlertManeuver_response::~AlertManeuver_response(void)
-{}
-
-
-AlertManeuver_response::AlertManeuver_response(const AlertManeuver_response& c)
-{
- *this = c;
-}
-
-bool AlertManeuver_response::checkIntegrity(void)
-{
- return AlertManeuver_responseMarshaller::checkIntegrity(*this);
-}
-
-AlertManeuver_response::AlertManeuver_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp
deleted file mode 100644
index 98ad0a837..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-#include "ResultMarshaller.h"
-
-#include "AlertManeuver_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AlertManeuver_responseMarshaller::checkIntegrity(AlertManeuver_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool AlertManeuver_responseMarshaller::fromString(const std::string& s,AlertManeuver_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string AlertManeuver_responseMarshaller::toString(const AlertManeuver_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertManeuver_responseMarshaller::checkIntegrityConst(const AlertManeuver_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value AlertManeuver_responseMarshaller::toJSON(const AlertManeuver_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool AlertManeuver_responseMarshaller::fromJSON(const Json::Value& json,AlertManeuver_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h
deleted file mode 100644
index 36bfe0104..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct AlertManeuver_responseMarshaller
- {
- static bool checkIntegrity(AlertManeuver_response& e);
- static bool checkIntegrityConst(const AlertManeuver_response& e);
-
- static bool fromString(const std::string& s,AlertManeuver_response& e);
- static const std::string toString(const AlertManeuver_response& e);
-
- static bool fromJSON(const Json::Value& s,AlertManeuver_response& e);
- static Json::Value toJSON(const AlertManeuver_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp
deleted file mode 100644
index a8fd50361..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-#include "Alert_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Alert_request& Alert_request::operator =(const Alert_request& c)
-{
- alertText1= c.alertText1 ? new std::string(c.alertText1[0]) : 0;
- alertText2= c.alertText2 ? new std::string(c.alertText2[0]) : 0;
- alertText3= c.alertText3 ? new std::string(c.alertText3[0]) : 0;
- ttsChunks= c.ttsChunks ? new std::vector<TTSChunk>(c.ttsChunks[0]) : 0;
- duration= c.duration ? new unsigned int(c.duration[0]) : 0;
- playTone= c.playTone ? new bool(c.playTone[0]) : 0;
- softButtons= c.softButtons ? new std::vector<SoftButton>(c.softButtons[0]) : 0;
-
- return *this;
-}
-
-
-Alert_request::~Alert_request(void)
-{
- if(alertText1)
- delete alertText1;
- if(alertText2)
- delete alertText2;
- if(alertText3)
- delete alertText3;
- if(ttsChunks)
- delete ttsChunks;
- if(duration)
- delete duration;
- if(playTone)
- delete playTone;
- if(softButtons)
- delete softButtons;
-}
-
-
-Alert_request::Alert_request(const Alert_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool Alert_request::checkIntegrity(void)
-{
- return Alert_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Alert_request::Alert_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- alertText1(0),
- alertText2(0),
- alertText3(0),
- ttsChunks(0),
- duration(0),
- playTone(0),
- softButtons(0)
-{
-}
-
-
-
-bool Alert_request::set_alertText1(const std::string& alertText1_)
-{
- if(alertText1_.length()>500) return false;
- delete alertText1;
- alertText1=0;
-
- alertText1=new std::string(alertText1_);
- return true;
-}
-
-void Alert_request::reset_alertText1(void)
-{
- if(alertText1)
- delete alertText1;
- alertText1=0;
-}
-
-bool Alert_request::set_alertText2(const std::string& alertText2_)
-{
- if(alertText2_.length()>500) return false;
- delete alertText2;
- alertText2=0;
-
- alertText2=new std::string(alertText2_);
- return true;
-}
-
-void Alert_request::reset_alertText2(void)
-{
- if(alertText2)
- delete alertText2;
- alertText2=0;
-}
-
-bool Alert_request::set_alertText3(const std::string& alertText3_)
-{
- if(alertText3_.length()>500) return false;
- delete alertText3;
- alertText3=0;
-
- alertText3=new std::string(alertText3_);
- return true;
-}
-
-void Alert_request::reset_alertText3(void)
-{
- if(alertText3)
- delete alertText3;
- alertText3=0;
-}
-
-bool Alert_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
- unsigned int i=ttsChunks_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i])) return false;
- }
- delete ttsChunks;
- ttsChunks=0;
-
- ttsChunks=new std::vector<TTSChunk>(ttsChunks_);
- return true;
-}
-
-void Alert_request::reset_ttsChunks(void)
-{
- if(ttsChunks)
- delete ttsChunks;
- ttsChunks=0;
-}
-
-bool Alert_request::set_duration(unsigned int duration_)
-{
- if(duration_>10000) return false;
- if(duration_<3000) return false;
- delete duration;
- duration=0;
-
- duration=new unsigned int(duration_);
- return true;
-}
-
-void Alert_request::reset_duration(void)
-{
- if(duration)
- delete duration;
- duration=0;
-}
-
-bool Alert_request::set_playTone(bool playTone_)
-{
- delete playTone;
- playTone=0;
-
- playTone=new bool(playTone_);
- return true;
-}
-
-void Alert_request::reset_playTone(void)
-{
- if(playTone)
- delete playTone;
- playTone=0;
-}
-
-bool Alert_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
- unsigned int i=softButtons_.size();
- if(i>4 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i])) return false;
- }
- delete softButtons;
- softButtons=0;
-
- softButtons=new std::vector<SoftButton>(softButtons_);
- return true;
-}
-
-void Alert_request::reset_softButtons(void)
-{
- if(softButtons)
- delete softButtons;
- softButtons=0;
-}
-
-
-
-
-const std::string* Alert_request::get_alertText1(void) const
-{
- return alertText1;
-}
-
-const std::string* Alert_request::get_alertText2(void) const
-{
- return alertText2;
-}
-
-const std::string* Alert_request::get_alertText3(void) const
-{
- return alertText3;
-}
-
-const std::vector<TTSChunk>* Alert_request::get_ttsChunks(void) const
-{
- return ttsChunks;
-}
-
-const unsigned int* Alert_request::get_duration(void) const
-{
- return duration;
-}
-
-const bool* Alert_request::get_playTone(void) const
-{
- return playTone;
-}
-
-const std::vector<SoftButton>* Alert_request::get_softButtons(void) const
-{
- return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp
deleted file mode 100644
index 55f0f7372..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "Alert_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Alert_requestMarshaller::checkIntegrity(Alert_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Alert_requestMarshaller::fromString(const std::string& s,Alert_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Alert_requestMarshaller::toString(const Alert_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Alert_requestMarshaller::checkIntegrityConst(const Alert_request& s)
-{
- if(s.alertText1 && s.alertText1->length()>500) return false;
- if(s.alertText2 && s.alertText2->length()>500) return false;
- if(s.alertText3 && s.alertText3->length()>500) return false;
- if(s.ttsChunks)
- {
- unsigned int i=s.ttsChunks[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[0][i])) return false;
- }
- }
- if(s.duration && *s.duration>10000) return false;
- if(s.duration && *s.duration<3000) return false;
- if(s.softButtons)
- {
- unsigned int i=s.softButtons[0].size();
- if(i>4 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value Alert_requestMarshaller::toJSON(const Alert_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.alertText1)
- json["alertText1"]=Json::Value(*e.alertText1);
-
- if(e.alertText2)
- json["alertText2"]=Json::Value(*e.alertText2);
-
- if(e.alertText3)
- json["alertText3"]=Json::Value(*e.alertText3);
-
- if(e.ttsChunks)
- {
- unsigned int sz=e.ttsChunks->size();
- json["ttsChunks"]=Json::Value(Json::arrayValue);
- json["ttsChunks"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[0][i]);
- }
-
- if(e.duration)
- json["duration"]=Json::Value(*e.duration);
-
- if(e.playTone)
- json["playTone"]=Json::Value(*e.playTone);
-
- if(e.softButtons)
- {
- unsigned int sz=e.softButtons->size();
- json["softButtons"]=Json::Value(Json::arrayValue);
- json["softButtons"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
- }
-
- return json;
-}
-
-
-bool Alert_requestMarshaller::fromJSON(const Json::Value& json,Alert_request& c)
-{
- if(c.alertText1) delete c.alertText1;
- c.alertText1=0;
-
- if(c.alertText2) delete c.alertText2;
- c.alertText2=0;
-
- if(c.alertText3) delete c.alertText3;
- c.alertText3=0;
-
- if(c.ttsChunks) delete c.ttsChunks;
- c.ttsChunks=0;
-
- if(c.duration) delete c.duration;
- c.duration=0;
-
- if(c.playTone) delete c.playTone;
- c.playTone=0;
-
- if(c.softButtons) delete c.softButtons;
- c.softButtons=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("alertText1"))
- {
- const Json::Value& j=json["alertText1"];
- if(!j.isString()) return false;
- c.alertText1=new std::string(j.asString());
- }
- if(json.isMember("alertText2"))
- {
- const Json::Value& j=json["alertText2"];
- if(!j.isString()) return false;
- c.alertText2=new std::string(j.asString());
- }
- if(json.isMember("alertText3"))
- {
- const Json::Value& j=json["alertText3"];
- if(!j.isString()) return false;
- c.alertText3=new std::string(j.asString());
- }
- if(json.isMember("ttsChunks"))
- {
- const Json::Value& j=json["ttsChunks"];
- if(!j.isArray()) return false;
- c.ttsChunks=new std::vector<TTSChunk>();
- c.ttsChunks->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.ttsChunks[0][i]=t;
- }
-
- }
- if(json.isMember("duration"))
- {
- const Json::Value& j=json["duration"];
- if(!j.isInt()) return false;
- c.duration=new unsigned int(j.asInt());
- }
- if(json.isMember("playTone"))
- {
- const Json::Value& j=json["playTone"];
- if(!j.isBool()) return false;
- c.playTone=new bool(j.asBool());
- }
- if(json.isMember("softButtons"))
- {
- const Json::Value& j=json["softButtons"];
- if(!j.isArray()) return false;
- c.softButtons=new std::vector<SoftButton>();
- c.softButtons->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButton t;
- if(!SoftButtonMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtons[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h
deleted file mode 100644
index f70f90e51..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Alert_requestMarshaller
- {
- static bool checkIntegrity(Alert_request& e);
- static bool checkIntegrityConst(const Alert_request& e);
-
- static bool fromString(const std::string& s,Alert_request& e);
- static const std::string toString(const Alert_request& e);
-
- static bool fromJSON(const Json::Value& s,Alert_request& e);
- static Json::Value toJSON(const Alert_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp
deleted file mode 100644
index 95d887510..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-#include "Alert_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Alert_response& Alert_response::operator =(const Alert_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- tryAgainTime = c.tryAgainTime;
-
- return *this;
-}
-
-
-Alert_response::~Alert_response(void)
-{}
-
-Alert_response::Alert_response(const Alert_response& c)
-{
- *this = c;
-}
-
-bool Alert_response::checkIntegrity(void)
-{
- return Alert_responseMarshaller::checkIntegrity(*this);
-}
-
-Alert_response::Alert_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , tryAgainTime(0)
-{}
-
-bool Alert_response::set_tryAgainTime(unsigned int tryAgainTime_)
-{
- if (tryAgainTime_ > 2000000000)
- {
- return false;
- }
-
- tryAgainTime = tryAgainTime_;
- return true;
-}
-
-unsigned int Alert_response::get_tryAgainTime(void) const
-{
- return tryAgainTime;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp
deleted file mode 100644
index 47e550eee..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-#include "ResultMarshaller.h"
-
-#include "Alert_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Alert_responseMarshaller::checkIntegrity(Alert_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Alert_responseMarshaller::fromString(const std::string& s,Alert_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Alert_responseMarshaller::toString(const Alert_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Alert_responseMarshaller::checkIntegrityConst(const Alert_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.tryAgainTime>2000000000) return false;
- return true;
-}
-
-Json::Value Alert_responseMarshaller::toJSON(const Alert_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- json["tryAgainTime"]=Json::Value(e.tryAgainTime);
-
- return json;
-}
-
-
-bool Alert_responseMarshaller::fromJSON(const Json::Value& json,Alert_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(!json.isMember("tryAgainTime")) return false;
- {
- const Json::Value& j=json["tryAgainTime"];
- if(!j.isInt()) return false;
- c.tryAgainTime=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h
deleted file mode 100644
index 8aa098fa3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Alert_responseMarshaller
- {
- static bool checkIntegrity(Alert_response& e);
- static bool checkIntegrityConst(const Alert_response& e);
-
- static bool fromString(const std::string& s,Alert_response& e);
- static const std::string toString(const Alert_response& e);
-
- static bool fromJSON(const Json::Value& s,Alert_response& e);
- static Json::Value toJSON(const Alert_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp
deleted file mode 100644
index 57392d18e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal AppInterfaceUnregisteredReasonMarshaller::getIndex(const char* s)
-{
- if(!s)
- return AppInterfaceUnregisteredReason::INVALID_ENUM;
- const struct PerfectHashTable* p=AppInterfaceUnregisteredReason_intHash::getPointer(s,strlen(s));
- return p ? static_cast<AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal>(p->idx) : AppInterfaceUnregisteredReason::INVALID_ENUM;
-}
-
-
-bool AppInterfaceUnregisteredReasonMarshaller::fromJSON(const Json::Value& s,AppInterfaceUnregisteredReason& e)
-{
- e.mInternal=AppInterfaceUnregisteredReason::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM);
-}
-
-
-Json::Value AppInterfaceUnregisteredReasonMarshaller::toJSON(const AppInterfaceUnregisteredReason& e)
-{
- if(e.mInternal==AppInterfaceUnregisteredReason::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AppInterfaceUnregisteredReasonMarshaller::fromString(const std::string& s,AppInterfaceUnregisteredReason& e)
-{
- e.mInternal=AppInterfaceUnregisteredReason::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string AppInterfaceUnregisteredReasonMarshaller::toString(const AppInterfaceUnregisteredReason& e)
-{
- Json::FastWriter writer;
- return e.mInternal==AppInterfaceUnregisteredReason::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AppInterfaceUnregisteredReasonMarshaller::mHashTable[11]=
-{
- {"USER_EXIT",0},
- {"IGNITION_OFF",1},
- {"BLUETOOTH_OFF",2},
- {"USB_DISCONNECTED",3},
- {"REQUEST_WHILE_IN_NONE_HMI_LEVEL",4},
- {"TOO_MANY_REQUESTS",5},
- {"DRIVER_DISTRACTION_VIOLATION",6},
- {"LANGUAGE_CHANGE",7},
- {"MASTER_RESET",8},
- {"FACTORY_DEFAULTS",9},
- {"APP_UNAUTHORIZED",10}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp
deleted file mode 100644
index 773da9a20..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp
+++ /dev/null
@@ -1,27 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AppInterfaceUnregisteredReason_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-USER_EXIT,0
-IGNITION_OFF,1
-BLUETOOTH_OFF,2
-USB_DISCONNECTED,3
-REQUEST_WHILE_IN_NONE_HMI_LEVEL,4
-TOO_MANY_REQUESTS,5
-DRIVER_DISTRACTION_VIOLATION,6
-LANGUAGE_CHANGE,7
-MASTER_RESET,8
-FACTORY_DEFAULTS,9
-APP_UNAUTHORIZED,10
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h
deleted file mode 100644
index 8c3976bed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_APPINTERFACEUNREGISTEREDREASONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_APPINTERFACEUNREGISTEREDREASONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AppInterfaceUnregisteredReason
-
- class AppInterfaceUnregisteredReasonMarshaller
- {
- public:
-
- static std::string toName(const AppInterfaceUnregisteredReason& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(AppInterfaceUnregisteredReason& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=AppInterfaceUnregisteredReason::INVALID_ENUM;
- }
-
- static bool checkIntegrity(AppInterfaceUnregisteredReason& e) { return e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM; }
- static bool checkIntegrityConst(const AppInterfaceUnregisteredReason& e) { return e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,AppInterfaceUnregisteredReason& e);
- static const std::string toString(const AppInterfaceUnregisteredReason& e);
-
- static bool fromJSON(const Json::Value& s,AppInterfaceUnregisteredReason& e);
- static Json::Value toJSON(const AppInterfaceUnregisteredReason& e);
-
- static const char* getName(AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal e)
- {
- return (e>=0 && e<11) ? mHashTable[e].name : NULL;
- }
-
- static const AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[11];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc
deleted file mode 100644
index 591e51a9e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 11
-#define MIN_WORD_LENGTH 9
-#define MAX_WORD_LENGTH 31
-#define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 31
-/* maximum key range = 23, duplicates = 0 */
-
-class AppInterfaceUnregisteredReason_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-AppInterfaceUnregisteredReason_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 10, 0, 32, 0, 32,
- 5, 32, 32, 10, 32, 32, 0, 0, 32, 32,
- 32, 32, 0, 32, 0, 0, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AppInterfaceUnregisteredReason_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 12, 13,
- 0, 15, 16, 17, 0, 0, 0, 16, 12, 0, 0, 0, 16, 0,
- 28, 0, 0, 31
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"USER_EXIT",0},
- {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"MASTER_RESET",8},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"BLUETOOTH_OFF",2},
- {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"LANGUAGE_CHANGE",7},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"USB_DISCONNECTED",3},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"TOO_MANY_REQUESTS",5},
- {""}, {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"FACTORY_DEFAULTS",9},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"IGNITION_OFF",1},
- {""}, {""}, {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"APP_UNAUTHORIZED",10},
- {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"DRIVER_DISTRACTION_VIOLATION",6},
- {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
- {"REQUEST_WHILE_IN_NONE_HMI_LEVEL",4}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp
deleted file mode 100644
index 6171f6330..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppType.h"
-#include "AppTypeMarshaller.h"
-#include "AppTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AppType::AppTypeInternal AppTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return AppType::INVALID_ENUM;
- const struct PerfectHashTable* p=AppType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<AppType::AppTypeInternal>(p->idx) : AppType::INVALID_ENUM;
-}
-
-
-bool AppTypeMarshaller::fromJSON(const Json::Value& s,AppType& e)
-{
- e.mInternal=AppType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=AppType::INVALID_ENUM);
-}
-
-
-Json::Value AppTypeMarshaller::toJSON(const AppType& e)
-{
- if(e.mInternal==AppType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AppTypeMarshaller::fromString(const std::string& s,AppType& e)
-{
- e.mInternal=AppType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string AppTypeMarshaller::toString(const AppType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==AppType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AppTypeMarshaller::mHashTable[10]=
-{
- {"DEFAULT",0},
- {"COMMUNICATION",1},
- {"MEDIA",2},
- {"MESSAGING",3},
- {"NAVIGATION",4},
- {"INFORMATION",5},
- {"SOCIAL",6},
- {"BACKGROUND_PROCESS",7},
- {"TESTING",8},
- {"SYSTEM",9}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp
deleted file mode 100644
index 84f7cc1c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp
+++ /dev/null
@@ -1,26 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AppType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-DEFAULT,0
-COMMUNICATION,1
-MEDIA,2
-MESSAGING,3
-NAVIGATION,4
-INFORMATION,5
-SOCIAL,6
-BACKGROUND_PROCESS,7
-TESTING,8
-SYSTEM,9
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h
deleted file mode 100644
index 7c5f8c31c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_APPTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_APPTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AppType
-
- class AppTypeMarshaller
- {
- public:
-
- static std::string toName(const AppType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(AppType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=AppType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(AppType& e) { return e.mInternal!=AppType::INVALID_ENUM; }
- static bool checkIntegrityConst(const AppType& e) { return e.mInternal!=AppType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,AppType& e);
- static const std::string toString(const AppType& e);
-
- static bool fromJSON(const Json::Value& s,AppType& e);
- static Json::Value toJSON(const AppType& e);
-
- static const char* getName(AppType::AppTypeInternal e)
- {
- return (e>=0 && e<10) ? mHashTable[e].name : NULL;
- }
-
- static const AppType::AppTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[10];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc
deleted file mode 100644
index 6aa9c19b1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp */
-/* Computed positions: -k'3' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 10
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 18
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 23
-/* maximum key range = 19, duplicates = 0 */
-
-class AppType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-AppType_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 5, 0, 24,
- 5, 24, 24, 24, 24, 24, 24, 0, 24, 24,
- 24, 24, 24, 0, 24, 24, 0, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 24
- };
- return len + asso_values[(unsigned char)str[2]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AppType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 5, 6, 7, 0, 9, 10, 6, 7, 13,
- 0, 0, 11, 0, 0, 0, 0, 0, 0, 18
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"MEDIA",2},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"SYSTEM",9},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"TESTING",8},
- {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"MESSAGING",3},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"NAVIGATION",4},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"SOCIAL",6},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"DEFAULT",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"COMMUNICATION",1},
- {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"INFORMATION",5},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
- {"BACKGROUND_PROCESS",7}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp
deleted file mode 100644
index d52185f72..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioCaptureQualityMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AudioCaptureQuality::AudioCaptureQualityInternal AudioCaptureQualityMarshaller::getIndex(const char* s)
-{
- if(!s)
- return AudioCaptureQuality::INVALID_ENUM;
- const struct PerfectHashTable* p=AudioCaptureQualityV2_intHash::getPointer(s,strlen(s));
- return p ? static_cast<AudioCaptureQuality::AudioCaptureQualityInternal>(p->idx) : AudioCaptureQuality::INVALID_ENUM;
-}
-
-
-bool AudioCaptureQualityMarshaller::fromJSON(const Json::Value& s,AudioCaptureQuality& e)
-{
- e.mInternal=AudioCaptureQuality::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=AudioCaptureQuality::INVALID_ENUM);
-}
-
-
-Json::Value AudioCaptureQualityMarshaller::toJSON(const AudioCaptureQuality& e)
-{
- if(e.mInternal==AudioCaptureQuality::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioCaptureQualityMarshaller::fromString(const std::string& s,AudioCaptureQuality& e)
-{
- e.mInternal=AudioCaptureQuality::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string AudioCaptureQualityMarshaller::toString(const AudioCaptureQuality& e)
-{
- Json::FastWriter writer;
- return e.mInternal==AudioCaptureQuality::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioCaptureQualityMarshaller::mHashTable[2]=
-{
- {"8_BIT",0},
- {"16_BIT",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp
deleted file mode 100644
index 1e1a7c7b4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioCaptureQualityV2_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-8_BIT,0
-16_BIT,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h
deleted file mode 100644
index ee803355c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_AUDIOCAPTUREQUALITYMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_AUDIOCAPTUREQUALITYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AudioCaptureQuality
-
- class AudioCaptureQualityMarshaller
- {
- public:
-
- static std::string toName(const AudioCaptureQuality& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(AudioCaptureQuality& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=AudioCaptureQuality::INVALID_ENUM;
- }
-
- static bool checkIntegrity(AudioCaptureQuality& e) { return e.mInternal!=AudioCaptureQuality::INVALID_ENUM; }
- static bool checkIntegrityConst(const AudioCaptureQuality& e) { return e.mInternal!=AudioCaptureQuality::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,AudioCaptureQuality& e);
- static const std::string toString(const AudioCaptureQuality& e);
-
- static bool fromJSON(const Json::Value& s,AudioCaptureQuality& e);
- static Json::Value toJSON(const AudioCaptureQuality& e);
-
- static const char* getName(AudioCaptureQuality::AudioCaptureQualityInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const AudioCaptureQuality::AudioCaptureQualityInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc
deleted file mode 100644
index 2a9f3e04f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 6
-/* maximum key range = 2, duplicates = 0 */
-
-class AudioCaptureQualityV2_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioCaptureQualityV2_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AudioCaptureQualityV2_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 5, 6
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp"
- {"8_BIT",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp"
- {"16_BIT",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp
deleted file mode 100644
index 84c74723f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "AudioStreamingStateMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AudioStreamingState::AudioStreamingStateInternal AudioStreamingStateMarshaller::getIndex(const char* s)
-{
- if(!s)
- return AudioStreamingState::INVALID_ENUM;
- const struct PerfectHashTable* p=AudioStreamingState_intHash::getPointer(s,strlen(s));
- return p ? static_cast<AudioStreamingState::AudioStreamingStateInternal>(p->idx) : AudioStreamingState::INVALID_ENUM;
-}
-
-
-bool AudioStreamingStateMarshaller::fromJSON(const Json::Value& s,AudioStreamingState& e)
-{
- e.mInternal=AudioStreamingState::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=AudioStreamingState::INVALID_ENUM);
-}
-
-
-Json::Value AudioStreamingStateMarshaller::toJSON(const AudioStreamingState& e)
-{
- if(e.mInternal==AudioStreamingState::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioStreamingStateMarshaller::fromString(const std::string& s,AudioStreamingState& e)
-{
- e.mInternal=AudioStreamingState::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string AudioStreamingStateMarshaller::toString(const AudioStreamingState& e)
-{
- Json::FastWriter writer;
- return e.mInternal==AudioStreamingState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioStreamingStateMarshaller::mHashTable[3]=
-{
- {"AUDIBLE",0},
- {"NOT_AUDIBLE",1},
- {"ATTENUATED",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp
deleted file mode 100644
index 175b6a2f6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioStreamingState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-AUDIBLE,0
-ATTENUATED,2
-NOT_AUDIBLE,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h
deleted file mode 100644
index c1db08d98..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_AUDIOSTREAMINGSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_AUDIOSTREAMINGSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AudioStreamingState
-
- class AudioStreamingStateMarshaller
- {
- public:
-
- static std::string toName(const AudioStreamingState& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(AudioStreamingState& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=AudioStreamingState::INVALID_ENUM;
- }
-
- static bool checkIntegrity(AudioStreamingState& e) { return e.mInternal!=AudioStreamingState::INVALID_ENUM; }
- static bool checkIntegrityConst(const AudioStreamingState& e) { return e.mInternal!=AudioStreamingState::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,AudioStreamingState& e);
- static const std::string toString(const AudioStreamingState& e);
-
- static bool fromJSON(const Json::Value& s,AudioStreamingState& e);
- static Json::Value toJSON(const AudioStreamingState& e);
-
- static const char* getName(AudioStreamingState::AudioStreamingStateInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const AudioStreamingState::AudioStreamingStateInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc
deleted file mode 100644
index 0037e3852..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 11
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 11
-/* maximum key range = 5, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class AudioStreamingState_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioStreamingState_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AudioStreamingState_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 11
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp"
- {"AUDIBLE",0},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp"
- {"ATTENUATED",2},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp"
- {"NOT_AUDIBLE",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp
deleted file mode 100644
index 5dc5f63d9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioType.h"
-#include "AudioTypeMarshaller.h"
-#include "AudioTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AudioType::AudioTypeInternal AudioTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return AudioType::INVALID_ENUM;
- const struct PerfectHashTable* p=AudioType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<AudioType::AudioTypeInternal>(p->idx) : AudioType::INVALID_ENUM;
-}
-
-
-bool AudioTypeMarshaller::fromJSON(const Json::Value& s,AudioType& e)
-{
- e.mInternal=AudioType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=AudioType::INVALID_ENUM);
-}
-
-
-Json::Value AudioTypeMarshaller::toJSON(const AudioType& e)
-{
- if(e.mInternal==AudioType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioTypeMarshaller::fromString(const std::string& s,AudioType& e)
-{
- e.mInternal=AudioType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string AudioTypeMarshaller::toString(const AudioType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==AudioType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioTypeMarshaller::mHashTable[1]=
-{
- {"PCM",0}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp
deleted file mode 100644
index e65f88028..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp
+++ /dev/null
@@ -1,17 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-PCM,0
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h
deleted file mode 100644
index c2859b36c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_AUDIOTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_AUDIOTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AudioType
-
- class AudioTypeMarshaller
- {
- public:
-
- static std::string toName(const AudioType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(AudioType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=AudioType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(AudioType& e) { return e.mInternal!=AudioType::INVALID_ENUM; }
- static bool checkIntegrityConst(const AudioType& e) { return e.mInternal!=AudioType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,AudioType& e);
- static const std::string toString(const AudioType& e);
-
- static bool fromJSON(const Json::Value& s,AudioType& e);
- static Json::Value toJSON(const AudioType& e);
-
- static const char* getName(AudioType::AudioTypeInternal e)
- {
- return (e>=0 && e<1) ? mHashTable[e].name : NULL;
- }
-
- static const AudioType::AudioTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[1];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc
deleted file mode 100644
index d998476d0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 1
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 3
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 3
-/* maximum key range = 1, duplicates = 0 */
-
-class AudioType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioType_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AudioType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 3
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp"
- {"PCM",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp
deleted file mode 100644
index 032b91ddd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "ButtonNameMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ButtonCapabilities::ButtonCapabilities(const ButtonCapabilities& c)
-{
- *this=c;
-}
-
-
-bool ButtonCapabilities::checkIntegrity(void)
-{
- return ButtonCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-ButtonCapabilities::ButtonCapabilities(void)
-{
-}
-
-
-
-bool ButtonCapabilities::set_longPressAvailable(bool longPressAvailable_)
-{
- longPressAvailable=longPressAvailable_;
- return true;
-}
-
-bool ButtonCapabilities::set_name(const ButtonName& name_)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(name_)) return false;
- name=name_;
- return true;
-}
-
-bool ButtonCapabilities::set_shortPressAvailable(bool shortPressAvailable_)
-{
- shortPressAvailable=shortPressAvailable_;
- return true;
-}
-
-bool ButtonCapabilities::set_upDownAvailable(bool upDownAvailable_)
-{
- upDownAvailable=upDownAvailable_;
- return true;
-}
-
-
-
-
-bool ButtonCapabilities::get_longPressAvailable(void) const
-{
- return longPressAvailable;
-}
-
-
-const ButtonName& ButtonCapabilities::get_name(void) const
-{
- return name;
-}
-
-
-bool ButtonCapabilities::get_shortPressAvailable(void) const
-{
- return shortPressAvailable;
-}
-
-
-bool ButtonCapabilities::get_upDownAvailable(void) const
-{
- return upDownAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp
deleted file mode 100644
index 3b6c4f1e6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-#include "ButtonNameMarshaller.h"
-
-#include "ButtonCapabilitiesMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ButtonCapabilitiesMarshaller::checkIntegrity(ButtonCapabilities& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ButtonCapabilitiesMarshaller::fromString(const std::string& s,ButtonCapabilities& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ButtonCapabilitiesMarshaller::toString(const ButtonCapabilities& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ButtonCapabilitiesMarshaller::checkIntegrityConst(const ButtonCapabilities& s)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(s.name)) return false;
- return true;
-}
-
-Json::Value ButtonCapabilitiesMarshaller::toJSON(const ButtonCapabilities& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["longPressAvailable"]=Json::Value(e.longPressAvailable);
-
- json["name"]=ButtonNameMarshaller::toJSON(e.name);
-
- json["shortPressAvailable"]=Json::Value(e.shortPressAvailable);
-
- json["upDownAvailable"]=Json::Value(e.upDownAvailable);
-
-
- return json;
-}
-
-
-bool ButtonCapabilitiesMarshaller::fromJSON(const Json::Value& json,ButtonCapabilities& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("longPressAvailable")) return false;
- {
- const Json::Value& j=json["longPressAvailable"];
- if(!j.isBool()) return false;
- c.longPressAvailable=j.asBool();
- }
- if(!json.isMember("name")) return false;
- {
- const Json::Value& j=json["name"];
- if(!ButtonNameMarshaller::fromJSON(j,c.name))
- return false;
- }
- if(!json.isMember("shortPressAvailable")) return false;
- {
- const Json::Value& j=json["shortPressAvailable"];
- if(!j.isBool()) return false;
- c.shortPressAvailable=j.asBool();
- }
- if(!json.isMember("upDownAvailable")) return false;
- {
- const Json::Value& j=json["upDownAvailable"];
- if(!j.isBool()) return false;
- c.upDownAvailable=j.asBool();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h
deleted file mode 100644
index aed736b62..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ButtonCapabilitiesMarshaller
- {
- static bool checkIntegrity(ButtonCapabilities& e);
- static bool checkIntegrityConst(const ButtonCapabilities& e);
-
- static bool fromString(const std::string& s,ButtonCapabilities& e);
- static const std::string toString(const ButtonCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,ButtonCapabilities& e);
- static Json::Value toJSON(const ButtonCapabilities& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp
deleted file mode 100644
index 164fb3e28..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonEventModeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ButtonEventMode::ButtonEventModeInternal ButtonEventModeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return ButtonEventMode::INVALID_ENUM;
- const struct PerfectHashTable* p=ButtonEventMode_intHash::getPointer(s,strlen(s));
- return p ? static_cast<ButtonEventMode::ButtonEventModeInternal>(p->idx) : ButtonEventMode::INVALID_ENUM;
-}
-
-
-bool ButtonEventModeMarshaller::fromJSON(const Json::Value& s,ButtonEventMode& e)
-{
- e.mInternal=ButtonEventMode::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=ButtonEventMode::INVALID_ENUM);
-}
-
-
-Json::Value ButtonEventModeMarshaller::toJSON(const ButtonEventMode& e)
-{
- if(e.mInternal==ButtonEventMode::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonEventModeMarshaller::fromString(const std::string& s,ButtonEventMode& e)
-{
- e.mInternal=ButtonEventMode::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string ButtonEventModeMarshaller::toString(const ButtonEventMode& e)
-{
- Json::FastWriter writer;
- return e.mInternal==ButtonEventMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonEventModeMarshaller::mHashTable[2]=
-{
- {"BUTTONUP",0},
- {"BUTTONDOWN",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp
deleted file mode 100644
index 4c9dd25f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonEventMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-BUTTONUP,0
-BUTTONDOWN,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h
deleted file mode 100644
index ff64b4be5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONEVENTMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONEVENTMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ButtonEventMode
-
- class ButtonEventModeMarshaller
- {
- public:
-
- static std::string toName(const ButtonEventMode& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(ButtonEventMode& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=ButtonEventMode::INVALID_ENUM;
- }
-
- static bool checkIntegrity(ButtonEventMode& e) { return e.mInternal!=ButtonEventMode::INVALID_ENUM; }
- static bool checkIntegrityConst(const ButtonEventMode& e) { return e.mInternal!=ButtonEventMode::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,ButtonEventMode& e);
- static const std::string toString(const ButtonEventMode& e);
-
- static bool fromJSON(const Json::Value& s,ButtonEventMode& e);
- static Json::Value toJSON(const ButtonEventMode& e);
-
- static const char* getName(ButtonEventMode::ButtonEventModeInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const ButtonEventMode::ButtonEventModeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc
deleted file mode 100644
index 36bc9f63b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 8
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 10
-/* maximum key range = 3, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class ButtonEventMode_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ButtonEventMode_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ButtonEventMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 10
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp"
- {"BUTTONUP",0},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp"
- {"BUTTONDOWN",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp
deleted file mode 100644
index 2d2113fb9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonName.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonNameMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ButtonName::ButtonNameInternal ButtonNameMarshaller::getIndex(const char* s)
-{
- if(!s)
- return ButtonName::INVALID_ENUM;
- const struct PerfectHashTable* p=ButtonName_intHash::getPointer(s,strlen(s));
- return p ? static_cast<ButtonName::ButtonNameInternal>(p->idx) : ButtonName::INVALID_ENUM;
-}
-
-
-bool ButtonNameMarshaller::fromJSON(const Json::Value& s,ButtonName& e)
-{
- e.mInternal=ButtonName::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=ButtonName::INVALID_ENUM);
-}
-
-
-Json::Value ButtonNameMarshaller::toJSON(const ButtonName& e)
-{
- if(e.mInternal==ButtonName::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonNameMarshaller::fromString(const std::string& s,ButtonName& e)
-{
- e.mInternal=ButtonName::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string ButtonNameMarshaller::toString(const ButtonName& e)
-{
- Json::FastWriter writer;
- return e.mInternal==ButtonName::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonNameMarshaller::mHashTable[16]=
-{
- {"OK",0},
- {"SEEKLEFT",1},
- {"SEEKRIGHT",2},
- {"TUNEUP",3},
- {"TUNEDOWN",4},
- {"PRESET_0",5},
- {"PRESET_1",6},
- {"PRESET_2",7},
- {"PRESET_3",8},
- {"PRESET_4",9},
- {"PRESET_5",10},
- {"PRESET_6",11},
- {"PRESET_7",12},
- {"PRESET_8",13},
- {"PRESET_9",14},
- {"CUSTOM_BUTTON",15}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp
deleted file mode 100644
index 69f1aee66..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp
+++ /dev/null
@@ -1,32 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonName_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-OK,0
-SEEKLEFT,1
-SEEKRIGHT,2
-TUNEUP,3
-TUNEDOWN,4
-PRESET_0,5
-PRESET_1,6
-PRESET_2,7
-PRESET_3,8
-PRESET_4,9
-PRESET_5,10
-PRESET_6,11
-PRESET_7,12
-PRESET_8,13
-PRESET_9,14
-CUSTOM_BUTTON,15
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h
deleted file mode 100644
index 698516e3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONNAMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONNAMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonName.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ButtonName
-
- class ButtonNameMarshaller
- {
- public:
-
- static std::string toName(const ButtonName& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(ButtonName& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=ButtonName::INVALID_ENUM;
- }
-
- static bool checkIntegrity(ButtonName& e) { return e.mInternal!=ButtonName::INVALID_ENUM; }
- static bool checkIntegrityConst(const ButtonName& e) { return e.mInternal!=ButtonName::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,ButtonName& e);
- static const std::string toString(const ButtonName& e);
-
- static bool fromJSON(const Json::Value& s,ButtonName& e);
- static Json::Value toJSON(const ButtonName& e);
-
- static const char* getName(ButtonName::ButtonNameInternal e)
- {
- return (e>=0 && e<16) ? mHashTable[e].name : NULL;
- }
-
- static const ButtonName::ButtonNameInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[16];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc
deleted file mode 100644
index 64074a14d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp */
-/* Computed positions: -k'8' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 16
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 38
-/* maximum key range = 37, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class ButtonName_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-ButtonName_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 28, 23,
- 18, 13, 8, 3, 30, 25, 20, 15, 39, 39,
- 39, 39, 39, 39, 39, 39, 5, 39, 39, 39,
- 39, 39, 0, 39, 39, 39, 39, 39, 5, 39,
- 39, 39, 39, 39, 0, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[7]];
- /*FALLTHROUGH*/
- case 7:
- case 6:
- case 5:
- case 4:
- case 3:
- case 2:
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ButtonName_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 2, 0, 0, 0, 6, 0, 8, 9, 0, 8, 0, 8,
- 0, 0, 8, 0, 13, 0, 0, 8, 0, 8, 0, 0, 8, 0,
- 8, 0, 0, 8, 0, 8, 0, 0, 8, 0, 8
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"OK",0},
- {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"TUNEUP",3},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"SEEKLEFT",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"SEEKRIGHT",2},
- {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_5",10},
- {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"TUNEDOWN",4},
- {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_4",9},
- {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"CUSTOM_BUTTON",15},
- {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_3",8},
- {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_9",14},
- {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_2",7},
- {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_8",13},
- {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_1",6},
- {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_7",12},
- {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_0",5},
- {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
- {"PRESET_6",11}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp
deleted file mode 100644
index d2eb048aa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h"
-#include "ButtonPressModeMarshaller.h"
-#include "ButtonPressModeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ButtonPressMode::ButtonPressModeInternal ButtonPressModeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return ButtonPressMode::INVALID_ENUM;
- const struct PerfectHashTable* p=ButtonPressMode_intHash::getPointer(s,strlen(s));
- return p ? static_cast<ButtonPressMode::ButtonPressModeInternal>(p->idx) : ButtonPressMode::INVALID_ENUM;
-}
-
-
-bool ButtonPressModeMarshaller::fromJSON(const Json::Value& s,ButtonPressMode& e)
-{
- e.mInternal=ButtonPressMode::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=ButtonPressMode::INVALID_ENUM);
-}
-
-
-Json::Value ButtonPressModeMarshaller::toJSON(const ButtonPressMode& e)
-{
- if(e.mInternal==ButtonPressMode::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonPressModeMarshaller::fromString(const std::string& s,ButtonPressMode& e)
-{
- e.mInternal=ButtonPressMode::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string ButtonPressModeMarshaller::toString(const ButtonPressMode& e)
-{
- Json::FastWriter writer;
- return e.mInternal==ButtonPressMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonPressModeMarshaller::mHashTable[2]=
-{
- {"LONG",0},
- {"SHORT",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp
deleted file mode 100644
index 0565b94ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonPressMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-LONG,0
-SHORT,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h
deleted file mode 100644
index 9931b8d95..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONPRESSMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONPRESSMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ButtonPressMode
-
- class ButtonPressModeMarshaller
- {
- public:
-
- static std::string toName(const ButtonPressMode& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(ButtonPressMode& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=ButtonPressMode::INVALID_ENUM;
- }
-
- static bool checkIntegrity(ButtonPressMode& e) { return e.mInternal!=ButtonPressMode::INVALID_ENUM; }
- static bool checkIntegrityConst(const ButtonPressMode& e) { return e.mInternal!=ButtonPressMode::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,ButtonPressMode& e);
- static const std::string toString(const ButtonPressMode& e);
-
- static bool fromJSON(const Json::Value& s,ButtonPressMode& e);
- static Json::Value toJSON(const ButtonPressMode& e);
-
- static const char* getName(ButtonPressMode::ButtonPressModeInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const ButtonPressMode::ButtonPressModeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc
deleted file mode 100644
index 89938400d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class ButtonPressMode_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ButtonPressMode_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ButtonPressMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp"
- {"LONG",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp"
- {"SHORT",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp
deleted file mode 100644
index b857cdcfe..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-#include "ChangeRegistration_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "LanguageMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ChangeRegistration_request::~ChangeRegistration_request(void)
-{
-}
-
-
-ChangeRegistration_request::ChangeRegistration_request(const ChangeRegistration_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool ChangeRegistration_request::checkIntegrity(void)
-{
- return ChangeRegistration_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ChangeRegistration_request::ChangeRegistration_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool ChangeRegistration_request::set_language(const Language& language_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(language_)) return false;
- language=language_;
- return true;
-}
-
-bool ChangeRegistration_request::set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguage_)) return false;
- hmiDisplayLanguage=hmiDisplayLanguage_;
- return true;
-}
-
-
-
-
-const Language& ChangeRegistration_request::get_language(void) const
-{
- return language;
-}
-
-const Language& ChangeRegistration_request::get_hmiDisplayLanguage(void) const
-{
- return hmiDisplayLanguage;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp
deleted file mode 100644
index 9e1375964..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-#include "LanguageMarshaller.h"
-
-#include "ChangeRegistration_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ChangeRegistration_requestMarshaller::checkIntegrity(ChangeRegistration_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistration_requestMarshaller::fromString(const std::string& s,ChangeRegistration_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ChangeRegistration_requestMarshaller::toString(const ChangeRegistration_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistration_requestMarshaller::checkIntegrityConst(const ChangeRegistration_request& s)
-{
- if(!LanguageMarshaller::checkIntegrityConst(s.language)) return false;
- if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage)) return false;
- return true;
-}
-
-Json::Value ChangeRegistration_requestMarshaller::toJSON(const ChangeRegistration_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["language"]=LanguageMarshaller::toJSON(e.language);
-
- json["hmiDisplayLanguage"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguage);
-
- return json;
-}
-
-
-bool ChangeRegistration_requestMarshaller::fromJSON(const Json::Value& json,ChangeRegistration_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("language")) return false;
- {
- const Json::Value& j=json["language"];
- if(!LanguageMarshaller::fromJSON(j,c.language))
- return false;
- }
- if(!json.isMember("hmiDisplayLanguage")) return false;
- {
- const Json::Value& j=json["hmiDisplayLanguage"];
- if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguage))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h
deleted file mode 100644
index 4daa19232..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ChangeRegistration_requestMarshaller
- {
- static bool checkIntegrity(ChangeRegistration_request& e);
- static bool checkIntegrityConst(const ChangeRegistration_request& e);
-
- static bool fromString(const std::string& s,ChangeRegistration_request& e);
- static const std::string toString(const ChangeRegistration_request& e);
-
- static bool fromJSON(const Json::Value& s,ChangeRegistration_request& e);
- static Json::Value toJSON(const ChangeRegistration_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp
deleted file mode 100644
index 0d4568df7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-#include "ChangeRegistration_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ChangeRegistration_response& ChangeRegistration_response::operator =(const ChangeRegistration_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-ChangeRegistration_response::~ChangeRegistration_response(void)
-{}
-
-ChangeRegistration_response::ChangeRegistration_response(const ChangeRegistration_response& c)
-{
- *this = c;
-}
-
-bool ChangeRegistration_response::checkIntegrity(void)
-{
- return ChangeRegistration_responseMarshaller::checkIntegrity(*this);
-}
-
-
-ChangeRegistration_response::ChangeRegistration_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp
deleted file mode 100644
index 411bae61a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-#include "ResultMarshaller.h"
-
-#include "ChangeRegistration_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ChangeRegistration_responseMarshaller::checkIntegrity(ChangeRegistration_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistration_responseMarshaller::fromString(const std::string& s,ChangeRegistration_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ChangeRegistration_responseMarshaller::toString(const ChangeRegistration_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistration_responseMarshaller::checkIntegrityConst(const ChangeRegistration_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value ChangeRegistration_responseMarshaller::toJSON(const ChangeRegistration_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool ChangeRegistration_responseMarshaller::fromJSON(const Json::Value& json,ChangeRegistration_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h
deleted file mode 100644
index ff7ff058e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ChangeRegistration_responseMarshaller
- {
- static bool checkIntegrity(ChangeRegistration_response& e);
- static bool checkIntegrityConst(const ChangeRegistration_response& e);
-
- static bool fromString(const std::string& s,ChangeRegistration_response& e);
- static const std::string toString(const ChangeRegistration_response& e);
-
- static bool fromJSON(const Json::Value& s,ChangeRegistration_response& e);
- static Json::Value toJSON(const ChangeRegistration_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp
deleted file mode 100644
index 4d25806ea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h"
-#include "CharacterSetMarshaller.h"
-#include "CharacterSetMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const CharacterSet::CharacterSetInternal CharacterSetMarshaller::getIndex(const char* s)
-{
- if(!s)
- return CharacterSet::INVALID_ENUM;
- const struct PerfectHashTable* p=CharacterSet_intHash::getPointer(s,strlen(s));
- return p ? static_cast<CharacterSet::CharacterSetInternal>(p->idx) : CharacterSet::INVALID_ENUM;
-}
-
-
-bool CharacterSetMarshaller::fromJSON(const Json::Value& s,CharacterSet& e)
-{
- e.mInternal=CharacterSet::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=CharacterSet::INVALID_ENUM);
-}
-
-
-Json::Value CharacterSetMarshaller::toJSON(const CharacterSet& e)
-{
- if(e.mInternal==CharacterSet::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool CharacterSetMarshaller::fromString(const std::string& s,CharacterSet& e)
-{
- e.mInternal=CharacterSet::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string CharacterSetMarshaller::toString(const CharacterSet& e)
-{
- Json::FastWriter writer;
- return e.mInternal==CharacterSet::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable CharacterSetMarshaller::mHashTable[4]=
-{
- {"TYPE2SET",0},
- {"TYPE5SET",1},
- {"CID1SET",2},
- {"CID2SET",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp
deleted file mode 100644
index 5fad412bf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name CharacterSet_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-TYPE2SET,0
-TYPE5SET,1
-CID1SET,2
-CID2SET,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h
deleted file mode 100644
index 913e093a1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHARACTERSETMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHARACTERSETMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for CharacterSet
-
- class CharacterSetMarshaller
- {
- public:
-
- static std::string toName(const CharacterSet& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(CharacterSet& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=CharacterSet::INVALID_ENUM;
- }
-
- static bool checkIntegrity(CharacterSet& e) { return e.mInternal!=CharacterSet::INVALID_ENUM; }
- static bool checkIntegrityConst(const CharacterSet& e) { return e.mInternal!=CharacterSet::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,CharacterSet& e);
- static const std::string toString(const CharacterSet& e);
-
- static bool fromJSON(const Json::Value& s,CharacterSet& e);
- static Json::Value toJSON(const CharacterSet& e);
-
- static const char* getName(CharacterSet::CharacterSetInternal e)
- {
- return (e>=0 && e<4) ? mHashTable[e].name : NULL;
- }
-
- static const CharacterSet::CharacterSetInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[4];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc
deleted file mode 100644
index 7e80c4e12..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp */
-/* Computed positions: -k'4-5' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 13
-/* maximum key range = 7, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class CharacterSet_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-CharacterSet_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 0,
- 5, 14, 14, 0, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 0,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 0, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14
- };
- return len + asso_values[(unsigned char)str[4]] + asso_values[(unsigned char)str[3]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-CharacterSet_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 7, 8
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
- {"CID1SET",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
- {"TYPE5SET",1},
- {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
- {"CID2SET",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
- {"TYPE2SET",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp
deleted file mode 100644
index 29d5258b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-#include "ChoiceMarshaller.h"
-#include "ImageMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Choice::Choice(const Choice& c)
-{
- *this=c;
-}
-
-
-bool Choice::checkIntegrity(void)
-{
- return ChoiceMarshaller::checkIntegrity(*this);
-}
-
-
-Choice::Choice(void)
-{
-}
-
-
-
-bool Choice::set_choiceID(unsigned int choiceID_)
-{
- if(choiceID_>65535) return false;
- choiceID=choiceID_;
- return true;
-}
-
-bool Choice::set_image(const Image& image_)
-{
- if(!ImageMarshaller::checkIntegrityConst(image_)) return false;
- image=image_;
- return true;
-}
-
-bool Choice::set_menuName(const std::string& menuName_)
-{
- if(menuName_.length()>500) return false;
- menuName=menuName_;
- return true;
-}
-
-bool Choice::set_vrCommands(const std::vector<std::string>& vrCommands_)
-{
- unsigned int i=vrCommands_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(vrCommands_[i].length()>99) return false;
- }
- vrCommands=vrCommands_;
- return true;
-}
-
-
-
-
-unsigned int Choice::get_choiceID(void) const
-{
- return choiceID;
-}
-
-
-const Image& Choice::get_image(void) const
-{
- return image;
-}
-
-
-const std::string& Choice::get_menuName(void) const
-{
- return menuName;
-}
-
-
-const std::vector<std::string>& Choice::get_vrCommands(void) const
-{
- return vrCommands;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp
deleted file mode 100644
index 6ebb3eb25..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-#include "ImageMarshaller.h"
-
-#include "ChoiceMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ChoiceMarshaller::checkIntegrity(Choice& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ChoiceMarshaller::fromString(const std::string& s,Choice& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ChoiceMarshaller::toString(const Choice& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChoiceMarshaller::checkIntegrityConst(const Choice& s)
-{
- if(s.choiceID>65535) return false;
-
- // TODO(AK): Quick fix for HMI communication with app(v1)
- if (s.image.get_imageType().get() != NsSmartDeviceLinkRPCV2::ImageType::INVALID_ENUM)
- if(!ImageMarshaller::checkIntegrityConst(s.image)) return false;
-
- if(s.menuName.length()>500) return false;
- {
- unsigned int i=s.vrCommands.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.vrCommands[i].length()>99) return false;
- }
- }
- return true;
-}
-
-Json::Value ChoiceMarshaller::toJSON(const Choice& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["choiceID"]=Json::Value(e.choiceID);
-
- // TODO(AK): Quick fix for HMI communication with app(v1)
- if (e.image.get_imageType().get() != NsSmartDeviceLinkRPCV2::ImageType::INVALID_ENUM)
- json["image"]=ImageMarshaller::toJSON(e.image);
-
- json["menuName"]=Json::Value(e.menuName);
-
- json["vrCommands"]=Json::Value(Json::arrayValue);
- json["vrCommands"].resize(e.vrCommands.size());
- for(unsigned int i=0;i<e.vrCommands.size();i++)
- json["vrCommands"][i]=Json::Value(e.vrCommands[i]);
-
-
- return json;
-}
-
-
-bool ChoiceMarshaller::fromJSON(const Json::Value& json,Choice& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("choiceID")) return false;
- {
- const Json::Value& j=json["choiceID"];
- if(!j.isInt()) return false;
- c.choiceID=j.asInt();
- }
- if(json.isMember("image"))
- {
- const Json::Value& j=json["image"];
- if(!ImageMarshaller::fromJSON(j,c.image))
- return false;
- }
- if(!json.isMember("menuName")) return false;
- {
- const Json::Value& j=json["menuName"];
- if(!j.isString()) return false;
- c.menuName=j.asString();
- }
- if(!json.isMember("vrCommands")) return false;
- {
- const Json::Value& j=json["vrCommands"];
- if(!j.isArray()) return false;
- c.vrCommands.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.vrCommands[i]=j[i].asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h
deleted file mode 100644
index 3dc23e125..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHOICEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHOICEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ChoiceMarshaller
- {
- static bool checkIntegrity(Choice& e);
- static bool checkIntegrityConst(const Choice& e);
-
- static bool fromString(const std::string& s,Choice& e);
- static const std::string toString(const Choice& e);
-
- static bool fromJSON(const Json::Value& s,Choice& e);
- static Json::Value toJSON(const Choice& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp
deleted file mode 100644
index dcf17a129..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h"
-#include "CompassDirectionMarshaller.h"
-#include "CompassDirectionMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const CompassDirection::CompassDirectionInternal CompassDirectionMarshaller::getIndex(const char* s)
-{
- if(!s)
- return CompassDirection::INVALID_ENUM;
- const struct PerfectHashTable* p=CompassDirection_intHash::getPointer(s,strlen(s));
- return p ? static_cast<CompassDirection::CompassDirectionInternal>(p->idx) : CompassDirection::INVALID_ENUM;
-}
-
-
-bool CompassDirectionMarshaller::fromJSON(const Json::Value& s,CompassDirection& e)
-{
- e.mInternal=CompassDirection::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=CompassDirection::INVALID_ENUM);
-}
-
-
-Json::Value CompassDirectionMarshaller::toJSON(const CompassDirection& e)
-{
- if(e.mInternal==CompassDirection::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool CompassDirectionMarshaller::fromString(const std::string& s,CompassDirection& e)
-{
- e.mInternal=CompassDirection::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string CompassDirectionMarshaller::toString(const CompassDirection& e)
-{
- Json::FastWriter writer;
- return e.mInternal==CompassDirection::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable CompassDirectionMarshaller::mHashTable[8]=
-{
- {"NORTH",0},
- {"NORTHWEST",1},
- {"WEST",2},
- {"SOUTHWEST",3},
- {"SOUTH",4},
- {"SOUTHEAST",5},
- {"EAST",6},
- {"NORTHEAST",7}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp
deleted file mode 100644
index bdd04c86f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp
+++ /dev/null
@@ -1,24 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name CompassDirection_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-NORTH,0
-NORTHWEST,1
-WEST,2
-SOUTHWEST,3
-SOUTH,4
-SOUTHEAST,5
-EAST,6
-NORTHEAST,7
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h
deleted file mode 100644
index 67907eb47..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_COMPASSDIRECTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_COMPASSDIRECTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for CompassDirection
-
- class CompassDirectionMarshaller
- {
- public:
-
- static std::string toName(const CompassDirection& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(CompassDirection& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=CompassDirection::INVALID_ENUM;
- }
-
- static bool checkIntegrity(CompassDirection& e) { return e.mInternal!=CompassDirection::INVALID_ENUM; }
- static bool checkIntegrityConst(const CompassDirection& e) { return e.mInternal!=CompassDirection::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,CompassDirection& e);
- static const std::string toString(const CompassDirection& e);
-
- static bool fromJSON(const Json::Value& s,CompassDirection& e);
- static Json::Value toJSON(const CompassDirection& e);
-
- static const char* getName(CompassDirection::CompassDirectionInternal e)
- {
- return (e>=0 && e<8) ? mHashTable[e].name : NULL;
- }
-
- static const CompassDirection::CompassDirectionInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[8];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc
deleted file mode 100644
index 33e2c9b86..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp */
-/* Computed positions: -k'1,6' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 8
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 29
-/* maximum key range = 26, duplicates = 0 */
-
-class CompassDirection_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-CompassDirection_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 15,
- 30, 30, 30, 30, 30, 30, 30, 30, 5, 30,
- 30, 30, 30, 0, 30, 30, 30, 0, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
- 30, 30, 30, 30, 30, 30
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[5]];
- /*FALLTHROUGH*/
- case 5:
- case 4:
- case 3:
- case 2:
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-CompassDirection_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 5, 0, 0, 0, 9, 5, 0, 0, 0,
- 9, 0, 0, 0, 0, 4, 0, 0, 0, 0, 9, 0, 0, 0,
- 0, 9
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"WEST",2},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"SOUTH",4},
- {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"SOUTHWEST",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"NORTH",0},
- {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"NORTHWEST",1},
- {""}, {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"EAST",6},
- {""}, {""}, {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"SOUTHEAST",5},
- {""}, {""}, {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
- {"NORTHEAST",7}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp
deleted file mode 100644
index 6f062cc80..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-#include "CreateInteractionChoiceSet_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ChoiceMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-CreateInteractionChoiceSet_request::~CreateInteractionChoiceSet_request(void)
-{
-}
-
-
-CreateInteractionChoiceSet_request::CreateInteractionChoiceSet_request(const CreateInteractionChoiceSet_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool CreateInteractionChoiceSet_request::checkIntegrity(void)
-{
- return CreateInteractionChoiceSet_requestMarshaller::checkIntegrity(*this);
-}
-
-
-CreateInteractionChoiceSet_request::CreateInteractionChoiceSet_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool CreateInteractionChoiceSet_request::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
- if(interactionChoiceSetID_>2000000000) return false;
- interactionChoiceSetID=interactionChoiceSetID_;
- return true;
-}
-
-bool CreateInteractionChoiceSet_request::set_choiceSet(const std::vector<Choice>& choiceSet_)
-{
- unsigned int i=choiceSet_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!ChoiceMarshaller::checkIntegrityConst(choiceSet_[i])) return false;
- }
- choiceSet=choiceSet_;
- return true;
-}
-
-
-
-
-unsigned int CreateInteractionChoiceSet_request::get_interactionChoiceSetID(void) const
-{
- return interactionChoiceSetID;
-}
-
-const std::vector<Choice>& CreateInteractionChoiceSet_request::get_choiceSet(void) const
-{
- return choiceSet;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp
deleted file mode 100644
index 1cc31d412..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-#include "ChoiceMarshaller.h"
-
-#include "CreateInteractionChoiceSet_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::checkIntegrity(CreateInteractionChoiceSet_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::fromString(const std::string& s,CreateInteractionChoiceSet_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string CreateInteractionChoiceSet_requestMarshaller::toString(const CreateInteractionChoiceSet_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet_request& s)
-{
- if(s.interactionChoiceSetID>2000000000) return false;
- {
- unsigned int i=s.choiceSet.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!ChoiceMarshaller::checkIntegrityConst(s.choiceSet[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value CreateInteractionChoiceSet_requestMarshaller::toJSON(const CreateInteractionChoiceSet_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);
-
- json["choiceSet"]=Json::Value(Json::arrayValue);
- json["choiceSet"].resize(e.choiceSet.size());
- for(unsigned int i=0;i<e.choiceSet.size();i++)
- json["choiceSet"][i]=ChoiceMarshaller::toJSON(e.choiceSet[i]);
-
- return json;
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::fromJSON(const Json::Value& json,CreateInteractionChoiceSet_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("interactionChoiceSetID")) return false;
- {
- const Json::Value& j=json["interactionChoiceSetID"];
- if(!j.isInt()) return false;
- c.interactionChoiceSetID=j.asInt();
- }
- if(!json.isMember("choiceSet")) return false;
- {
- const Json::Value& j=json["choiceSet"];
- if(!j.isArray()) return false;
- c.choiceSet.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- Choice t;
- if(!ChoiceMarshaller::fromJSON(j[i],t))
- return false;
- c.choiceSet[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h
deleted file mode 100644
index e139dd36f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct CreateInteractionChoiceSet_requestMarshaller
- {
- static bool checkIntegrity(CreateInteractionChoiceSet_request& e);
- static bool checkIntegrityConst(const CreateInteractionChoiceSet_request& e);
-
- static bool fromString(const std::string& s,CreateInteractionChoiceSet_request& e);
- static const std::string toString(const CreateInteractionChoiceSet_request& e);
-
- static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet_request& e);
- static Json::Value toJSON(const CreateInteractionChoiceSet_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp
deleted file mode 100644
index 978551fac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-#include "CreateInteractionChoiceSet_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-CreateInteractionChoiceSet_response& CreateInteractionChoiceSet_response::operator =(
- const CreateInteractionChoiceSet_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-CreateInteractionChoiceSet_response::~CreateInteractionChoiceSet_response(void)
-{}
-
-CreateInteractionChoiceSet_response::CreateInteractionChoiceSet_response(
- const CreateInteractionChoiceSet_response& c)
-{
- *this = c;
-}
-
-bool CreateInteractionChoiceSet_response::checkIntegrity(void)
-{
- return CreateInteractionChoiceSet_responseMarshaller::checkIntegrity(*this);
-}
-
-CreateInteractionChoiceSet_response::CreateInteractionChoiceSet_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp
deleted file mode 100644
index 5279dee7c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-#include "ResultMarshaller.h"
-
-#include "CreateInteractionChoiceSet_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::checkIntegrity(CreateInteractionChoiceSet_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::fromString(const std::string& s, CreateInteractionChoiceSet_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if (!reader.parse(s, json, false))
- {
- return false;
- }
- if (!fromJSON(json, e))
- {
- return false;
- }
- }
- catch (...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string CreateInteractionChoiceSet_responseMarshaller::toString(const CreateInteractionChoiceSet_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet_response& s)
-{
- if (!ResultMarshaller::checkIntegrityConst(s.resultCode))
- {
- return false;
- }
- if (s.info && s.info->length() > 1000)
- {
- return false;
- }
- return true;
-}
-
-Json::Value CreateInteractionChoiceSet_responseMarshaller::toJSON(const CreateInteractionChoiceSet_response& e)
-{
- Json::Value json(Json::objectValue);
- if (!checkIntegrityConst(e))
- {
- return Json::Value(Json::nullValue);
- }
-
- json["success"] = Json::Value(e.success);
- json["resultCode"] = ResultMarshaller::toJSON(e.resultCode);
-
- if (e.info)
- {
- json["info"] = Json::Value(*e.info);
- }
-
- return json;
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::fromJSON(const Json::Value& json, CreateInteractionChoiceSet_response& c)
-{
- if (c.info)
- {
- delete c.info;
- }
- c.info = 0;
-
- try
- {
- if (!json.isObject())
- {
- return false;
- }
-
- if (!json.isMember("success"))
- {
- return false;
- }
- {
- const Json::Value& j = json["success"];
- if (!j.isBool())
- {
- return false;
- }
- c.success = j.asBool();
- }
- if (!json.isMember("resultCode"))
- {
- return false;
- }
- {
- const Json::Value& j = json["resultCode"];
- if (!ResultMarshaller::fromJSON(j, c.resultCode))
- {
- return false;
- }
- }
- if (json.isMember("info"))
- {
- const Json::Value& j = json["info"];
- if (!j.isString())
- {
- return false;
- }
- c.info = new std::string(j.asString());
- }
-
- }
- catch (...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h
deleted file mode 100644
index 94911ce75..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct CreateInteractionChoiceSet_responseMarshaller
- {
- static bool checkIntegrity(CreateInteractionChoiceSet_response& e);
- static bool checkIntegrityConst(const CreateInteractionChoiceSet_response& e);
-
- static bool fromString(const std::string& s,CreateInteractionChoiceSet_response& e);
- static const std::string toString(const CreateInteractionChoiceSet_response& e);
-
- static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet_response& e);
- static Json::Value toJSON(const CreateInteractionChoiceSet_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp
deleted file mode 100644
index b9f141b83..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-#include "DTCMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DTC::DTC(const DTC& c)
-{
- *this=c;
-}
-
-
-bool DTC::checkIntegrity(void)
-{
- return DTCMarshaller::checkIntegrity(*this);
-}
-
-
-DTC::DTC(void)
-{
-}
-
-
-
-bool DTC::set_identifier(const std::string& identifier_)
-{
- if(identifier_.length()>500) return false;
- identifier=identifier_;
- return true;
-}
-
-bool DTC::set_statusByte(const std::string& statusByte_)
-{
- if(statusByte_.length()>500) return false;
- statusByte=statusByte_;
- return true;
-}
-
-
-
-
-const std::string& DTC::get_identifier(void) const
-{
- return identifier;
-}
-
-
-const std::string& DTC::get_statusByte(void) const
-{
- return statusByte;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp
deleted file mode 100644
index 20b0fb7a7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-
-
-#include "DTCMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DTCMarshaller::checkIntegrity(DTC& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DTCMarshaller::fromString(const std::string& s,DTC& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DTCMarshaller::toString(const DTC& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DTCMarshaller::checkIntegrityConst(const DTC& s)
-{
- if(s.identifier.length()>500) return false;
- if(s.statusByte.length()>500) return false;
- return true;
-}
-
-Json::Value DTCMarshaller::toJSON(const DTC& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["identifier"]=Json::Value(e.identifier);
-
- json["statusByte"]=Json::Value(e.statusByte);
-
-
- return json;
-}
-
-
-bool DTCMarshaller::fromJSON(const Json::Value& json,DTC& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("identifier")) return false;
- {
- const Json::Value& j=json["identifier"];
- if(!j.isString()) return false;
- c.identifier=j.asString();
- }
- if(!json.isMember("statusByte")) return false;
- {
- const Json::Value& j=json["statusByte"];
- if(!j.isString()) return false;
- c.statusByte=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h
deleted file mode 100644
index 58f9266f3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DTCMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DTCMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DTCMarshaller
- {
- static bool checkIntegrity(DTC& e);
- static bool checkIntegrityConst(const DTC& e);
-
- static bool fromString(const std::string& s,DTC& e);
- static const std::string toString(const DTC& e);
-
- static bool fromJSON(const Json::Value& s,DTC& e);
- static Json::Value toJSON(const DTC& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp
deleted file mode 100644
index 5dc89f0a4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h"
-#include "DeactivateReasonMarshaller.h"
-#include "DeactivateReasonMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const DeactivateReason::DeactivateReasonInternal DeactivateReasonMarshaller::getIndex(const char* s)
-{
- if(!s)
- return DeactivateReason::INVALID_ENUM;
- const struct PerfectHashTable* p=DeactivateReason_intHash::getPointer(s,strlen(s));
- return p ? static_cast<DeactivateReason::DeactivateReasonInternal>(p->idx) : DeactivateReason::INVALID_ENUM;
-}
-
-
-bool DeactivateReasonMarshaller::fromJSON(const Json::Value& s,DeactivateReason& e)
-{
- e.mInternal=DeactivateReason::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=DeactivateReason::INVALID_ENUM);
-}
-
-
-Json::Value DeactivateReasonMarshaller::toJSON(const DeactivateReason& e)
-{
- if(e.mInternal==DeactivateReason::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DeactivateReasonMarshaller::fromString(const std::string& s,DeactivateReason& e)
-{
- e.mInternal=DeactivateReason::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string DeactivateReasonMarshaller::toString(const DeactivateReason& e)
-{
- Json::FastWriter writer;
- return e.mInternal==DeactivateReason::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DeactivateReasonMarshaller::mHashTable[6]=
-{
- {"AUDIO",0},
- {"PHONECALL",1},
- {"NAVIGATIONMAP",2},
- {"PHONEMENU",3},
- {"SYNCSETTINGS",4},
- {"GENERAL",5}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp
deleted file mode 100644
index c7ff845a9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp
+++ /dev/null
@@ -1,22 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DeactivateReason_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-AUDIO,0
-PHONECALL,1
-NAVIGATIONMAP,2
-PHONEMENU,3
-SYNCSETTINGS,4
-GENERAL,5
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h
deleted file mode 100644
index 8a5a4ecaf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DEACTIVATEREASONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DEACTIVATEREASONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for DeactivateReason
-
- class DeactivateReasonMarshaller
- {
- public:
-
- static std::string toName(const DeactivateReason& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(DeactivateReason& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=DeactivateReason::INVALID_ENUM;
- }
-
- static bool checkIntegrity(DeactivateReason& e) { return e.mInternal!=DeactivateReason::INVALID_ENUM; }
- static bool checkIntegrityConst(const DeactivateReason& e) { return e.mInternal!=DeactivateReason::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,DeactivateReason& e);
- static const std::string toString(const DeactivateReason& e);
-
- static bool fromJSON(const Json::Value& s,DeactivateReason& e);
- static Json::Value toJSON(const DeactivateReason& e);
-
- static const char* getName(DeactivateReason::DeactivateReasonInternal e)
- {
- return (e>=0 && e<6) ? mHashTable[e].name : NULL;
- }
-
- static const DeactivateReason::DeactivateReasonInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[6];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc
deleted file mode 100644
index 7d629bf3e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp */
-/* Computed positions: -k'6' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 6
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 14
-/* maximum key range = 10, duplicates = 0 */
-
-class DeactivateReason_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-DeactivateReason_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 0, 15, 5, 15, 0,
- 15, 15, 15, 15, 15, 15, 15, 0, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[5]];
- /*FALLTHROUGH*/
- case 5:
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-DeactivateReason_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 5, 0, 7, 0, 9, 0, 0, 12, 13,
- 9
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
- {"AUDIO",0},
- {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
- {"GENERAL",5},
- {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
- {"PHONEMENU",3},
- {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
- {"SYNCSETTINGS",4},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
- {"NAVIGATIONMAP",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
- {"PHONECALL",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp
deleted file mode 100644
index b1962c00b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-#include "DeleteCommand_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteCommand_request::~DeleteCommand_request(void)
-{
-}
-
-
-DeleteCommand_request::DeleteCommand_request(const DeleteCommand_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool DeleteCommand_request::checkIntegrity(void)
-{
- return DeleteCommand_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteCommand_request::DeleteCommand_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteCommand_request::set_cmdID(unsigned int cmdID_)
-{
- if(cmdID_>2000000000) return false;
- cmdID=cmdID_;
- return true;
-}
-
-
-
-
-unsigned int DeleteCommand_request::get_cmdID(void) const
-{
- return cmdID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp
deleted file mode 100644
index 7def6904f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-
-
-#include "DeleteCommand_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteCommand_requestMarshaller::checkIntegrity(DeleteCommand_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommand_requestMarshaller::fromString(const std::string& s,DeleteCommand_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteCommand_requestMarshaller::toString(const DeleteCommand_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommand_requestMarshaller::checkIntegrityConst(const DeleteCommand_request& s)
-{
- if(s.cmdID>2000000000) return false;
- return true;
-}
-
-Json::Value DeleteCommand_requestMarshaller::toJSON(const DeleteCommand_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["cmdID"]=Json::Value(e.cmdID);
-
- return json;
-}
-
-
-bool DeleteCommand_requestMarshaller::fromJSON(const Json::Value& json,DeleteCommand_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("cmdID")) return false;
- {
- const Json::Value& j=json["cmdID"];
- if(!j.isInt()) return false;
- c.cmdID=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h
deleted file mode 100644
index d2fc20606..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETECOMMAND_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETECOMMAND_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteCommand_requestMarshaller
- {
- static bool checkIntegrity(DeleteCommand_request& e);
- static bool checkIntegrityConst(const DeleteCommand_request& e);
-
- static bool fromString(const std::string& s,DeleteCommand_request& e);
- static const std::string toString(const DeleteCommand_request& e);
-
- static bool fromJSON(const Json::Value& s,DeleteCommand_request& e);
- static Json::Value toJSON(const DeleteCommand_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp
deleted file mode 100644
index c69d324da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-#include "DeleteCommand_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteCommand_response& DeleteCommand_response::operator =(const DeleteCommand_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-DeleteCommand_response::~DeleteCommand_response(void)
-{}
-
-DeleteCommand_response::DeleteCommand_response(const DeleteCommand_response& c)
-{
- *this = c;
-}
-
-bool DeleteCommand_response::checkIntegrity(void)
-{
- return DeleteCommand_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteCommand_response::DeleteCommand_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp
deleted file mode 100644
index 469f33a9c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteCommand_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteCommand_responseMarshaller::checkIntegrity(DeleteCommand_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommand_responseMarshaller::fromString(const std::string& s,DeleteCommand_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteCommand_responseMarshaller::toString(const DeleteCommand_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommand_responseMarshaller::checkIntegrityConst(const DeleteCommand_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value DeleteCommand_responseMarshaller::toJSON(const DeleteCommand_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool DeleteCommand_responseMarshaller::fromJSON(const Json::Value& json,DeleteCommand_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h
deleted file mode 100644
index 64167645b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETECOMMAND_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETECOMMAND_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteCommand_responseMarshaller
- {
- static bool checkIntegrity(DeleteCommand_response& e);
- static bool checkIntegrityConst(const DeleteCommand_response& e);
-
- static bool fromString(const std::string& s,DeleteCommand_response& e);
- static const std::string toString(const DeleteCommand_response& e);
-
- static bool fromJSON(const Json::Value& s,DeleteCommand_response& e);
- static Json::Value toJSON(const DeleteCommand_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp
deleted file mode 100644
index d3f1b1dcf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-#include "DeleteFile_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteFile_request::~DeleteFile_request(void)
-{
-}
-
-
-DeleteFile_request::DeleteFile_request(const DeleteFile_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool DeleteFile_request::checkIntegrity(void)
-{
- return DeleteFile_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteFile_request::DeleteFile_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteFile_request::set_syncFileName(const std::string& syncFileName_)
-{
- if(syncFileName_.length()>500) return false;
- syncFileName=syncFileName_;
- return true;
-}
-
-
-
-
-const std::string& DeleteFile_request::get_syncFileName(void) const
-{
- return syncFileName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp
deleted file mode 100644
index 1ff5a6202..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-
-
-#include "DeleteFile_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteFile_requestMarshaller::checkIntegrity(DeleteFile_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteFile_requestMarshaller::fromString(const std::string& s,DeleteFile_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteFile_requestMarshaller::toString(const DeleteFile_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteFile_requestMarshaller::checkIntegrityConst(const DeleteFile_request& s)
-{
- if(s.syncFileName.length()>500) return false;
- return true;
-}
-
-Json::Value DeleteFile_requestMarshaller::toJSON(const DeleteFile_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["syncFileName"]=Json::Value(e.syncFileName);
-
- return json;
-}
-
-
-bool DeleteFile_requestMarshaller::fromJSON(const Json::Value& json,DeleteFile_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("syncFileName")) return false;
- {
- const Json::Value& j=json["syncFileName"];
- if(!j.isString()) return false;
- c.syncFileName=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h
deleted file mode 100644
index 3c397a8e0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEFILE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEFILE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteFile_requestMarshaller
- {
- static bool checkIntegrity(DeleteFile_request& e);
- static bool checkIntegrityConst(const DeleteFile_request& e);
-
- static bool fromString(const std::string& s,DeleteFile_request& e);
- static const std::string toString(const DeleteFile_request& e);
-
- static bool fromJSON(const Json::Value& s,DeleteFile_request& e);
- static Json::Value toJSON(const DeleteFile_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp
deleted file mode 100644
index f22c0a1e7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-#include "DeleteFile_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteFile_response& DeleteFile_response::operator =(const DeleteFile_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- spaceAvailable = c.spaceAvailable;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-DeleteFile_response::~DeleteFile_response(void)
-{}
-
-DeleteFile_response::DeleteFile_response(const DeleteFile_response& c)
-{
- *this = c;
-}
-
-bool DeleteFile_response::checkIntegrity(void)
-{
- return DeleteFile_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteFile_response::DeleteFile_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
-
-bool DeleteFile_response::set_spaceAvailable(unsigned int spaceAvailable_)
-{
- if (spaceAvailable_ > 2000000000)
- {
- return false;
- }
- spaceAvailable = spaceAvailable_;
- return true;
-}
-
-unsigned int DeleteFile_response::get_spaceAvailable(void) const
-{
- return spaceAvailable;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp
deleted file mode 100644
index 39f231b2c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteFile_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteFile_responseMarshaller::checkIntegrity(DeleteFile_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteFile_responseMarshaller::fromString(const std::string& s,DeleteFile_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteFile_responseMarshaller::toString(const DeleteFile_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteFile_responseMarshaller::checkIntegrityConst(const DeleteFile_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.spaceAvailable>2000000000) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value DeleteFile_responseMarshaller::toJSON(const DeleteFile_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- json["spaceAvailable"]=Json::Value(e.spaceAvailable);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool DeleteFile_responseMarshaller::fromJSON(const Json::Value& json,DeleteFile_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(!json.isMember("spaceAvailable")) return false;
- {
- const Json::Value& j=json["spaceAvailable"];
- if(!j.isInt()) return false;
- c.spaceAvailable=j.asInt();
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h
deleted file mode 100644
index 0be82951c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEFILE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEFILE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteFile_responseMarshaller
- {
- static bool checkIntegrity(DeleteFile_response& e);
- static bool checkIntegrityConst(const DeleteFile_response& e);
-
- static bool fromString(const std::string& s,DeleteFile_response& e);
- static const std::string toString(const DeleteFile_response& e);
-
- static bool fromJSON(const Json::Value& s,DeleteFile_response& e);
- static Json::Value toJSON(const DeleteFile_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp
deleted file mode 100644
index 1aa41fdec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-#include "DeleteInteractionChoiceSet_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteInteractionChoiceSet_request::~DeleteInteractionChoiceSet_request(void)
-{
-}
-
-
-DeleteInteractionChoiceSet_request::DeleteInteractionChoiceSet_request(const DeleteInteractionChoiceSet_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool DeleteInteractionChoiceSet_request::checkIntegrity(void)
-{
- return DeleteInteractionChoiceSet_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteInteractionChoiceSet_request::DeleteInteractionChoiceSet_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteInteractionChoiceSet_request::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
- if(interactionChoiceSetID_>2000000000) return false;
- interactionChoiceSetID=interactionChoiceSetID_;
- return true;
-}
-
-
-
-
-unsigned int DeleteInteractionChoiceSet_request::get_interactionChoiceSetID(void) const
-{
- return interactionChoiceSetID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp
deleted file mode 100644
index d34370443..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-
-
-#include "DeleteInteractionChoiceSet_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::checkIntegrity(DeleteInteractionChoiceSet_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteInteractionChoiceSet_requestMarshaller::toString(const DeleteInteractionChoiceSet_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet_request& s)
-{
- if(s.interactionChoiceSetID>2000000000) return false;
- return true;
-}
-
-Json::Value DeleteInteractionChoiceSet_requestMarshaller::toJSON(const DeleteInteractionChoiceSet_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);
-
- return json;
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::fromJSON(const Json::Value& json,DeleteInteractionChoiceSet_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("interactionChoiceSetID")) return false;
- {
- const Json::Value& j=json["interactionChoiceSetID"];
- if(!j.isInt()) return false;
- c.interactionChoiceSetID=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h
deleted file mode 100644
index 353036deb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteInteractionChoiceSet_requestMarshaller
- {
- static bool checkIntegrity(DeleteInteractionChoiceSet_request& e);
- static bool checkIntegrityConst(const DeleteInteractionChoiceSet_request& e);
-
- static bool fromString(const std::string& s,DeleteInteractionChoiceSet_request& e);
- static const std::string toString(const DeleteInteractionChoiceSet_request& e);
-
- static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet_request& e);
- static Json::Value toJSON(const DeleteInteractionChoiceSet_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp
deleted file mode 100644
index ee1ace74e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-#include "DeleteInteractionChoiceSet_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteInteractionChoiceSet_response& DeleteInteractionChoiceSet_response::operator =(
- const DeleteInteractionChoiceSet_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-DeleteInteractionChoiceSet_response::~DeleteInteractionChoiceSet_response(void)
-{}
-
-DeleteInteractionChoiceSet_response::DeleteInteractionChoiceSet_response(const DeleteInteractionChoiceSet_response& c)
-{
- *this = c;
-}
-
-bool DeleteInteractionChoiceSet_response::checkIntegrity(void)
-{
- return DeleteInteractionChoiceSet_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteInteractionChoiceSet_response::DeleteInteractionChoiceSet_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp
deleted file mode 100644
index 3ed44d9fd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteInteractionChoiceSet_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::checkIntegrity(DeleteInteractionChoiceSet_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteInteractionChoiceSet_responseMarshaller::toString(const DeleteInteractionChoiceSet_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value DeleteInteractionChoiceSet_responseMarshaller::toJSON(const DeleteInteractionChoiceSet_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::fromJSON(const Json::Value& json,DeleteInteractionChoiceSet_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h
deleted file mode 100644
index 4c83768c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteInteractionChoiceSet_responseMarshaller
- {
- static bool checkIntegrity(DeleteInteractionChoiceSet_response& e);
- static bool checkIntegrityConst(const DeleteInteractionChoiceSet_response& e);
-
- static bool fromString(const std::string& s,DeleteInteractionChoiceSet_response& e);
- static const std::string toString(const DeleteInteractionChoiceSet_response& e);
-
- static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet_response& e);
- static Json::Value toJSON(const DeleteInteractionChoiceSet_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp
deleted file mode 100644
index d9b54acdd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-#include "DeleteSubMenu_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteSubMenu_request::~DeleteSubMenu_request(void)
-{
-}
-
-
-DeleteSubMenu_request::DeleteSubMenu_request(const DeleteSubMenu_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool DeleteSubMenu_request::checkIntegrity(void)
-{
- return DeleteSubMenu_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteSubMenu_request::DeleteSubMenu_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteSubMenu_request::set_menuID(unsigned int menuID_)
-{
- if(menuID_>2000000000) return false;
- menuID=menuID_;
- return true;
-}
-
-
-
-
-unsigned int DeleteSubMenu_request::get_menuID(void) const
-{
- return menuID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp
deleted file mode 100644
index f6500beaa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-
-
-#include "DeleteSubMenu_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteSubMenu_requestMarshaller::checkIntegrity(DeleteSubMenu_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenu_requestMarshaller::fromString(const std::string& s,DeleteSubMenu_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteSubMenu_requestMarshaller::toString(const DeleteSubMenu_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenu_requestMarshaller::checkIntegrityConst(const DeleteSubMenu_request& s)
-{
- if(s.menuID>2000000000) return false;
- return true;
-}
-
-Json::Value DeleteSubMenu_requestMarshaller::toJSON(const DeleteSubMenu_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["menuID"]=Json::Value(e.menuID);
-
- return json;
-}
-
-
-bool DeleteSubMenu_requestMarshaller::fromJSON(const Json::Value& json,DeleteSubMenu_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("menuID")) return false;
- {
- const Json::Value& j=json["menuID"];
- if(!j.isInt()) return false;
- c.menuID=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h
deleted file mode 100644
index 8b3159d8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETESUBMENU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETESUBMENU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteSubMenu_requestMarshaller
- {
- static bool checkIntegrity(DeleteSubMenu_request& e);
- static bool checkIntegrityConst(const DeleteSubMenu_request& e);
-
- static bool fromString(const std::string& s,DeleteSubMenu_request& e);
- static const std::string toString(const DeleteSubMenu_request& e);
-
- static bool fromJSON(const Json::Value& s,DeleteSubMenu_request& e);
- static Json::Value toJSON(const DeleteSubMenu_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp
deleted file mode 100644
index 87b81d2c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-#include "DeleteSubMenu_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteSubMenu_response& DeleteSubMenu_response::operator =(const DeleteSubMenu_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-DeleteSubMenu_response::~DeleteSubMenu_response(void)
-{}
-
-DeleteSubMenu_response::DeleteSubMenu_response(const DeleteSubMenu_response& c)
-{
- *this = c;
-}
-
-bool DeleteSubMenu_response::checkIntegrity(void)
-{
- return DeleteSubMenu_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteSubMenu_response::DeleteSubMenu_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp
deleted file mode 100644
index 293cc153d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteSubMenu_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteSubMenu_responseMarshaller::checkIntegrity(DeleteSubMenu_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenu_responseMarshaller::fromString(const std::string& s,DeleteSubMenu_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DeleteSubMenu_responseMarshaller::toString(const DeleteSubMenu_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenu_responseMarshaller::checkIntegrityConst(const DeleteSubMenu_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value DeleteSubMenu_responseMarshaller::toJSON(const DeleteSubMenu_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool DeleteSubMenu_responseMarshaller::fromJSON(const Json::Value& json,DeleteSubMenu_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h
deleted file mode 100644
index 2495f3bfa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETESUBMENU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETESUBMENU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DeleteSubMenu_responseMarshaller
- {
- static bool checkIntegrity(DeleteSubMenu_response& e);
- static bool checkIntegrityConst(const DeleteSubMenu_response& e);
-
- static bool fromString(const std::string& s,DeleteSubMenu_response& e);
- static const std::string toString(const DeleteSubMenu_response& e);
-
- static bool fromJSON(const Json::Value& s,DeleteSubMenu_response& e);
- static Json::Value toJSON(const DeleteSubMenu_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp
deleted file mode 100644
index ea1f50c08..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-#include "DialNumber_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DialNumber_request::~DialNumber_request(void)
-{
-}
-
-
-DialNumber_request::DialNumber_request(const DialNumber_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool DialNumber_request::checkIntegrity(void)
-{
- return DialNumber_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DialNumber_request::DialNumber_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DialNumber_request::set_number(const std::string& number_)
-{
- if(number_.length()>500) return false;
- number=number_;
- return true;
-}
-
-
-
-
-const std::string& DialNumber_request::get_number(void) const
-{
- return number;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp
deleted file mode 100644
index 8e12e2096..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-
-
-#include "DialNumber_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DialNumber_requestMarshaller::checkIntegrity(DialNumber_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DialNumber_requestMarshaller::fromString(const std::string& s,DialNumber_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DialNumber_requestMarshaller::toString(const DialNumber_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DialNumber_requestMarshaller::checkIntegrityConst(const DialNumber_request& s)
-{
- if(s.number.length()>500) return false;
- return true;
-}
-
-Json::Value DialNumber_requestMarshaller::toJSON(const DialNumber_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["number"]=Json::Value(e.number);
-
- return json;
-}
-
-
-bool DialNumber_requestMarshaller::fromJSON(const Json::Value& json,DialNumber_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("number")) return false;
- {
- const Json::Value& j=json["number"];
- if(!j.isString()) return false;
- c.number=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h
deleted file mode 100644
index 2b35bf566..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DIALNUMBER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DIALNUMBER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DialNumber_requestMarshaller
- {
- static bool checkIntegrity(DialNumber_request& e);
- static bool checkIntegrityConst(const DialNumber_request& e);
-
- static bool fromString(const std::string& s,DialNumber_request& e);
- static const std::string toString(const DialNumber_request& e);
-
- static bool fromJSON(const Json::Value& s,DialNumber_request& e);
- static Json::Value toJSON(const DialNumber_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp
deleted file mode 100644
index ef8422e16..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-#include "DialNumber_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DialNumber_response& DialNumber_response::operator =(const DialNumber_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-DialNumber_response::~DialNumber_response(void)
-{}
-
-DialNumber_response::DialNumber_response(const DialNumber_response& c)
-{
- *this = c;
-}
-
-bool DialNumber_response::checkIntegrity(void)
-{
- return DialNumber_responseMarshaller::checkIntegrity(*this);
-}
-
-DialNumber_response::DialNumber_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp
deleted file mode 100644
index b8a0e8c27..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-#include "ResultMarshaller.h"
-
-#include "DialNumber_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DialNumber_responseMarshaller::checkIntegrity(DialNumber_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DialNumber_responseMarshaller::fromString(const std::string& s,DialNumber_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DialNumber_responseMarshaller::toString(const DialNumber_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DialNumber_responseMarshaller::checkIntegrityConst(const DialNumber_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value DialNumber_responseMarshaller::toJSON(const DialNumber_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool DialNumber_responseMarshaller::fromJSON(const Json::Value& json,DialNumber_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h
deleted file mode 100644
index ae7839828..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DIALNUMBER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DIALNUMBER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DialNumber_responseMarshaller
- {
- static bool checkIntegrity(DialNumber_response& e);
- static bool checkIntegrityConst(const DialNumber_response& e);
-
- static bool fromString(const std::string& s,DialNumber_response& e);
- static const std::string toString(const DialNumber_response& e);
-
- static bool fromJSON(const Json::Value& s,DialNumber_response& e);
- static Json::Value toJSON(const DialNumber_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp
deleted file mode 100644
index 5f18ffbc4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/Dimension.h"
-#include "DimensionMarshaller.h"
-#include "DimensionMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const Dimension::DimensionInternal DimensionMarshaller::getIndex(const char* s)
-{
- if(!s)
- return Dimension::INVALID_ENUM;
- const struct PerfectHashTable* p=Dimension_intHash::getPointer(s,strlen(s));
- return p ? static_cast<Dimension::DimensionInternal>(p->idx) : Dimension::INVALID_ENUM;
-}
-
-
-bool DimensionMarshaller::fromJSON(const Json::Value& s,Dimension& e)
-{
- e.mInternal=Dimension::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=Dimension::INVALID_ENUM);
-}
-
-
-Json::Value DimensionMarshaller::toJSON(const Dimension& e)
-{
- if(e.mInternal==Dimension::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DimensionMarshaller::fromString(const std::string& s,Dimension& e)
-{
- e.mInternal=Dimension::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string DimensionMarshaller::toString(const Dimension& e)
-{
- Json::FastWriter writer;
- return e.mInternal==Dimension::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DimensionMarshaller::mHashTable[3]=
-{
- {"NO_FIX",0},
- {"2D",1},
- {"3D",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp
deleted file mode 100644
index 2227e5fb8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Dimension_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-NO_FIX,0
-2D,1
-3D,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h
deleted file mode 100644
index 5db7336b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DIMENSIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DIMENSIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Dimension.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for Dimension
-
- class DimensionMarshaller
- {
- public:
-
- static std::string toName(const Dimension& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(Dimension& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=Dimension::INVALID_ENUM;
- }
-
- static bool checkIntegrity(Dimension& e) { return e.mInternal!=Dimension::INVALID_ENUM; }
- static bool checkIntegrityConst(const Dimension& e) { return e.mInternal!=Dimension::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,Dimension& e);
- static const std::string toString(const Dimension& e);
-
- static bool fromJSON(const Json::Value& s,Dimension& e);
- static Json::Value toJSON(const Dimension& e);
-
- static const char* getName(Dimension::DimensionInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const Dimension::DimensionInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc
deleted file mode 100644
index fec0eb519..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 6
-/* maximum key range = 5, duplicates = 0 */
-
-class Dimension_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Dimension_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 1, 0, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 0, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-Dimension_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 2, 2, 0, 0, 6
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp"
- {"3D",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp"
- {"2D",1},
- {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp"
- {"NO_FIX",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp
deleted file mode 100644
index a236b3d0a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "DisplayTypeMarshaller.h"
-#include "MediaClockFormatMarshaller.h"
-#include "TextFieldMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DisplayCapabilities::DisplayCapabilities(const DisplayCapabilities& c)
-{
- *this=c;
-}
-
-
-bool DisplayCapabilities::checkIntegrity(void)
-{
- return DisplayCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-DisplayCapabilities::DisplayCapabilities(void)
-{
-}
-
-
-
-bool DisplayCapabilities::set_displayType(const DisplayType& displayType_)
-{
- if(!DisplayTypeMarshaller::checkIntegrityConst(displayType_)) return false;
- displayType=displayType_;
- return true;
-}
-
-bool DisplayCapabilities::set_mediaClockFormats(const std::vector<MediaClockFormat>& mediaClockFormats_)
-{
- unsigned int i=mediaClockFormats_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!MediaClockFormatMarshaller::checkIntegrityConst(mediaClockFormats_[i])) return false;
- }
- mediaClockFormats=mediaClockFormats_;
- return true;
-}
-
-bool DisplayCapabilities::set_textFields(const std::vector<TextField>& textFields_)
-{
- unsigned int i=textFields_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TextFieldMarshaller::checkIntegrityConst(textFields_[i])) return false;
- }
- textFields=textFields_;
- return true;
-}
-
-
-
-
-const DisplayType& DisplayCapabilities::get_displayType(void) const
-{
- return displayType;
-}
-
-
-const std::vector<MediaClockFormat>& DisplayCapabilities::get_mediaClockFormats(void) const
-{
- return mediaClockFormats;
-}
-
-
-const std::vector<TextField>& DisplayCapabilities::get_textFields(void) const
-{
- return textFields;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp
deleted file mode 100644
index df285bc3c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-#include "DisplayTypeMarshaller.h"
-#include "MediaClockFormatMarshaller.h"
-#include "TextFieldMarshaller.h"
-
-#include "DisplayCapabilitiesMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DisplayCapabilitiesMarshaller::checkIntegrity(DisplayCapabilities& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool DisplayCapabilitiesMarshaller::fromString(const std::string& s,DisplayCapabilities& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string DisplayCapabilitiesMarshaller::toString(const DisplayCapabilities& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DisplayCapabilitiesMarshaller::checkIntegrityConst(const DisplayCapabilities& s)
-{
- if(!DisplayTypeMarshaller::checkIntegrityConst(s.displayType)) return false;
- {
- unsigned int i=s.mediaClockFormats.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!MediaClockFormatMarshaller::checkIntegrityConst(s.mediaClockFormats[i])) return false;
- }
- }
- {
- unsigned int i=s.textFields.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TextFieldMarshaller::checkIntegrityConst(s.textFields[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value DisplayCapabilitiesMarshaller::toJSON(const DisplayCapabilities& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["displayType"]=DisplayTypeMarshaller::toJSON(e.displayType);
-
- json["mediaClockFormats"]=Json::Value(Json::arrayValue);
- json["mediaClockFormats"].resize(e.mediaClockFormats.size());
- for(unsigned int i=0;i<e.mediaClockFormats.size();i++)
- json["mediaClockFormats"][i]=MediaClockFormatMarshaller::toJSON(e.mediaClockFormats[i]);
-
- json["textFields"]=Json::Value(Json::arrayValue);
- json["textFields"].resize(e.textFields.size());
- for(unsigned int i=0;i<e.textFields.size();i++)
- json["textFields"][i]=TextFieldMarshaller::toJSON(e.textFields[i]);
-
-
- return json;
-}
-
-
-bool DisplayCapabilitiesMarshaller::fromJSON(const Json::Value& json,DisplayCapabilities& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("displayType")) return false;
- {
- const Json::Value& j=json["displayType"];
- if(!DisplayTypeMarshaller::fromJSON(j,c.displayType))
- return false;
- }
- if(!json.isMember("mediaClockFormats")) return false;
- {
- const Json::Value& j=json["mediaClockFormats"];
- if(!j.isArray()) return false;
- c.mediaClockFormats.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- MediaClockFormat t;
- if(!MediaClockFormatMarshaller::fromJSON(j[i],t))
- return false;
- c.mediaClockFormats[i]=t;
- }
-
- }
- if(!json.isMember("textFields")) return false;
- {
- const Json::Value& j=json["textFields"];
- if(!j.isArray()) return false;
- c.textFields.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TextField t;
- if(!TextFieldMarshaller::fromJSON(j[i],t))
- return false;
- c.textFields[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h
deleted file mode 100644
index c33c6fdd0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DISPLAYCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DISPLAYCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct DisplayCapabilitiesMarshaller
- {
- static bool checkIntegrity(DisplayCapabilities& e);
- static bool checkIntegrityConst(const DisplayCapabilities& e);
-
- static bool fromString(const std::string& s,DisplayCapabilities& e);
- static const std::string toString(const DisplayCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,DisplayCapabilities& e);
- static Json::Value toJSON(const DisplayCapabilities& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp
deleted file mode 100644
index c7bcf0f3d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayType.h"
-#include "DisplayTypeMarshaller.h"
-#include "DisplayTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const DisplayType::DisplayTypeInternal DisplayTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return DisplayType::INVALID_ENUM;
- const struct PerfectHashTable* p=DisplayType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<DisplayType::DisplayTypeInternal>(p->idx) : DisplayType::INVALID_ENUM;
-}
-
-
-bool DisplayTypeMarshaller::fromJSON(const Json::Value& s,DisplayType& e)
-{
- e.mInternal=DisplayType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=DisplayType::INVALID_ENUM);
-}
-
-
-Json::Value DisplayTypeMarshaller::toJSON(const DisplayType& e)
-{
- if(e.mInternal==DisplayType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DisplayTypeMarshaller::fromString(const std::string& s,DisplayType& e)
-{
- e.mInternal=DisplayType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string DisplayTypeMarshaller::toString(const DisplayType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==DisplayType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DisplayTypeMarshaller::mHashTable[9]=
-{
- {"CID",0},
- {"TYPE2",1},
- {"TYPE5",2},
- {"NGN",3},
- {"GEN2_8_DMA",4},
- {"GEN2_6_DMA",5},
- {"MFD3",6},
- {"MFD4",7},
- {"MFD5",8}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp
deleted file mode 100644
index e2ba9124a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp
+++ /dev/null
@@ -1,25 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DisplayType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-CID,0
-TYPE2,1
-TYPE5,2
-NGN,3
-GEN2_8_DMA,4
-GEN2_6_DMA,5
-MFD3,6
-MFD4,7
-MFD5,8
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h
deleted file mode 100644
index 993e3ee5a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DISPLAYTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DISPLAYTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for DisplayType
-
- class DisplayTypeMarshaller
- {
- public:
-
- static std::string toName(const DisplayType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(DisplayType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=DisplayType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(DisplayType& e) { return e.mInternal!=DisplayType::INVALID_ENUM; }
- static bool checkIntegrityConst(const DisplayType& e) { return e.mInternal!=DisplayType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,DisplayType& e);
- static const std::string toString(const DisplayType& e);
-
- static bool fromJSON(const Json::Value& s,DisplayType& e);
- static Json::Value toJSON(const DisplayType& e);
-
- static const char* getName(DisplayType::DisplayTypeInternal e)
- {
- return (e>=0 && e<9) ? mHashTable[e].name : NULL;
- }
-
- static const DisplayType::DisplayTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[9];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc
deleted file mode 100644
index feab4a103..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp */
-/* Computed positions: -k'6,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 9
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 20
-/* maximum key range = 18, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class DisplayType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-DisplayType_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 15, 10, 5, 0, 5, 21, 0, 21, 21, 21,
- 21, 21, 21, 21, 21, 0, 21, 21, 5, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 0, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[5]];
- /*FALLTHROUGH*/
- case 5:
- case 4:
- case 3:
- break;
- }
- return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-DisplayType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 3, 4, 5, 0, 0, 3, 4, 10, 0, 0, 0,
- 4, 10, 0, 0, 0, 0, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"NGN",3},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"MFD5",8},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"TYPE5",2},
- {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"CID",0},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"MFD4",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"GEN2_8_DMA",4},
- {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"MFD3",6},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"GEN2_6_DMA",5},
- {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
- {"TYPE2",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp
deleted file mode 100644
index e1386d46a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h"
-#include "DriverDistractionStateMarshaller.h"
-#include "DriverDistractionStateMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const DriverDistractionState::DriverDistractionStateInternal DriverDistractionStateMarshaller::getIndex(const char* s)
-{
- if(!s)
- return DriverDistractionState::INVALID_ENUM;
- const struct PerfectHashTable* p=DriverDistractionState_intHash::getPointer(s,strlen(s));
- return p ? static_cast<DriverDistractionState::DriverDistractionStateInternal>(p->idx) : DriverDistractionState::INVALID_ENUM;
-}
-
-
-bool DriverDistractionStateMarshaller::fromJSON(const Json::Value& s,DriverDistractionState& e)
-{
- e.mInternal=DriverDistractionState::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=DriverDistractionState::INVALID_ENUM);
-}
-
-
-Json::Value DriverDistractionStateMarshaller::toJSON(const DriverDistractionState& e)
-{
- if(e.mInternal==DriverDistractionState::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DriverDistractionStateMarshaller::fromString(const std::string& s,DriverDistractionState& e)
-{
- e.mInternal=DriverDistractionState::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string DriverDistractionStateMarshaller::toString(const DriverDistractionState& e)
-{
- Json::FastWriter writer;
- return e.mInternal==DriverDistractionState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DriverDistractionStateMarshaller::mHashTable[2]=
-{
- {"DD_ON",0},
- {"DD_OFF",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp
deleted file mode 100644
index c0b6849cd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DriverDistractionState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-DD_ON,0
-DD_OFF,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h
deleted file mode 100644
index 61e3c4bfd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DRIVERDISTRACTIONSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DRIVERDISTRACTIONSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for DriverDistractionState
-
- class DriverDistractionStateMarshaller
- {
- public:
-
- static std::string toName(const DriverDistractionState& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(DriverDistractionState& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=DriverDistractionState::INVALID_ENUM;
- }
-
- static bool checkIntegrity(DriverDistractionState& e) { return e.mInternal!=DriverDistractionState::INVALID_ENUM; }
- static bool checkIntegrityConst(const DriverDistractionState& e) { return e.mInternal!=DriverDistractionState::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,DriverDistractionState& e);
- static const std::string toString(const DriverDistractionState& e);
-
- static bool fromJSON(const Json::Value& s,DriverDistractionState& e);
- static Json::Value toJSON(const DriverDistractionState& e);
-
- static const char* getName(DriverDistractionState::DriverDistractionStateInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const DriverDistractionState::DriverDistractionStateInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc
deleted file mode 100644
index 122d4837e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 6
-/* maximum key range = 2, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class DriverDistractionState_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-DriverDistractionState_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-DriverDistractionState_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 5, 6
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp"
- {"DD_ON",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp"
- {"DD_OFF",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp
deleted file mode 100644
index 7ae78baa3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-#include "EncodedSyncPData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-EncodedSyncPData_request::~EncodedSyncPData_request(void)
-{
-}
-
-
-EncodedSyncPData_request::EncodedSyncPData_request(const EncodedSyncPData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool EncodedSyncPData_request::checkIntegrity(void)
-{
- return EncodedSyncPData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-EncodedSyncPData_request::EncodedSyncPData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool EncodedSyncPData_request::set_data(const std::vector<std::string>& data_)
-{
- unsigned int i=data_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(data_[i].length()>10000) return false;
- }
- data=data_;
- return true;
-}
-
-
-
-
-const std::vector<std::string>& EncodedSyncPData_request::get_data(void) const
-{
- return data;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp
deleted file mode 100644
index 7d94b0404..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-
-
-#include "EncodedSyncPData_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EncodedSyncPData_requestMarshaller::checkIntegrity(EncodedSyncPData_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool EncodedSyncPData_requestMarshaller::fromString(const std::string& s,EncodedSyncPData_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string EncodedSyncPData_requestMarshaller::toString(const EncodedSyncPData_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EncodedSyncPData_requestMarshaller::checkIntegrityConst(const EncodedSyncPData_request& s)
-{
- {
- unsigned int i=s.data.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.data[i].length()>10000) return false;
- }
- }
- return true;
-}
-
-Json::Value EncodedSyncPData_requestMarshaller::toJSON(const EncodedSyncPData_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["data"]=Json::Value(Json::arrayValue);
- json["data"].resize(e.data.size());
- for(unsigned int i=0;i<e.data.size();i++)
- json["data"][i]=Json::Value(e.data[i]);
-
- return json;
-}
-
-
-bool EncodedSyncPData_requestMarshaller::fromJSON(const Json::Value& json,EncodedSyncPData_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("data")) return false;
- {
- const Json::Value& j=json["data"];
- if(!j.isArray()) return false;
- c.data.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.data[i]=j[i].asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h
deleted file mode 100644
index a8b37e8f6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct EncodedSyncPData_requestMarshaller
- {
- static bool checkIntegrity(EncodedSyncPData_request& e);
- static bool checkIntegrityConst(const EncodedSyncPData_request& e);
-
- static bool fromString(const std::string& s,EncodedSyncPData_request& e);
- static const std::string toString(const EncodedSyncPData_request& e);
-
- static bool fromJSON(const Json::Value& s,EncodedSyncPData_request& e);
- static Json::Value toJSON(const EncodedSyncPData_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp
deleted file mode 100644
index 2c748c718..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-#include "EncodedSyncPData_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-EncodedSyncPData_response& EncodedSyncPData_response::operator =(const EncodedSyncPData_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-EncodedSyncPData_response::~EncodedSyncPData_response(void)
-{}
-
-
-EncodedSyncPData_response::EncodedSyncPData_response(const EncodedSyncPData_response& c)
-{
- *this = c;
-}
-
-bool EncodedSyncPData_response::checkIntegrity(void)
-{
- return EncodedSyncPData_responseMarshaller::checkIntegrity(*this);
-}
-
-EncodedSyncPData_response::EncodedSyncPData_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp
deleted file mode 100644
index 23092f8dc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-#include "ResultMarshaller.h"
-
-#include "EncodedSyncPData_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EncodedSyncPData_responseMarshaller::checkIntegrity(EncodedSyncPData_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool EncodedSyncPData_responseMarshaller::fromString(const std::string& s,EncodedSyncPData_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string EncodedSyncPData_responseMarshaller::toString(const EncodedSyncPData_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EncodedSyncPData_responseMarshaller::checkIntegrityConst(const EncodedSyncPData_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value EncodedSyncPData_responseMarshaller::toJSON(const EncodedSyncPData_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool EncodedSyncPData_responseMarshaller::fromJSON(const Json::Value& json,EncodedSyncPData_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h
deleted file mode 100644
index b0298055d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct EncodedSyncPData_responseMarshaller
- {
- static bool checkIntegrity(EncodedSyncPData_response& e);
- static bool checkIntegrityConst(const EncodedSyncPData_response& e);
-
- static bool fromString(const std::string& s,EncodedSyncPData_response& e);
- static const std::string toString(const EncodedSyncPData_response& e);
-
- static bool fromJSON(const Json::Value& s,EncodedSyncPData_response& e);
- static Json::Value toJSON(const EncodedSyncPData_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp
deleted file mode 100644
index af0fceaac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-#include "EndAudioPassThru_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-EndAudioPassThru_request::~EndAudioPassThru_request(void)
-{
-}
-
-
-EndAudioPassThru_request::EndAudioPassThru_request(const EndAudioPassThru_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool EndAudioPassThru_request::checkIntegrity(void)
-{
- return EndAudioPassThru_requestMarshaller::checkIntegrity(*this);
-}
-
-
-EndAudioPassThru_request::EndAudioPassThru_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp
deleted file mode 100644
index 02e625b33..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-
-
-#include "EndAudioPassThru_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EndAudioPassThru_requestMarshaller::checkIntegrity(EndAudioPassThru_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool EndAudioPassThru_requestMarshaller::fromString(const std::string& s,EndAudioPassThru_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string EndAudioPassThru_requestMarshaller::toString(const EndAudioPassThru_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EndAudioPassThru_requestMarshaller::checkIntegrityConst(const EndAudioPassThru_request& s)
-{
- return true;
-}
-
-Json::Value EndAudioPassThru_requestMarshaller::toJSON(const EndAudioPassThru_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- return json;
-}
-
-
-bool EndAudioPassThru_requestMarshaller::fromJSON(const Json::Value& json,EndAudioPassThru_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h
deleted file mode 100644
index 15b2c7e2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct EndAudioPassThru_requestMarshaller
- {
- static bool checkIntegrity(EndAudioPassThru_request& e);
- static bool checkIntegrityConst(const EndAudioPassThru_request& e);
-
- static bool fromString(const std::string& s,EndAudioPassThru_request& e);
- static const std::string toString(const EndAudioPassThru_request& e);
-
- static bool fromJSON(const Json::Value& s,EndAudioPassThru_request& e);
- static Json::Value toJSON(const EndAudioPassThru_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp
deleted file mode 100644
index 30b966b94..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-#include "EndAudioPassThru_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-EndAudioPassThru_response& EndAudioPassThru_response::operator =(const EndAudioPassThru_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-EndAudioPassThru_response::~EndAudioPassThru_response(void)
-{}
-
-EndAudioPassThru_response::EndAudioPassThru_response(const EndAudioPassThru_response& c)
-{
- *this = c;
-}
-
-bool EndAudioPassThru_response::checkIntegrity(void)
-{
- return EndAudioPassThru_responseMarshaller::checkIntegrity(*this);
-}
-
-EndAudioPassThru_response::EndAudioPassThru_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp
deleted file mode 100644
index 9ebee48c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-#include "ResultMarshaller.h"
-
-#include "EndAudioPassThru_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EndAudioPassThru_responseMarshaller::checkIntegrity(EndAudioPassThru_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool EndAudioPassThru_responseMarshaller::fromString(const std::string& s,EndAudioPassThru_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string EndAudioPassThru_responseMarshaller::toString(const EndAudioPassThru_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EndAudioPassThru_responseMarshaller::checkIntegrityConst(const EndAudioPassThru_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value EndAudioPassThru_responseMarshaller::toJSON(const EndAudioPassThru_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool EndAudioPassThru_responseMarshaller::fromJSON(const Json::Value& json,EndAudioPassThru_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h
deleted file mode 100644
index 2f0e997b0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct EndAudioPassThru_responseMarshaller
- {
- static bool checkIntegrity(EndAudioPassThru_response& e);
- static bool checkIntegrityConst(const EndAudioPassThru_response& e);
-
- static bool fromString(const std::string& s,EndAudioPassThru_response& e);
- static const std::string toString(const EndAudioPassThru_response& e);
-
- static bool fromJSON(const Json::Value& s,EndAudioPassThru_response& e);
- static Json::Value toJSON(const EndAudioPassThru_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp
deleted file mode 100644
index 787108cac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/FileType.h"
-#include "FileTypeMarshaller.h"
-#include "FileTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const FileType::FileTypeInternal FileTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return FileType::INVALID_ENUM;
- const struct PerfectHashTable* p=FileType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<FileType::FileTypeInternal>(p->idx) : FileType::INVALID_ENUM;
-}
-
-
-bool FileTypeMarshaller::fromJSON(const Json::Value& s,FileType& e)
-{
- e.mInternal=FileType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=FileType::INVALID_ENUM);
-}
-
-
-Json::Value FileTypeMarshaller::toJSON(const FileType& e)
-{
- if(e.mInternal==FileType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool FileTypeMarshaller::fromString(const std::string& s,FileType& e)
-{
- e.mInternal=FileType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string FileTypeMarshaller::toString(const FileType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==FileType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable FileTypeMarshaller::mHashTable[5]=
-{
- {"GRAPHIC_BMP",0},
- {"GRAPHIC_JPEG",1},
- {"GRAPHIC_PNG",2},
- {"AUDIO_WAVE",3},
- {"AUDIO_MP3",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp
deleted file mode 100644
index b4d0f0af2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name FileType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-GRAPHIC_BMP,0
-GRAPHIC_JPEG,1
-GRAPHIC_PNG,2
-AUDIO_WAVE,3
-AUDIO_MP3,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h
deleted file mode 100644
index baee50d4a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_FILETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_FILETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/FileType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for FileType
-
- class FileTypeMarshaller
- {
- public:
-
- static std::string toName(const FileType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(FileType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=FileType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(FileType& e) { return e.mInternal!=FileType::INVALID_ENUM; }
- static bool checkIntegrityConst(const FileType& e) { return e.mInternal!=FileType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,FileType& e);
- static const std::string toString(const FileType& e);
-
- static bool fromJSON(const Json::Value& s,FileType& e);
- static Json::Value toJSON(const FileType& e);
-
- static const char* getName(FileType::FileTypeInternal e)
- {
- return (e>=0 && e<5) ? mHashTable[e].name : NULL;
- }
-
- static const FileType::FileTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[5];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc
deleted file mode 100644
index 1b8803d39..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp */
-/* Computed positions: -k'9' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 9
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 16
-/* maximum key range = 8, duplicates = 0 */
-
-class FileType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-FileType_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 0, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 5, 17, 17, 17,
- 17, 17, 17, 17, 0, 17, 17, 17, 17, 17,
- 0, 17, 17, 17, 17, 17, 0, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17
- };
- return len + asso_values[(unsigned char)str[8]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-FileType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 11, 12, 0,
- 0, 0, 11
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
- {"AUDIO_MP3",4},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
- {"AUDIO_WAVE",3},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
- {"GRAPHIC_PNG",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
- {"GRAPHIC_JPEG",1},
- {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
- {"GRAPHIC_BMP",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp
deleted file mode 100644
index b6f59765b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/FunctionID.h"
-#include "FunctionIDMarshaller.h"
-#include "FunctionIDMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const FunctionID::FunctionIDInternal FunctionIDMarshaller::getIndex(const char* s)
-{
- if(!s)
- return FunctionID::INVALID_ENUM;
- const struct PerfectHashTable* p=FunctionID_intHash::getPointer(s,strlen(s));
- return p ? static_cast<FunctionID::FunctionIDInternal>(p->idx) : FunctionID::INVALID_ENUM;
-}
-
-
-bool FunctionIDMarshaller::fromJSON(const Json::Value& s,FunctionID& e)
-{
- e.mInternal=FunctionID::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=FunctionID::INVALID_ENUM);
-}
-
-
-Json::Value FunctionIDMarshaller::toJSON(const FunctionID& e)
-{
- if(e.mInternal==FunctionID::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool FunctionIDMarshaller::fromString(const std::string& s,FunctionID& e)
-{
- e.mInternal=FunctionID::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string FunctionIDMarshaller::toString(const FunctionID& e)
-{
- Json::FastWriter writer;
- return e.mInternal==FunctionID::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable FunctionIDMarshaller::mHashTable[51]=
-{
- {"RESERVED",0},
- {"RegisterAppInterfaceID",1},
- {"UnregisterAppInterfaceID",2},
- {"SetGlobalPropertiesID",3},
- {"ResetGlobalPropertiesID",4},
- {"AddCommandID",5},
- {"DeleteCommandID",6},
- {"AddSubMenuID",7},
- {"DeleteSubMenuID",8},
- {"CreateInteractionChoiceSetID",9},
- {"PerformInteractionID",10},
- {"DeleteInteractionChoiceSetID",11},
- {"AlertID",12},
- {"ShowID",13},
- {"SpeakID",14},
- {"SetMediaClockTimerID",15},
- {"EncodedSyncPDataID",16},
- {"DialNumberID",17},
- {"PerformAudioPassThruID",18},
- {"EndAudioPassThruID",19},
- {"SubscribeButtonID",20},
- {"UnsubscribeButtonID",21},
- {"SubscribeVehicleDataID",22},
- {"UnsubscribeVehicleDataID",23},
- {"GetVehicleDataID",24},
- {"ReadDIDID",25},
- {"GetDTCsID",26},
- {"ScrollableMessageID",27},
- {"SliderID",28},
- {"ShowConstantTBTID",29},
- {"AlertManeuverID",30},
- {"UpdateTurnListID",31},
- {"ChangeRegistrationID",32},
- {"GenericResponseID",33},
- {"PutFileID",34},
- {"DeleteFileID",35},
- {"ListFilesID",36},
- {"SetAppIconID",37},
- {"SetDisplayLayoutID",38},
- {"OnHMIStatusID",39},
- {"OnAppInterfaceUnregisteredID",40},
- {"OnButtonEventID",41},
- {"OnButtonPressID",42},
- {"OnVehicleDataID",43},
- {"OnCommandID",44},
- {"OnEncodedSyncPDataID",45},
- {"OnTBTClientStateID",46},
- {"OnDriverDistractionID",47},
- {"OnPermissionsChangeID",48},
- {"OnAudioPassThruID",49},
- {"OnLanguageChangeID",50}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp
deleted file mode 100644
index 8b63cd618..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp
+++ /dev/null
@@ -1,67 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name FunctionID_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-RESERVED,0
-RegisterAppInterfaceID,1
-UnregisterAppInterfaceID,2
-SetGlobalPropertiesID,3
-ResetGlobalPropertiesID,4
-AddCommandID,5
-DeleteCommandID,6
-AddSubMenuID,7
-DeleteSubMenuID,8
-CreateInteractionChoiceSetID,9
-PerformInteractionID,10
-DeleteInteractionChoiceSetID,11
-AlertID,12
-ShowID,13
-SpeakID,14
-SetMediaClockTimerID,15
-EncodedSyncPDataID,16
-DialNumberID,17
-PerformAudioPassThruID,18
-EndAudioPassThruID,19
-SubscribeButtonID,20
-UnsubscribeButtonID,21
-SubscribeVehicleDataID,22
-UnsubscribeVehicleDataID,23
-GetVehicleDataID,24
-ReadDIDID,25
-GetDTCsID,26
-ScrollableMessageID,27
-SliderID,28
-ShowConstantTBTID,29
-AlertManeuverID,30
-UpdateTurnListID,31
-ChangeRegistrationID,32
-GenericResponseID,33
-PutFileID,34
-DeleteFileID,35
-ListFilesID,36
-SetAppIconID,37
-SetDisplayLayoutID,38
-OnHMIStatusID,39
-OnAppInterfaceUnregisteredID,40
-OnButtonEventID,41
-OnButtonPressID,42
-OnVehicleDataID,43
-OnCommandID,44
-OnEncodedSyncPDataID,45
-OnTBTClientStateID,46
-OnDriverDistractionID,47
-OnPermissionsChangeID,48
-OnAudioPassThruID,49
-OnLanguageChangeID,50
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h
deleted file mode 100644
index 8886f7fa8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_FUNCTIONIDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_FUNCTIONIDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/FunctionID.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for FunctionID
-
- class FunctionIDMarshaller
- {
- public:
-
- static std::string toName(const FunctionID& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(FunctionID& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=FunctionID::INVALID_ENUM;
- }
-
- static bool checkIntegrity(FunctionID& e) { return e.mInternal!=FunctionID::INVALID_ENUM; }
- static bool checkIntegrityConst(const FunctionID& e) { return e.mInternal!=FunctionID::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,FunctionID& e);
- static const std::string toString(const FunctionID& e);
-
- static bool fromJSON(const Json::Value& s,FunctionID& e);
- static Json::Value toJSON(const FunctionID& e);
-
- static const char* getName(FunctionID::FunctionIDInternal e)
- {
- return (e>=0 && e<51) ? mHashTable[e].name : NULL;
- }
-
- static const FunctionID::FunctionIDInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[51];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc
deleted file mode 100644
index 132b431b9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp */
-/* Computed positions: -k'4,9' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 51
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 28
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 72
-/* maximum key range = 66, duplicates = 0 */
-
-class FunctionID_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-FunctionID_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 35, 0, 45, 0, 0,
- 45, 10, 73, 73, 73, 73, 73, 10, 73, 73,
- 73, 0, 73, 35, 73, 73, 10, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 0, 25, 30,
- 5, 10, 0, 73, 15, 35, 0, 73, 40, 15,
- 15, 15, 20, 73, 5, 0, 0, 0, 25, 15,
- 73, 73, 25, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
- 73, 73, 73, 73, 73, 73, 73
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[8]+1];
- /*FALLTHROUGH*/
- case 8:
- case 7:
- case 6:
- case 5:
- case 4:
- hval += asso_values[(unsigned char)str[3]];
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-FunctionID_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 0, 11, 7, 8,
- 9, 15, 16, 17, 18, 19, 15, 6, 22, 13, 24, 15, 21, 17,
- 28, 0, 20, 21, 17, 18, 24, 20, 11, 12, 28, 0, 15, 16,
- 17, 18, 0, 20, 21, 22, 28, 19, 20, 0, 12, 18, 9, 15,
- 0, 22, 18, 0, 15, 0, 12, 23, 0, 0, 0, 12, 0, 0,
- 0, 0, 12
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SpeakID",14},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"RESERVED",0},
-#line 43 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"GetDTCsID",26},
- {""},
-#line 53 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ListFilesID",36},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"AlertID",12},
-#line 45 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SliderID",28},
-#line 42 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ReadDIDID",25},
-#line 59 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnButtonPressID",42},
-#line 48 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"UpdateTurnListID",31},
-#line 37 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SubscribeButtonID",20},
-#line 63 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnTBTClientStateID",46},
-#line 38 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"UnsubscribeButtonID",21},
-#line 47 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"AlertManeuverID",30},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ShowID",13},
-#line 39 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SubscribeVehicleDataID",22},
-#line 56 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnHMIStatusID",39},
-#line 40 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"UnsubscribeVehicleDataID",23},
-#line 60 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnVehicleDataID",43},
-#line 64 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnDriverDistractionID",47},
-#line 50 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"GenericResponseID",33},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"CreateInteractionChoiceSetID",9},
- {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SetMediaClockTimerID",15},
-#line 65 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnPermissionsChangeID",48},
-#line 46 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ShowConstantTBTID",29},
-#line 67 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnLanguageChangeID",50},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"UnregisterAppInterfaceID",2},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"PerformInteractionID",10},
-#line 61 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnCommandID",44},
-#line 52 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"DeleteFileID",35},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"DeleteInteractionChoiceSetID",11},
- {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"DeleteCommandID",6},
-#line 41 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"GetVehicleDataID",24},
-#line 66 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnAudioPassThruID",49},
-#line 55 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SetDisplayLayoutID",38},
- {""},
-#line 62 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnEncodedSyncPDataID",45},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SetGlobalPropertiesID",3},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"PerformAudioPassThruID",18},
-#line 57 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnAppInterfaceUnregisteredID",40},
-#line 44 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ScrollableMessageID",27},
-#line 49 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ChangeRegistrationID",32},
- {""},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"DialNumberID",17},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"EndAudioPassThruID",19},
-#line 51 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"PutFileID",34},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"DeleteSubMenuID",8},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"RegisterAppInterfaceID",1},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"EncodedSyncPDataID",16},
- {""},
-#line 58 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"OnButtonEventID",41},
- {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"AddSubMenuID",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"ResetGlobalPropertiesID",4},
- {""}, {""}, {""},
-#line 54 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"SetAppIconID",37},
- {""}, {""}, {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
- {"AddCommandID",5}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp
deleted file mode 100644
index c2c81057d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-#include "GPSDataMarshaller.h"
-#include "CompassDirectionMarshaller.h"
-#include "DimensionMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-GPSData::GPSData(const GPSData& c)
-{
- *this=c;
-}
-
-
-bool GPSData::checkIntegrity(void)
-{
- return GPSDataMarshaller::checkIntegrity(*this);
-}
-
-
-GPSData::GPSData(void)
-{
-}
-
-
-
-bool GPSData::set_actual(bool actual_)
-{
- actual=actual_;
- return true;
-}
-
-bool GPSData::set_altitude(int altitude_)
-{
- if(altitude_>10000) return false;
- altitude=altitude_;
- return true;
-}
-
-bool GPSData::set_compassDirection(const CompassDirection& compassDirection_)
-{
- if(!CompassDirectionMarshaller::checkIntegrityConst(compassDirection_)) return false;
- compassDirection=compassDirection_;
- return true;
-}
-
-bool GPSData::set_dimension(const Dimension& dimension_)
-{
- if(!DimensionMarshaller::checkIntegrityConst(dimension_)) return false;
- dimension=dimension_;
- return true;
-}
-
-bool GPSData::set_hdop(unsigned int hdop_)
-{
- if(hdop_>31) return false;
- hdop=hdop_;
- return true;
-}
-
-bool GPSData::set_heading(unsigned int heading_)
-{
- if(heading_>360) return false;
- heading=heading_;
- return true;
-}
-
-bool GPSData::set_latitudeDegrees(int latitudeDegrees_)
-{
- if(latitudeDegrees_>1000000000) return false;
- latitudeDegrees=latitudeDegrees_;
- return true;
-}
-
-bool GPSData::set_longitudeDegrees(int longitudeDegrees_)
-{
- if(longitudeDegrees_>1000000000) return false;
- longitudeDegrees=longitudeDegrees_;
- return true;
-}
-
-bool GPSData::set_pdop(unsigned int pdop_)
-{
- if(pdop_>31) return false;
- pdop=pdop_;
- return true;
-}
-
-bool GPSData::set_satellites(unsigned int satellites_)
-{
- if(satellites_>31) return false;
- satellites=satellites_;
- return true;
-}
-
-bool GPSData::set_speed(unsigned int speed_)
-{
- if(speed_>400) return false;
- speed=speed_;
- return true;
-}
-
-bool GPSData::set_utcDay(unsigned int utcDay_)
-{
- if(utcDay_>31) return false;
- if(utcDay_<1) return false;
- utcDay=utcDay_;
- return true;
-}
-
-bool GPSData::set_utcHours(unsigned int utcHours_)
-{
- if(utcHours_>23) return false;
- utcHours=utcHours_;
- return true;
-}
-
-bool GPSData::set_utcMinutes(unsigned int utcMinutes_)
-{
- if(utcMinutes_>59) return false;
- utcMinutes=utcMinutes_;
- return true;
-}
-
-bool GPSData::set_utcMonth(unsigned int utcMonth_)
-{
- if(utcMonth_>12) return false;
- if(utcMonth_<1) return false;
- utcMonth=utcMonth_;
- return true;
-}
-
-bool GPSData::set_utcSeconds(unsigned int utcSeconds_)
-{
- if(utcSeconds_>59) return false;
- utcSeconds=utcSeconds_;
- return true;
-}
-
-bool GPSData::set_utcYear(unsigned int utcYear_)
-{
- if(utcYear_>2100) return false;
- if(utcYear_<2010) return false;
- utcYear=utcYear_;
- return true;
-}
-
-bool GPSData::set_vdop(unsigned int vdop_)
-{
- if(vdop_>31) return false;
- vdop=vdop_;
- return true;
-}
-
-
-
-
-bool GPSData::get_actual(void) const
-{
- return actual;
-}
-
-
-int GPSData::get_altitude(void) const
-{
- return altitude;
-}
-
-
-const CompassDirection& GPSData::get_compassDirection(void) const
-{
- return compassDirection;
-}
-
-
-const Dimension& GPSData::get_dimension(void) const
-{
- return dimension;
-}
-
-
-unsigned int GPSData::get_hdop(void) const
-{
- return hdop;
-}
-
-
-unsigned int GPSData::get_heading(void) const
-{
- return heading;
-}
-
-
-int GPSData::get_latitudeDegrees(void) const
-{
- return latitudeDegrees;
-}
-
-
-int GPSData::get_longitudeDegrees(void) const
-{
- return longitudeDegrees;
-}
-
-
-unsigned int GPSData::get_pdop(void) const
-{
- return pdop;
-}
-
-
-unsigned int GPSData::get_satellites(void) const
-{
- return satellites;
-}
-
-
-unsigned int GPSData::get_speed(void) const
-{
- return speed;
-}
-
-
-unsigned int GPSData::get_utcDay(void) const
-{
- return utcDay;
-}
-
-
-unsigned int GPSData::get_utcHours(void) const
-{
- return utcHours;
-}
-
-
-unsigned int GPSData::get_utcMinutes(void) const
-{
- return utcMinutes;
-}
-
-
-unsigned int GPSData::get_utcMonth(void) const
-{
- return utcMonth;
-}
-
-
-unsigned int GPSData::get_utcSeconds(void) const
-{
- return utcSeconds;
-}
-
-
-unsigned int GPSData::get_utcYear(void) const
-{
- return utcYear;
-}
-
-
-unsigned int GPSData::get_vdop(void) const
-{
- return vdop;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp
deleted file mode 100644
index 51ff8cb54..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-#include "CompassDirectionMarshaller.h"
-#include "DimensionMarshaller.h"
-
-#include "GPSDataMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GPSDataMarshaller::checkIntegrity(GPSData& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool GPSDataMarshaller::fromString(const std::string& s,GPSData& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string GPSDataMarshaller::toString(const GPSData& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GPSDataMarshaller::checkIntegrityConst(const GPSData& s)
-{
- if(s.altitude>10000) return false;
- if(s.altitude<-10000) return false;
- if(!CompassDirectionMarshaller::checkIntegrityConst(s.compassDirection)) return false;
- if(!DimensionMarshaller::checkIntegrityConst(s.dimension)) return false;
- if(s.hdop>31) return false;
- if(s.heading>360) return false;
- if(s.latitudeDegrees>1000000000) return false;
- if(s.latitudeDegrees<-1000000000) return false;
- if(s.longitudeDegrees>1000000000) return false;
- if(s.longitudeDegrees<-1000000000) return false;
- if(s.pdop>31) return false;
- if(s.satellites>31) return false;
- if(s.speed>400) return false;
- if(s.utcDay>31) return false;
- if(s.utcDay<1) return false;
- if(s.utcHours>23) return false;
- if(s.utcMinutes>59) return false;
- if(s.utcMonth>12) return false;
- if(s.utcMonth<1) return false;
- if(s.utcSeconds>59) return false;
- if(s.utcYear>2100) return false;
- if(s.utcYear<2010) return false;
- if(s.vdop>31) return false;
- return true;
-}
-
-Json::Value GPSDataMarshaller::toJSON(const GPSData& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["actual"]=Json::Value(e.actual);
-
- json["altitude"]=Json::Value(e.altitude);
-
- json["compassDirection"]=CompassDirectionMarshaller::toJSON(e.compassDirection);
-
- json["dimension"]=DimensionMarshaller::toJSON(e.dimension);
-
- json["hdop"]=Json::Value(e.hdop);
-
- json["heading"]=Json::Value(e.heading);
-
- json["latitudeDegrees"]=Json::Value(e.latitudeDegrees);
-
- json["longitudeDegrees"]=Json::Value(e.longitudeDegrees);
-
- json["pdop"]=Json::Value(e.pdop);
-
- json["satellites"]=Json::Value(e.satellites);
-
- json["speed"]=Json::Value(e.speed);
-
- json["utcDay"]=Json::Value(e.utcDay);
-
- json["utcHours"]=Json::Value(e.utcHours);
-
- json["utcMinutes"]=Json::Value(e.utcMinutes);
-
- json["utcMonth"]=Json::Value(e.utcMonth);
-
- json["utcSeconds"]=Json::Value(e.utcSeconds);
-
- json["utcYear"]=Json::Value(e.utcYear);
-
- json["vdop"]=Json::Value(e.vdop);
-
-
- return json;
-}
-
-
-bool GPSDataMarshaller::fromJSON(const Json::Value& json,GPSData& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("actual")) return false;
- {
- const Json::Value& j=json["actual"];
- if(!j.isBool()) return false;
- c.actual=j.asBool();
- }
- if(!json.isMember("altitude")) return false;
- {
- const Json::Value& j=json["altitude"];
- if(!j.isInt()) return false;
- c.altitude=j.asInt();
- }
- if(!json.isMember("compassDirection")) return false;
- {
- const Json::Value& j=json["compassDirection"];
- if(!CompassDirectionMarshaller::fromJSON(j,c.compassDirection))
- return false;
- }
- if(!json.isMember("dimension")) return false;
- {
- const Json::Value& j=json["dimension"];
- if(!DimensionMarshaller::fromJSON(j,c.dimension))
- return false;
- }
- if(!json.isMember("hdop")) return false;
- {
- const Json::Value& j=json["hdop"];
- if(!j.isInt()) return false;
- c.hdop=j.asInt();
- }
- if(!json.isMember("heading")) return false;
- {
- const Json::Value& j=json["heading"];
- if(!j.isInt()) return false;
- c.heading=j.asInt();
- }
- if(!json.isMember("latitudeDegrees")) return false;
- {
- const Json::Value& j=json["latitudeDegrees"];
- if(!j.isInt()) return false;
- c.latitudeDegrees=j.asInt();
- }
- if(!json.isMember("longitudeDegrees")) return false;
- {
- const Json::Value& j=json["longitudeDegrees"];
- if(!j.isInt()) return false;
- c.longitudeDegrees=j.asInt();
- }
- if(!json.isMember("pdop")) return false;
- {
- const Json::Value& j=json["pdop"];
- if(!j.isInt()) return false;
- c.pdop=j.asInt();
- }
- if(!json.isMember("satellites")) return false;
- {
- const Json::Value& j=json["satellites"];
- if(!j.isInt()) return false;
- c.satellites=j.asInt();
- }
- if(!json.isMember("speed")) return false;
- {
- const Json::Value& j=json["speed"];
- if(!j.isInt()) return false;
- c.speed=j.asInt();
- }
- if(!json.isMember("utcDay")) return false;
- {
- const Json::Value& j=json["utcDay"];
- if(!j.isInt()) return false;
- c.utcDay=j.asInt();
- }
- if(!json.isMember("utcHours")) return false;
- {
- const Json::Value& j=json["utcHours"];
- if(!j.isInt()) return false;
- c.utcHours=j.asInt();
- }
- if(!json.isMember("utcMinutes")) return false;
- {
- const Json::Value& j=json["utcMinutes"];
- if(!j.isInt()) return false;
- c.utcMinutes=j.asInt();
- }
- if(!json.isMember("utcMonth")) return false;
- {
- const Json::Value& j=json["utcMonth"];
- if(!j.isInt()) return false;
- c.utcMonth=j.asInt();
- }
- if(!json.isMember("utcSeconds")) return false;
- {
- const Json::Value& j=json["utcSeconds"];
- if(!j.isInt()) return false;
- c.utcSeconds=j.asInt();
- }
- if(!json.isMember("utcYear")) return false;
- {
- const Json::Value& j=json["utcYear"];
- if(!j.isInt()) return false;
- c.utcYear=j.asInt();
- }
- if(!json.isMember("vdop")) return false;
- {
- const Json::Value& j=json["vdop"];
- if(!j.isInt()) return false;
- c.vdop=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h
deleted file mode 100644
index bdc6a0cf6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GPSDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GPSDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct GPSDataMarshaller
- {
- static bool checkIntegrity(GPSData& e);
- static bool checkIntegrityConst(const GPSData& e);
-
- static bool fromString(const std::string& s,GPSData& e);
- static const std::string toString(const GPSData& e);
-
- static bool fromJSON(const Json::Value& s,GPSData& e);
- static Json::Value toJSON(const GPSData& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp
deleted file mode 100644
index 9d5e427cd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-#include "GenericResponse_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GenericResponse_response& GenericResponse_response::operator =(const GenericResponse_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-GenericResponse_response::~GenericResponse_response(void)
-{}
-
-GenericResponse_response::GenericResponse_response(const GenericResponse_response& c)
-{
- *this = c;
-}
-
-bool GenericResponse_response::checkIntegrity(void)
-{
- return GenericResponse_responseMarshaller::checkIntegrity(*this);
-}
-
-GenericResponse_response::GenericResponse_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp
deleted file mode 100644
index 5c9e368fb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-#include "ResultMarshaller.h"
-
-#include "GenericResponse_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GenericResponse_responseMarshaller::checkIntegrity(GenericResponse_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool GenericResponse_responseMarshaller::fromString(const std::string& s,GenericResponse_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string GenericResponse_responseMarshaller::toString(const GenericResponse_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GenericResponse_responseMarshaller::checkIntegrityConst(const GenericResponse_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value GenericResponse_responseMarshaller::toJSON(const GenericResponse_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool GenericResponse_responseMarshaller::fromJSON(const Json::Value& json,GenericResponse_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h
deleted file mode 100644
index c1807bec3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GENERICRESPONSE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GENERICRESPONSE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct GenericResponse_responseMarshaller
- {
- static bool checkIntegrity(GenericResponse_response& e);
- static bool checkIntegrityConst(const GenericResponse_response& e);
-
- static bool fromString(const std::string& s,GenericResponse_response& e);
- static const std::string toString(const GenericResponse_response& e);
-
- static bool fromJSON(const Json::Value& s,GenericResponse_response& e);
- static Json::Value toJSON(const GenericResponse_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp
deleted file mode 100644
index d4a63caed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-#include "GetDTCs_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GetDTCs_request& GetDTCs_request::operator =(const GetDTCs_request& c)
-{
- ecuName= c.ecuName;
- encrypted= c.encrypted ? new bool(c.encrypted[0]) : 0;
-
- return *this;
-}
-
-
-GetDTCs_request::~GetDTCs_request(void)
-{
- if(encrypted)
- delete encrypted;
-}
-
-
-GetDTCs_request::GetDTCs_request(const GetDTCs_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool GetDTCs_request::checkIntegrity(void)
-{
- return GetDTCs_requestMarshaller::checkIntegrity(*this);
-}
-
-
-GetDTCs_request::GetDTCs_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- encrypted(0)
-{
-}
-
-
-
-bool GetDTCs_request::set_ecuName(unsigned int ecuName_)
-{
- if(ecuName_>65535) return false;
- ecuName=ecuName_;
- return true;
-}
-
-bool GetDTCs_request::set_encrypted(bool encrypted_)
-{
- delete encrypted;
- encrypted=0;
-
- encrypted=new bool(encrypted_);
- return true;
-}
-
-void GetDTCs_request::reset_encrypted(void)
-{
- if(encrypted)
- delete encrypted;
- encrypted=0;
-}
-
-
-
-
-unsigned int GetDTCs_request::get_ecuName(void) const
-{
- return ecuName;
-}
-
-const bool* GetDTCs_request::get_encrypted(void) const
-{
- return encrypted;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp
deleted file mode 100644
index c42f45cae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-
-
-#include "GetDTCs_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetDTCs_requestMarshaller::checkIntegrity(GetDTCs_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool GetDTCs_requestMarshaller::fromString(const std::string& s,GetDTCs_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string GetDTCs_requestMarshaller::toString(const GetDTCs_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDTCs_requestMarshaller::checkIntegrityConst(const GetDTCs_request& s)
-{
- if(s.ecuName>65535) return false;
- return true;
-}
-
-Json::Value GetDTCs_requestMarshaller::toJSON(const GetDTCs_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["ecuName"]=Json::Value(e.ecuName);
-
- if(e.encrypted)
- json["encrypted"]=Json::Value(*e.encrypted);
-
- return json;
-}
-
-
-bool GetDTCs_requestMarshaller::fromJSON(const Json::Value& json,GetDTCs_request& c)
-{
- if(c.encrypted) delete c.encrypted;
- c.encrypted=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("ecuName")) return false;
- {
- const Json::Value& j=json["ecuName"];
- if(!j.isInt()) return false;
- c.ecuName=j.asInt();
- }
- if(json.isMember("encrypted"))
- {
- const Json::Value& j=json["encrypted"];
- if(!j.isBool()) return false;
- c.encrypted=new bool(j.asBool());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h
deleted file mode 100644
index b97b568b4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETDTCS_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETDTCS_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct GetDTCs_requestMarshaller
- {
- static bool checkIntegrity(GetDTCs_request& e);
- static bool checkIntegrityConst(const GetDTCs_request& e);
-
- static bool fromString(const std::string& s,GetDTCs_request& e);
- static const std::string toString(const GetDTCs_request& e);
-
- static bool fromJSON(const Json::Value& s,GetDTCs_request& e);
- static Json::Value toJSON(const GetDTCs_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp
deleted file mode 100644
index 66d209abf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-#include "GetDTCs_responseMarshaller.h"
-#include "DTCMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GetDTCs_response& GetDTCs_response::operator =(const GetDTCs_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- dtcList = c.dtcList ? new std::vector<DTC>(c.dtcList[0]) : 0;
-
- return *this;
-}
-
-GetDTCs_response::~GetDTCs_response(void)
-{
- if (dtcList)
- {
- delete dtcList;
- }
-}
-
-GetDTCs_response::GetDTCs_response(const GetDTCs_response& c)
-{
- *this = c;
-}
-
-bool GetDTCs_response::checkIntegrity(void)
-{
- return GetDTCs_responseMarshaller::checkIntegrity(*this);
-}
-
-GetDTCs_response::GetDTCs_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , dtcList(0)
-{}
-
-bool GetDTCs_response::set_dtcList(const std::vector<DTC>& dtcList_)
-{
- unsigned int i = dtcList_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
-
- while (i--)
- {
- if (!DTCMarshaller::checkIntegrityConst(dtcList_[i]))
- {
- return false;
- }
- }
-
- delete dtcList;
- dtcList = 0;
-
- dtcList = new std::vector<DTC>(dtcList_);
- return true;
-}
-
-void GetDTCs_response::reset_dtcList(void)
-{
- if (dtcList)
- {
- delete dtcList;
- }
- dtcList = 0;
-}
-
-const std::vector<DTC>* GetDTCs_response::get_dtcList(void) const
-{
- return dtcList;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp
deleted file mode 100644
index b4980c1df..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-#include "DTCMarshaller.h"
-#include "ResultMarshaller.h"
-
-#include "GetDTCs_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetDTCs_responseMarshaller::checkIntegrity(GetDTCs_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool GetDTCs_responseMarshaller::fromString(const std::string& s,GetDTCs_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string GetDTCs_responseMarshaller::toString(const GetDTCs_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDTCs_responseMarshaller::checkIntegrityConst(const GetDTCs_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.dtcList)
- {
- unsigned int i=s.dtcList[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!DTCMarshaller::checkIntegrityConst(s.dtcList[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value GetDTCs_responseMarshaller::toJSON(const GetDTCs_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.dtcList)
- {
- unsigned int sz=e.dtcList->size();
- json["dtcList"]=Json::Value(Json::arrayValue);
- json["dtcList"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["dtcList"][i]=DTCMarshaller::toJSON(e.dtcList[0][i]);
- }
-
- return json;
-}
-
-
-bool GetDTCs_responseMarshaller::fromJSON(const Json::Value& json,GetDTCs_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.dtcList) delete c.dtcList;
- c.dtcList=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("dtcList"))
- {
- const Json::Value& j=json["dtcList"];
- if(!j.isArray()) return false;
- c.dtcList=new std::vector<DTC>();
- c.dtcList->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- DTC t;
- if(!DTCMarshaller::fromJSON(j[i],t))
- return false;
- c.dtcList[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h
deleted file mode 100644
index 699f44c2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETDTCS_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETDTCS_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct GetDTCs_responseMarshaller
- {
- static bool checkIntegrity(GetDTCs_response& e);
- static bool checkIntegrityConst(const GetDTCs_response& e);
-
- static bool fromString(const std::string& s,GetDTCs_response& e);
- static const std::string toString(const GetDTCs_response& e);
-
- static bool fromJSON(const Json::Value& s,GetDTCs_response& e);
- static Json::Value toJSON(const GetDTCs_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp
deleted file mode 100644
index 6dda35120..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-#include "GetVehicleData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-GetVehicleData_request::~GetVehicleData_request(void)
-{
-}
-
-
-GetVehicleData_request::GetVehicleData_request(const GetVehicleData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool GetVehicleData_request::checkIntegrity(void)
-{
- return GetVehicleData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-GetVehicleData_request::GetVehicleData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool GetVehicleData_request::set_dataType(const VehicleDataType& dataType_)
-{
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_)) return false;
- dataType=dataType_;
- return true;
-}
-
-
-
-
-const VehicleDataType& GetVehicleData_request::get_dataType(void) const
-{
- return dataType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp
deleted file mode 100644
index 58b1e5b18..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "GetVehicleData_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetVehicleData_requestMarshaller::checkIntegrity(GetVehicleData_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleData_requestMarshaller::fromString(const std::string& s,GetVehicleData_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string GetVehicleData_requestMarshaller::toString(const GetVehicleData_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleData_requestMarshaller::checkIntegrityConst(const GetVehicleData_request& s)
-{
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType)) return false;
- return true;
-}
-
-Json::Value GetVehicleData_requestMarshaller::toJSON(const GetVehicleData_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["dataType"]=VehicleDataTypeMarshaller::toJSON(e.dataType);
-
- return json;
-}
-
-
-bool GetVehicleData_requestMarshaller::fromJSON(const Json::Value& json,GetVehicleData_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("dataType")) return false;
- {
- const Json::Value& j=json["dataType"];
- if(!VehicleDataTypeMarshaller::fromJSON(j,c.dataType))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h
deleted file mode 100644
index 556419cff..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct GetVehicleData_requestMarshaller
- {
- static bool checkIntegrity(GetVehicleData_request& e);
- static bool checkIntegrityConst(const GetVehicleData_request& e);
-
- static bool fromString(const std::string& s,GetVehicleData_request& e);
- static const std::string toString(const GetVehicleData_request& e);
-
- static bool fromJSON(const Json::Value& s,GetVehicleData_request& e);
- static Json::Value toJSON(const GetVehicleData_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp
deleted file mode 100644
index 2565bb9b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp
+++ /dev/null
@@ -1,670 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-#include "GetVehicleData_responseMarshaller.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GetVehicleData_response& GetVehicleData_response::operator =(const GetVehicleData_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- gps = c.gps ? new GPSData(c.gps[0]) : 0;
- speed = c.speed ? new float(c.speed[0]) : 0;
- rpm = c.rpm ? new unsigned int(c.rpm[0]) : 0;
- fuelLevel = c.fuelLevel ? new float(c.fuelLevel[0]) : 0;
- avgFuelEconomy = c.avgFuelEconomy ? new float(c.avgFuelEconomy[0]) : 0;
- batteryVoltage = c.batteryVoltage ? new float(c.batteryVoltage[0]) : 0;
- externalTemperature = c.externalTemperature ? new float(c.externalTemperature[0]) : 0;
- vin = c.vin ? new std::string(c.vin[0]) : 0;
- prndl = c.prndl ? new PRNDL(c.prndl[0]) : 0;
- tirePressure = c.tirePressure ? new TireStatus(c.tirePressure[0]) : 0;
- batteryPackVoltage = c.batteryPackVoltage ? new float(c.batteryPackVoltage[0]) : 0;
- batteryPackCurrent = c.batteryPackCurrent ? new float(c.batteryPackCurrent[0]) : 0;
- batteryPackTemperature = c.batteryPackTemperature ? new int(c.batteryPackTemperature[0]) : 0;
- engineTorque = c.engineTorque ? new int(c.engineTorque[0]) : 0;
- odometer = c.odometer ? new unsigned int(c.odometer[0]) : 0;
- tripOdometer = c.tripOdometer ? new unsigned int(c.tripOdometer[0]) : 0;
- satRadioESN = c.satRadioESN ? new std::string(c.satRadioESN[0]) : 0;
-
- return *this;
-}
-
-
-GetVehicleData_response::~GetVehicleData_response(void)
-{
- if (gps)
- {
- delete gps;
- }
- if (speed)
- {
- delete speed;
- }
- if (rpm)
- {
- delete rpm;
- }
- if (fuelLevel)
- {
- delete fuelLevel;
- }
- if (avgFuelEconomy)
- {
- delete avgFuelEconomy;
- }
- if (batteryVoltage)
- {
- delete batteryVoltage;
- }
- if (externalTemperature)
- {
- delete externalTemperature;
- }
- if (vin)
- {
- delete vin;
- }
- if (prndl)
- {
- delete prndl;
- }
- if (tirePressure)
- {
- delete tirePressure;
- }
- if (batteryPackVoltage)
- {
- delete batteryPackVoltage;
- }
- if (batteryPackCurrent)
- {
- delete batteryPackCurrent;
- }
- if (batteryPackTemperature)
- {
- delete batteryPackTemperature;
- }
- if (engineTorque)
- {
- delete engineTorque;
- }
- if (odometer)
- {
- delete odometer;
- }
- if (tripOdometer)
- {
- delete tripOdometer;
- }
- if (satRadioESN)
- {
- delete satRadioESN;
- }
-}
-
-GetVehicleData_response::GetVehicleData_response(const GetVehicleData_response& c)
-{
- *this = c;
-}
-
-bool GetVehicleData_response::checkIntegrity(void)
-{
- return GetVehicleData_responseMarshaller::checkIntegrity(*this);
-}
-
-GetVehicleData_response::GetVehicleData_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , gps(0)
- , speed(0)
- , rpm(0)
- , fuelLevel(0)
- , avgFuelEconomy(0)
- , batteryVoltage(0)
- , externalTemperature(0)
- , vin(0)
- , prndl(0)
- , tirePressure(0)
- , batteryPackVoltage(0)
- , batteryPackCurrent(0)
- , batteryPackTemperature(0)
- , engineTorque(0)
- , odometer(0)
- , tripOdometer(0)
- , satRadioESN(0)
-{
-}
-
-bool GetVehicleData_response::set_gps(const GPSData& gps_)
-{
- if (!GPSDataMarshaller::checkIntegrityConst(gps_))
- {
- return false;
- }
- delete gps;
- gps = 0;
-
- gps = new GPSData(gps_);
- return true;
-}
-
-void GetVehicleData_response::reset_gps(void)
-{
- if (gps)
- {
- delete gps;
- }
- gps = 0;
-}
-
-bool GetVehicleData_response::set_speed(float speed_)
-{
- if (speed_ > 500)
- {
- return false;
- }
- if (speed_ < -100)
- {
- return false;
- }
- delete speed;
- speed = 0;
-
- speed = new float(speed_);
- return true;
-}
-
-void GetVehicleData_response::reset_speed(void)
-{
- if (speed)
- {
- delete speed;
- }
- speed = 0;
-}
-
-bool GetVehicleData_response::set_rpm(unsigned int rpm_)
-{
- if (rpm_ > 20000)
- {
- return false;
- }
- delete rpm;
- rpm = 0;
-
- rpm = new unsigned int(rpm_);
- return true;
-}
-
-void GetVehicleData_response::reset_rpm(void)
-{
- if (rpm)
- {
- delete rpm;
- }
- rpm = 0;
-}
-
-bool GetVehicleData_response::set_fuelLevel(float fuelLevel_)
-{
- if (fuelLevel_ > 100)
- {
- return false;
- }
- if (fuelLevel_ < 0)
- {
- return false;
- }
- delete fuelLevel;
- fuelLevel = 0;
-
- fuelLevel = new float(fuelLevel_);
- return true;
-}
-
-void GetVehicleData_response::reset_fuelLevel(void)
-{
- if (fuelLevel)
- {
- delete fuelLevel;
- }
- fuelLevel = 0;
-}
-
-bool GetVehicleData_response::set_avgFuelEconomy(float avgFuelEconomy_)
-{
- if (avgFuelEconomy_ > 7000)
- {
- return false;
- }
- if (avgFuelEconomy_ < 0)
- {
- return false;
- }
- delete avgFuelEconomy;
- avgFuelEconomy = 0;
-
- avgFuelEconomy = new float(avgFuelEconomy_);
- return true;
-}
-
-void GetVehicleData_response::reset_avgFuelEconomy(void)
-{
- if (avgFuelEconomy)
- {
- delete avgFuelEconomy;
- }
- avgFuelEconomy = 0;
-}
-
-bool GetVehicleData_response::set_batteryVoltage(float batteryVoltage_)
-{
- if (batteryVoltage_ > 26)
- {
- return false;
- }
- if (batteryVoltage_ < 0)
- {
- return false;
- }
- delete batteryVoltage;
- batteryVoltage = 0;
-
- batteryVoltage = new float(batteryVoltage_);
- return true;
-}
-
-void GetVehicleData_response::reset_batteryVoltage(void)
-{
- if (batteryVoltage)
- {
- delete batteryVoltage;
- }
- batteryVoltage = 0;
-}
-
-bool GetVehicleData_response::set_externalTemperature(float externalTemperature_)
-{
- if (externalTemperature_ > 100)
- {
- return false;
- }
- if (externalTemperature_ < -40)
- {
- return false;
- }
- delete externalTemperature;
- externalTemperature = 0;
-
- externalTemperature = new float(externalTemperature_);
- return true;
-}
-
-void GetVehicleData_response::reset_externalTemperature(void)
-{
- if (externalTemperature)
- {
- delete externalTemperature;
- }
- externalTemperature = 0;
-}
-
-bool GetVehicleData_response::set_vin(const std::string& vin_)
-{
- if (vin_.length() > 17)
- {
- return false;
- }
- delete vin;
- vin = 0;
-
- vin = new std::string(vin_);
- return true;
-}
-
-void GetVehicleData_response::reset_vin(void)
-{
- if (vin)
- {
- delete vin;
- }
- vin = 0;
-}
-
-bool GetVehicleData_response::set_prndl(const PRNDL& prndl_)
-{
- if (!PRNDLMarshaller::checkIntegrityConst(prndl_))
- {
- return false;
- }
- delete prndl;
- prndl = 0;
-
- prndl = new PRNDL(prndl_);
- return true;
-}
-
-void GetVehicleData_response::reset_prndl(void)
-{
- if (prndl)
- {
- delete prndl;
- }
- prndl = 0;
-}
-
-bool GetVehicleData_response::set_tirePressure(const TireStatus& tirePressure_)
-{
- if (!TireStatusMarshaller::checkIntegrityConst(tirePressure_))
- {
- return false;
- }
- delete tirePressure;
- tirePressure = 0;
-
- tirePressure = new TireStatus(tirePressure_);
- return true;
-}
-
-void GetVehicleData_response::reset_tirePressure(void)
-{
- if (tirePressure)
- {
- delete tirePressure;
- }
- tirePressure = 0;
-}
-
-bool GetVehicleData_response::set_batteryPackVoltage(float batteryPackVoltage_)
-{
- if (batteryPackVoltage_ > 1000)
- {
- return false;
- }
- if (batteryPackVoltage_ < -1000)
- {
- return false;
- }
- delete batteryPackVoltage;
- batteryPackVoltage = 0;
-
- batteryPackVoltage = new float(batteryPackVoltage_);
- return true;
-}
-
-void GetVehicleData_response::reset_batteryPackVoltage(void)
-{
- if (batteryPackVoltage)
- {
- delete batteryPackVoltage;
- }
- batteryPackVoltage = 0;
-}
-
-bool GetVehicleData_response::set_batteryPackCurrent(float batteryPackCurrent_)
-{
- if (batteryPackCurrent_ > 1000)
- {
- return false;
- }
- if (batteryPackCurrent_ < -1000)
- {
- return false;
- }
- delete batteryPackCurrent;
- batteryPackCurrent = 0;
-
- batteryPackCurrent = new float(batteryPackCurrent_);
- return true;
-}
-
-void GetVehicleData_response::reset_batteryPackCurrent(void)
-{
- if (batteryPackCurrent)
- {
- delete batteryPackCurrent;
- }
- batteryPackCurrent = 0;
-}
-
-bool GetVehicleData_response::set_batteryPackTemperature(int batteryPackTemperature_)
-{
- if (batteryPackTemperature_ > 250)
- {
- return false;
- }
- delete batteryPackTemperature;
- batteryPackTemperature = 0;
-
- batteryPackTemperature = new int(batteryPackTemperature_);
- return true;
-}
-
-void GetVehicleData_response::reset_batteryPackTemperature(void)
-{
- if (batteryPackTemperature)
- {
- delete batteryPackTemperature;
- }
- batteryPackTemperature = 0;
-}
-
-bool GetVehicleData_response::set_engineTorque(int engineTorque_)
-{
- if (engineTorque_ > 55000)
- {
- return false;
- }
- delete engineTorque;
- engineTorque = 0;
-
- engineTorque = new int(engineTorque_);
- return true;
-}
-
-void GetVehicleData_response::reset_engineTorque(void)
-{
- if (engineTorque)
- {
- delete engineTorque;
- }
- engineTorque = 0;
-}
-
-bool GetVehicleData_response::set_odometer(unsigned int odometer_)
-{
- if (odometer_ > 2000000)
- {
- return false;
- }
- delete odometer;
- odometer = 0;
-
- odometer = new unsigned int(odometer_);
- return true;
-}
-
-void GetVehicleData_response::reset_odometer(void)
-{
- if (odometer)
- {
- delete odometer;
- }
- odometer = 0;
-}
-
-bool GetVehicleData_response::set_tripOdometer(unsigned int tripOdometer_)
-{
- if (tripOdometer_ > 2000000)
- {
- return false;
- }
- delete tripOdometer;
- tripOdometer = 0;
-
- tripOdometer = new unsigned int(tripOdometer_);
- return true;
-}
-
-void GetVehicleData_response::reset_tripOdometer(void)
-{
- if (tripOdometer)
- {
- delete tripOdometer;
- }
- tripOdometer = 0;
-}
-
-bool GetVehicleData_response::set_satRadioESN(const std::string& satRadioESN_)
-{
- if (satRadioESN_.length() > 500)
- {
- return false;
- }
- delete satRadioESN;
- satRadioESN = 0;
-
- satRadioESN = new std::string(satRadioESN_);
- return true;
-}
-
-void GetVehicleData_response::reset_satRadioESN(void)
-{
- if (satRadioESN)
- {
- delete satRadioESN;
- }
- satRadioESN = 0;
-}
-
-const GPSData* GetVehicleData_response::get_gps(void) const
-{
- return gps;
-}
-
-const float* GetVehicleData_response::get_speed(void) const
-{
- return speed;
-}
-
-const unsigned int* GetVehicleData_response::get_rpm(void) const
-{
- return rpm;
-}
-
-const float* GetVehicleData_response::get_fuelLevel(void) const
-{
- return fuelLevel;
-}
-
-const float* GetVehicleData_response::get_avgFuelEconomy(void) const
-{
- return avgFuelEconomy;
-}
-
-const float* GetVehicleData_response::get_batteryVoltage(void) const
-{
- return batteryVoltage;
-}
-
-const float* GetVehicleData_response::get_externalTemperature(void) const
-{
- return externalTemperature;
-}
-
-const std::string* GetVehicleData_response::get_vin(void) const
-{
- return vin;
-}
-
-const PRNDL* GetVehicleData_response::get_prndl(void) const
-{
- return prndl;
-}
-
-const TireStatus* GetVehicleData_response::get_tirePressure(void) const
-{
- return tirePressure;
-}
-
-const float* GetVehicleData_response::get_batteryPackVoltage(void) const
-{
- return batteryPackVoltage;
-}
-
-const float* GetVehicleData_response::get_batteryPackCurrent(void) const
-{
- return batteryPackCurrent;
-}
-
-const int* GetVehicleData_response::get_batteryPackTemperature(void) const
-{
- return batteryPackTemperature;
-}
-
-const int* GetVehicleData_response::get_engineTorque(void) const
-{
- return engineTorque;
-}
-
-const unsigned int* GetVehicleData_response::get_odometer(void) const
-{
- return odometer;
-}
-
-const unsigned int* GetVehicleData_response::get_tripOdometer(void) const
-{
- return tripOdometer;
-}
-
-const std::string* GetVehicleData_response::get_satRadioESN(void) const
-{
- return satRadioESN;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp
deleted file mode 100644
index 6a05ebcec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "ResultMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-#include "GetVehicleData_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetVehicleData_responseMarshaller::checkIntegrity(GetVehicleData_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleData_responseMarshaller::fromString(const std::string& s,GetVehicleData_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string GetVehicleData_responseMarshaller::toString(const GetVehicleData_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleData_responseMarshaller::checkIntegrityConst(const GetVehicleData_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.gps && !GPSDataMarshaller::checkIntegrityConst(*s.gps)) return false;
- if(s.speed && *s.speed>500) return false;
- if(s.speed && *s.speed<-100) return false;
- if(s.rpm && *s.rpm>20000) return false;
- if(s.fuelLevel && *s.fuelLevel>100) return false;
- if(s.fuelLevel && *s.fuelLevel<0) return false;
- if(s.avgFuelEconomy && *s.avgFuelEconomy>7000) return false;
- if(s.avgFuelEconomy && *s.avgFuelEconomy<0) return false;
- if(s.batteryVoltage && *s.batteryVoltage>26) return false;
- if(s.batteryVoltage && *s.batteryVoltage<0) return false;
- if(s.externalTemperature && *s.externalTemperature>100) return false;
- if(s.externalTemperature && *s.externalTemperature<-40) return false;
- if(s.vin && s.vin->length()>17) return false;
- if(s.prndl && !PRNDLMarshaller::checkIntegrityConst(*s.prndl)) return false;
- if(s.tirePressure && !TireStatusMarshaller::checkIntegrityConst(*s.tirePressure)) return false;
- if(s.batteryPackVoltage && *s.batteryPackVoltage>1000) return false;
- if(s.batteryPackVoltage && *s.batteryPackVoltage<-1000) return false;
- if(s.batteryPackCurrent && *s.batteryPackCurrent>1000) return false;
- if(s.batteryPackCurrent && *s.batteryPackCurrent<-1000) return false;
- if(s.batteryPackTemperature && *s.batteryPackTemperature>250) return false;
- if(s.batteryPackTemperature && *s.batteryPackTemperature<-50) return false;
- if(s.engineTorque && *s.engineTorque>55000) return false;
- if(s.engineTorque && *s.engineTorque<-10000) return false;
- if(s.odometer && *s.odometer>2000000) return false;
- if(s.tripOdometer && *s.tripOdometer>2000000) return false;
- if(s.satRadioESN && s.satRadioESN->length()>500) return false;
- return true;
-}
-
-Json::Value GetVehicleData_responseMarshaller::toJSON(const GetVehicleData_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.gps)
- json["gps"]=GPSDataMarshaller::toJSON(*e.gps);
-
- if(e.speed)
- json["speed"]=Json::Value(*e.speed);
-
- if(e.rpm)
- json["rpm"]=Json::Value(*e.rpm);
-
- if(e.fuelLevel)
- json["fuelLevel"]=Json::Value(*e.fuelLevel);
-
- if(e.avgFuelEconomy)
- json["avgFuelEconomy"]=Json::Value(*e.avgFuelEconomy);
-
- if(e.batteryVoltage)
- json["batteryVoltage"]=Json::Value(*e.batteryVoltage);
-
- if(e.externalTemperature)
- json["externalTemperature"]=Json::Value(*e.externalTemperature);
-
- if(e.vin)
- json["vin"]=Json::Value(*e.vin);
-
- if(e.prndl)
- json["prndl"]=PRNDLMarshaller::toJSON(*e.prndl);
-
- if(e.tirePressure)
- json["tirePressure"]=TireStatusMarshaller::toJSON(*e.tirePressure);
-
- if(e.batteryPackVoltage)
- json["batteryPackVoltage"]=Json::Value(*e.batteryPackVoltage);
-
- if(e.batteryPackCurrent)
- json["batteryPackCurrent"]=Json::Value(*e.batteryPackCurrent);
-
- if(e.batteryPackTemperature)
- json["batteryPackTemperature"]=Json::Value(*e.batteryPackTemperature);
-
- if(e.engineTorque)
- json["engineTorque"]=Json::Value(*e.engineTorque);
-
- if(e.odometer)
- json["odometer"]=Json::Value(*e.odometer);
-
- if(e.tripOdometer)
- json["tripOdometer"]=Json::Value(*e.tripOdometer);
-
- if(e.satRadioESN)
- json["satRadioESN"]=Json::Value(*e.satRadioESN);
-
- return json;
-}
-
-
-bool GetVehicleData_responseMarshaller::fromJSON(const Json::Value& json,GetVehicleData_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.gps) delete c.gps;
- c.gps=0;
-
- if(c.speed) delete c.speed;
- c.speed=0;
-
- if(c.rpm) delete c.rpm;
- c.rpm=0;
-
- if(c.fuelLevel) delete c.fuelLevel;
- c.fuelLevel=0;
-
- if(c.avgFuelEconomy) delete c.avgFuelEconomy;
- c.avgFuelEconomy=0;
-
- if(c.batteryVoltage) delete c.batteryVoltage;
- c.batteryVoltage=0;
-
- if(c.externalTemperature) delete c.externalTemperature;
- c.externalTemperature=0;
-
- if(c.vin) delete c.vin;
- c.vin=0;
-
- if(c.prndl) delete c.prndl;
- c.prndl=0;
-
- if(c.tirePressure) delete c.tirePressure;
- c.tirePressure=0;
-
- if(c.batteryPackVoltage) delete c.batteryPackVoltage;
- c.batteryPackVoltage=0;
-
- if(c.batteryPackCurrent) delete c.batteryPackCurrent;
- c.batteryPackCurrent=0;
-
- if(c.batteryPackTemperature) delete c.batteryPackTemperature;
- c.batteryPackTemperature=0;
-
- if(c.engineTorque) delete c.engineTorque;
- c.engineTorque=0;
-
- if(c.odometer) delete c.odometer;
- c.odometer=0;
-
- if(c.tripOdometer) delete c.tripOdometer;
- c.tripOdometer=0;
-
- if(c.satRadioESN) delete c.satRadioESN;
- c.satRadioESN=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("gps"))
- {
- const Json::Value& j=json["gps"];
- c.gps=new GPSData();
- if(!GPSDataMarshaller::fromJSON(j,c.gps[0]))
- return false;
- }
- if(json.isMember("speed"))
- {
- const Json::Value& j=json["speed"];
- if(!j.isNumeric()) return false;
- c.speed=new float(j.asDouble());
- }
- if(json.isMember("rpm"))
- {
- const Json::Value& j=json["rpm"];
- if(!j.isInt()) return false;
- c.rpm=new unsigned int(j.asInt());
- }
- if(json.isMember("fuelLevel"))
- {
- const Json::Value& j=json["fuelLevel"];
- if(!j.isNumeric()) return false;
- c.fuelLevel=new float(j.asDouble());
- }
- if(json.isMember("avgFuelEconomy"))
- {
- const Json::Value& j=json["avgFuelEconomy"];
- if(!j.isNumeric()) return false;
- c.avgFuelEconomy=new float(j.asDouble());
- }
- if(json.isMember("batteryVoltage"))
- {
- const Json::Value& j=json["batteryVoltage"];
- if(!j.isNumeric()) return false;
- c.batteryVoltage=new float(j.asDouble());
- }
- if(json.isMember("externalTemperature"))
- {
- const Json::Value& j=json["externalTemperature"];
- if(!j.isNumeric()) return false;
- c.externalTemperature=new float(j.asDouble());
- }
- if(json.isMember("vin"))
- {
- const Json::Value& j=json["vin"];
- if(!j.isString()) return false;
- c.vin=new std::string(j.asString());
- }
- if(json.isMember("prndl"))
- {
- const Json::Value& j=json["prndl"];
- c.prndl=new PRNDL();
- if(!PRNDLMarshaller::fromJSON(j,c.prndl[0]))
- return false;
- }
- if(json.isMember("tirePressure"))
- {
- const Json::Value& j=json["tirePressure"];
- c.tirePressure=new TireStatus();
- if(!TireStatusMarshaller::fromJSON(j,c.tirePressure[0]))
- return false;
- }
- if(json.isMember("batteryPackVoltage"))
- {
- const Json::Value& j=json["batteryPackVoltage"];
- if(!j.isNumeric()) return false;
- c.batteryPackVoltage=new float(j.asDouble());
- }
- if(json.isMember("batteryPackCurrent"))
- {
- const Json::Value& j=json["batteryPackCurrent"];
- if(!j.isNumeric()) return false;
- c.batteryPackCurrent=new float(j.asDouble());
- }
- if(json.isMember("batteryPackTemperature"))
- {
- const Json::Value& j=json["batteryPackTemperature"];
- if(!j.isInt()) return false;
- c.batteryPackTemperature=new int(j.asInt());
- }
- if(json.isMember("engineTorque"))
- {
- const Json::Value& j=json["engineTorque"];
- if(!j.isInt()) return false;
- c.engineTorque=new int(j.asInt());
- }
- if(json.isMember("odometer"))
- {
- const Json::Value& j=json["odometer"];
- if(!j.isInt()) return false;
- c.odometer=new unsigned int(j.asInt());
- }
- if(json.isMember("tripOdometer"))
- {
- const Json::Value& j=json["tripOdometer"];
- if(!j.isInt()) return false;
- c.tripOdometer=new unsigned int(j.asInt());
- }
- if(json.isMember("satRadioESN"))
- {
- const Json::Value& j=json["satRadioESN"];
- if(!j.isString()) return false;
- c.satRadioESN=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h
deleted file mode 100644
index 0fd76e299..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct GetVehicleData_responseMarshaller
- {
- static bool checkIntegrity(GetVehicleData_response& e);
- static bool checkIntegrityConst(const GetVehicleData_response& e);
-
- static bool fromString(const std::string& s,GetVehicleData_response& e);
- static const std::string toString(const GetVehicleData_response& e);
-
- static bool fromJSON(const Json::Value& s,GetVehicleData_response& e);
- static Json::Value toJSON(const GetVehicleData_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp
deleted file mode 100644
index d7bd2157e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h"
-#include "GlobalPropertyMarshaller.h"
-#include "GlobalPropertyMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const GlobalProperty::GlobalPropertyInternal GlobalPropertyMarshaller::getIndex(const char* s)
-{
- if(!s)
- return GlobalProperty::INVALID_ENUM;
- const struct PerfectHashTable* p=GlobalProperty_intHash::getPointer(s,strlen(s));
- return p ? static_cast<GlobalProperty::GlobalPropertyInternal>(p->idx) : GlobalProperty::INVALID_ENUM;
-}
-
-
-bool GlobalPropertyMarshaller::fromJSON(const Json::Value& s,GlobalProperty& e)
-{
- e.mInternal=GlobalProperty::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=GlobalProperty::INVALID_ENUM);
-}
-
-
-Json::Value GlobalPropertyMarshaller::toJSON(const GlobalProperty& e)
-{
- if(e.mInternal==GlobalProperty::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool GlobalPropertyMarshaller::fromString(const std::string& s,GlobalProperty& e)
-{
- e.mInternal=GlobalProperty::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string GlobalPropertyMarshaller::toString(const GlobalProperty& e)
-{
- Json::FastWriter writer;
- return e.mInternal==GlobalProperty::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable GlobalPropertyMarshaller::mHashTable[4]=
-{
- {"HELPPROMPT",0},
- {"TIMEOUTPROMPT",1},
- {"VRHELPTITLE",2},
- {"VRHELPITEMS",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp
deleted file mode 100644
index 552048852..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name GlobalProperty_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-HELPPROMPT,0
-TIMEOUTPROMPT,1
-VRHELPTITLE,2
-VRHELPITEMS,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h
deleted file mode 100644
index 4a1f83443..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GLOBALPROPERTYMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GLOBALPROPERTYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for GlobalProperty
-
- class GlobalPropertyMarshaller
- {
- public:
-
- static std::string toName(const GlobalProperty& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(GlobalProperty& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=GlobalProperty::INVALID_ENUM;
- }
-
- static bool checkIntegrity(GlobalProperty& e) { return e.mInternal!=GlobalProperty::INVALID_ENUM; }
- static bool checkIntegrityConst(const GlobalProperty& e) { return e.mInternal!=GlobalProperty::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,GlobalProperty& e);
- static const std::string toString(const GlobalProperty& e);
-
- static bool fromJSON(const Json::Value& s,GlobalProperty& e);
- static Json::Value toJSON(const GlobalProperty& e);
-
- static const char* getName(GlobalProperty::GlobalPropertyInternal e)
- {
- return (e>=0 && e<4) ? mHashTable[e].name : NULL;
- }
-
- static const GlobalProperty::GlobalPropertyInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[4];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc
deleted file mode 100644
index 2c354cf18..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp */
-/* Computed positions: -k'7' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 10
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 10
-#define MAX_HASH_VALUE 16
-/* maximum key range = 7, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class GlobalProperty_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-GlobalProperty_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 5, 17, 17, 17, 17, 17, 0,
- 17, 17, 17, 17, 0, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17
- };
- return len + asso_values[(unsigned char)str[6]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-GlobalProperty_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 11, 0, 13,
- 0, 0, 11
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
- {"HELPPROMPT",0},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
- {"VRHELPTITLE",2},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
- {"TIMEOUTPROMPT",1},
- {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
- {"VRHELPITEMS",3}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp
deleted file mode 100644
index e3e04c519..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-#include "HMIApplicationMarshaller.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "TTSChunkMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-HMIApplication& HMIApplication::operator =(const HMIApplication& c)
-{
- appId=c.appId;
- appName=c.appName;
- appType=c.appType ? new std::vector<AppType>(c.appType[0]) : 0;
- deviceName=c.deviceName;
- hmiDisplayLanguageDesired=c.hmiDisplayLanguageDesired;
- icon=c.icon ? new std::string(c.icon[0]) : 0;
- isMediaApplication=c.isMediaApplication;
- languageDesired=c.languageDesired;
- ngnMediaScreenAppName=c.ngnMediaScreenAppName ? new std::string(c.ngnMediaScreenAppName[0]) : 0;
- ttsName=c.ttsName ? new std::vector<TTSChunk>(c.ttsName[0]) : 0;
- vrSynonyms=c.vrSynonyms ? new std::vector<std::string>(c.vrSynonyms[0]) : 0;
-
- return *this;
-}
-
-
-HMIApplication::~HMIApplication(void)
-{
- if(appType)
- delete appType;
- if(icon)
- delete icon;
- if(ngnMediaScreenAppName)
- delete ngnMediaScreenAppName;
- if(ttsName)
- delete ttsName;
- if(vrSynonyms)
- delete vrSynonyms;
-}
-
-
-HMIApplication::HMIApplication(const HMIApplication& c)
-{
- *this=c;
-}
-
-
-bool HMIApplication::checkIntegrity(void)
-{
- return HMIApplicationMarshaller::checkIntegrity(*this);
-}
-
-
-HMIApplication::HMIApplication(void) :
- appType(0),
- icon(0),
- ngnMediaScreenAppName(0),
- ttsName(0),
- vrSynonyms(0)
-{
-}
-
-
-
-bool HMIApplication::set_appId(int appId_)
-{
- appId=appId_;
- return true;
-}
-
-bool HMIApplication::set_appName(const std::string& appName_)
-{
- if(appName_.length()>100) return false;
- appName=appName_;
- return true;
-}
-
-bool HMIApplication::set_appType(const std::vector<AppType>& appType_)
-{
- unsigned int i=appType_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!AppTypeMarshaller::checkIntegrityConst(appType_[i])) return false;
- }
- delete appType;
- appType=0;
-
- appType=new std::vector<AppType>(appType_);
- return true;
-}
-
-void HMIApplication::reset_appType(void)
-{
- if(appType)
- delete appType;
- appType=0;
-}
-
-bool HMIApplication::set_deviceName(const std::string& deviceName_)
-{
- deviceName=deviceName_;
- return true;
-}
-
-bool HMIApplication::set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguageDesired_)) return false;
- hmiDisplayLanguageDesired=hmiDisplayLanguageDesired_;
- return true;
-}
-
-bool HMIApplication::set_icon(const std::string& icon_)
-{
- delete icon;
- icon=0;
-
- icon=new std::string(icon_);
- return true;
-}
-
-void HMIApplication::reset_icon(void)
-{
- if(icon)
- delete icon;
- icon=0;
-}
-
-bool HMIApplication::set_isMediaApplication(bool isMediaApplication_)
-{
- isMediaApplication=isMediaApplication_;
- return true;
-}
-
-bool HMIApplication::set_languageDesired(const Language& languageDesired_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(languageDesired_)) return false;
- languageDesired=languageDesired_;
- return true;
-}
-
-bool HMIApplication::set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_)
-{
- if(ngnMediaScreenAppName_.length()>100) return false;
- delete ngnMediaScreenAppName;
- ngnMediaScreenAppName=0;
-
- ngnMediaScreenAppName=new std::string(ngnMediaScreenAppName_);
- return true;
-}
-
-void HMIApplication::reset_ngnMediaScreenAppName(void)
-{
- if(ngnMediaScreenAppName)
- delete ngnMediaScreenAppName;
- ngnMediaScreenAppName=0;
-}
-
-bool HMIApplication::set_ttsName(const std::vector<TTSChunk>& ttsName_)
-{
- unsigned int i=ttsName_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(ttsName_[i])) return false;
- }
- delete ttsName;
- ttsName=0;
-
- ttsName=new std::vector<TTSChunk>(ttsName_);
- return true;
-}
-
-void HMIApplication::reset_ttsName(void)
-{
- if(ttsName)
- delete ttsName;
- ttsName=0;
-}
-
-bool HMIApplication::set_vrSynonyms(const std::vector<std::string>& vrSynonyms_)
-{
- unsigned int i=vrSynonyms_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(vrSynonyms_[i].length()>40) return false;
- }
- delete vrSynonyms;
- vrSynonyms=0;
-
- vrSynonyms=new std::vector<std::string>(vrSynonyms_);
- return true;
-}
-
-void HMIApplication::reset_vrSynonyms(void)
-{
- if(vrSynonyms)
- delete vrSynonyms;
- vrSynonyms=0;
-}
-
-
-
-
-int HMIApplication::get_appId(void) const
-{
- return appId;
-}
-
-
-const std::string& HMIApplication::get_appName(void) const
-{
- return appName;
-}
-
-
-const std::vector<AppType>* HMIApplication::get_appType(void) const
-{
- return appType;
-}
-
-
-const std::string& HMIApplication::get_deviceName(void) const
-{
- return deviceName;
-}
-
-
-const Language& HMIApplication::get_hmiDisplayLanguageDesired(void) const
-{
- return hmiDisplayLanguageDesired;
-}
-
-
-const std::string* HMIApplication::get_icon(void) const
-{
- return icon;
-}
-
-
-bool HMIApplication::get_isMediaApplication(void) const
-{
- return isMediaApplication;
-}
-
-
-const Language& HMIApplication::get_languageDesired(void) const
-{
- return languageDesired;
-}
-
-
-const std::string* HMIApplication::get_ngnMediaScreenAppName(void) const
-{
- return ngnMediaScreenAppName;
-}
-
-
-const std::vector<TTSChunk>* HMIApplication::get_ttsName(void) const
-{
- return ttsName;
-}
-
-
-const std::vector<std::string>* HMIApplication::get_vrSynonyms(void) const
-{
- return vrSynonyms;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp
deleted file mode 100644
index 95e35d961..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "HMIApplicationMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool HMIApplicationMarshaller::checkIntegrity(HMIApplication& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool HMIApplicationMarshaller::fromString(const std::string& s,HMIApplication& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string HMIApplicationMarshaller::toString(const HMIApplication& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool HMIApplicationMarshaller::checkIntegrityConst(const HMIApplication& s)
-{
- if(s.appName.length()>100) return false;
- if(s.appType)
- {
- unsigned int i=s.appType[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!AppTypeMarshaller::checkIntegrityConst(s.appType[0][i])) return false;
- }
- }
- if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguageDesired)) return false;
- if(!LanguageMarshaller::checkIntegrityConst(s.languageDesired)) return false;
- if(s.ngnMediaScreenAppName && s.ngnMediaScreenAppName->length()>100) return false;
- if(s.ttsName)
- {
- unsigned int i=s.ttsName[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsName[0][i])) return false;
- }
- }
- if(s.vrSynonyms)
- {
- unsigned int i=s.vrSynonyms[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.vrSynonyms[0][i].length()>40) return false;
- }
- }
- return true;
-}
-
-Json::Value HMIApplicationMarshaller::toJSON(const HMIApplication& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["appId"]=Json::Value(e.appId);
-
- json["appName"]=Json::Value(e.appName);
-
- if(e.appType)
- {
- unsigned int sz=e.appType->size();
- json["appType"]=Json::Value(Json::arrayValue);
- json["appType"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["appType"][i]=AppTypeMarshaller::toJSON(e.appType[0][i]);
- }
-
- json["deviceName"]=Json::Value(e.deviceName);
-
- json["hmiDisplayLanguageDesired"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguageDesired);
-
- if(e.icon)
- json["icon"]=Json::Value(*e.icon);
-
- json["isMediaApplication"]=Json::Value(e.isMediaApplication);
-
- json["languageDesired"]=LanguageMarshaller::toJSON(e.languageDesired);
-
- if(e.ngnMediaScreenAppName)
- json["ngnMediaScreenAppName"]=Json::Value(*e.ngnMediaScreenAppName);
-
- if(e.ttsName)
- {
- unsigned int sz=e.ttsName->size();
- json["ttsName"]=Json::Value(Json::arrayValue);
- json["ttsName"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["ttsName"][i]=TTSChunkMarshaller::toJSON(e.ttsName[0][i]);
- }
-
- if(e.vrSynonyms)
- {
- unsigned int sz=e.vrSynonyms->size();
- json["vrSynonyms"]=Json::Value(Json::arrayValue);
- json["vrSynonyms"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["vrSynonyms"][i]=Json::Value(e.vrSynonyms[0][i]);
- }
-
-
- return json;
-}
-
-
-bool HMIApplicationMarshaller::fromJSON(const Json::Value& json,HMIApplication& c)
-{
- if(c.appType) delete c.appType;
- c.appType=0;
-
- if(c.icon) delete c.icon;
- c.icon=0;
-
- if(c.ngnMediaScreenAppName) delete c.ngnMediaScreenAppName;
- c.ngnMediaScreenAppName=0;
-
- if(c.ttsName) delete c.ttsName;
- c.ttsName=0;
-
- if(c.vrSynonyms) delete c.vrSynonyms;
- c.vrSynonyms=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("appId")) return false;
- {
- const Json::Value& j=json["appId"];
- if(!j.isInt()) return false;
- c.appId=j.asInt();
- }
- if(!json.isMember("appName")) return false;
- {
- const Json::Value& j=json["appName"];
- if(!j.isString()) return false;
- c.appName=j.asString();
- }
- if(json.isMember("appType"))
- {
- const Json::Value& j=json["appType"];
- if(!j.isArray()) return false;
- c.appType=new std::vector<AppType>();
- c.appType->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- AppType t;
- if(!AppTypeMarshaller::fromJSON(j[i],t))
- return false;
- c.appType[0][i]=t;
- }
-
- }
- if(!json.isMember("deviceName")) return false;
- {
- const Json::Value& j=json["deviceName"];
- if(!j.isString()) return false;
- c.deviceName=j.asString();
- }
- if(!json.isMember("hmiDisplayLanguageDesired")) return false;
- {
- const Json::Value& j=json["hmiDisplayLanguageDesired"];
- if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguageDesired))
- return false;
- }
- if(json.isMember("icon"))
- {
- const Json::Value& j=json["icon"];
- if(!j.isString()) return false;
- c.icon=new std::string(j.asString());
- }
- if(!json.isMember("isMediaApplication")) return false;
- {
- const Json::Value& j=json["isMediaApplication"];
- if(!j.isBool()) return false;
- c.isMediaApplication=j.asBool();
- }
- if(!json.isMember("languageDesired")) return false;
- {
- const Json::Value& j=json["languageDesired"];
- if(!LanguageMarshaller::fromJSON(j,c.languageDesired))
- return false;
- }
- if(json.isMember("ngnMediaScreenAppName"))
- {
- const Json::Value& j=json["ngnMediaScreenAppName"];
- if(!j.isString()) return false;
- c.ngnMediaScreenAppName=new std::string(j.asString());
- }
- if(json.isMember("ttsName"))
- {
- const Json::Value& j=json["ttsName"];
- if(!j.isArray()) return false;
- c.ttsName=new std::vector<TTSChunk>();
- c.ttsName->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.ttsName[0][i]=t;
- }
-
- }
- if(json.isMember("vrSynonyms"))
- {
- const Json::Value& j=json["vrSynonyms"];
- if(!j.isArray()) return false;
- c.vrSynonyms=new std::vector<std::string>();
- c.vrSynonyms->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.vrSynonyms[0][i]=j[i].asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h
deleted file mode 100644
index 17980e19b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMIAPPLICATIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMIAPPLICATIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct HMIApplicationMarshaller
- {
- static bool checkIntegrity(HMIApplication& e);
- static bool checkIntegrityConst(const HMIApplication& e);
-
- static bool fromString(const std::string& s,HMIApplication& e);
- static const std::string toString(const HMIApplication& e);
-
- static bool fromJSON(const Json::Value& s,HMIApplication& e);
- static Json::Value toJSON(const HMIApplication& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp
deleted file mode 100644
index 68c509ca0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMILevel.h"
-#include "HMILevelMarshaller.h"
-#include "HMILevelMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const HMILevel::HMILevelInternal HMILevelMarshaller::getIndex(const char* s)
-{
- if(!s)
- return HMILevel::INVALID_ENUM;
- const struct PerfectHashTable* p=HMILevel_intHash::getPointer(s,strlen(s));
- return p ? static_cast<HMILevel::HMILevelInternal>(p->idx) : HMILevel::INVALID_ENUM;
-}
-
-
-bool HMILevelMarshaller::fromJSON(const Json::Value& s,HMILevel& e)
-{
- e.mInternal=HMILevel::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=HMILevel::INVALID_ENUM);
-}
-
-
-Json::Value HMILevelMarshaller::toJSON(const HMILevel& e)
-{
- if(e.mInternal==HMILevel::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool HMILevelMarshaller::fromString(const std::string& s,HMILevel& e)
-{
- e.mInternal=HMILevel::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string HMILevelMarshaller::toString(const HMILevel& e)
-{
- Json::FastWriter writer;
- return e.mInternal==HMILevel::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable HMILevelMarshaller::mHashTable[4]=
-{
- {"FULL",0},
- {"LIMITED",1},
- {"BACKGROUND",2},
- {"NONE",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp
deleted file mode 100644
index 709952be5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name HMILevel_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-FULL,0
-LIMITED,1
-BACKGROUND,2
-NONE,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h
deleted file mode 100644
index d0aa0d8d2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMILEVELMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMILEVELMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMILevel.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for HMILevel
-
- class HMILevelMarshaller
- {
- public:
-
- static std::string toName(const HMILevel& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(HMILevel& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=HMILevel::INVALID_ENUM;
- }
-
- static bool checkIntegrity(HMILevel& e) { return e.mInternal!=HMILevel::INVALID_ENUM; }
- static bool checkIntegrityConst(const HMILevel& e) { return e.mInternal!=HMILevel::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,HMILevel& e);
- static const std::string toString(const HMILevel& e);
-
- static bool fromJSON(const Json::Value& s,HMILevel& e);
- static Json::Value toJSON(const HMILevel& e);
-
- static const char* getName(HMILevel::HMILevelInternal e)
- {
- return (e>=0 && e<4) ? mHashTable[e].name : NULL;
- }
-
- static const HMILevel::HMILevelInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[4];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc
deleted file mode 100644
index 59f976cf0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 10
-/* maximum key range = 7, duplicates = 0 */
-
-class HMILevel_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-HMILevel_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 0, 11, 11, 11,
- 5, 11, 11, 11, 11, 11, 0, 11, 0, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-HMILevel_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 0, 0, 7, 0, 4, 10
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
- {"NONE",3},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
- {"LIMITED",1},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
- {"FULL",0},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
- {"BACKGROUND",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp
deleted file mode 100644
index a36ab58c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h"
-#include "HMIPermissionsMarshaller.h"
-#include "HMILevelMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-HMIPermissions::HMIPermissions(const HMIPermissions& c)
-{
- *this=c;
-}
-
-
-bool HMIPermissions::checkIntegrity(void)
-{
- return HMIPermissionsMarshaller::checkIntegrity(*this);
-}
-
-
-HMIPermissions::HMIPermissions(void)
-{
-}
-
-
-
-bool HMIPermissions::set_allowed(const std::vector<HMILevel>& allowed_)
-{
- unsigned int i=allowed_.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- if(!HMILevelMarshaller::checkIntegrityConst(allowed_[i])) return false;
- }
- allowed=allowed_;
- return true;
-}
-
-bool HMIPermissions::set_userDisallowed(const std::vector<HMILevel>& userDisallowed_)
-{
- unsigned int i=userDisallowed_.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- if(!HMILevelMarshaller::checkIntegrityConst(userDisallowed_[i])) return false;
- }
- userDisallowed=userDisallowed_;
- return true;
-}
-
-
-
-
-const std::vector<HMILevel>& HMIPermissions::get_allowed(void) const
-{
- return allowed;
-}
-
-
-const std::vector<HMILevel>& HMIPermissions::get_userDisallowed(void) const
-{
- return userDisallowed;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp
deleted file mode 100644
index 003366232..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h"
-#include "HMILevelMarshaller.h"
-
-#include "HMIPermissionsMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool HMIPermissionsMarshaller::checkIntegrity(HMIPermissions& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool HMIPermissionsMarshaller::fromString(const std::string& s,HMIPermissions& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string HMIPermissionsMarshaller::toString(const HMIPermissions& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool HMIPermissionsMarshaller::checkIntegrityConst(const HMIPermissions& s)
-{
- {
- unsigned int i=s.allowed.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- if(!HMILevelMarshaller::checkIntegrityConst(s.allowed[i])) return false;
- }
- }
- {
- unsigned int i=s.userDisallowed.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- if(!HMILevelMarshaller::checkIntegrityConst(s.userDisallowed[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value HMIPermissionsMarshaller::toJSON(const HMIPermissions& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["allowed"]=Json::Value(Json::arrayValue);
- json["allowed"].resize(e.allowed.size());
- for(unsigned int i=0;i<e.allowed.size();i++)
- json["allowed"][i]=HMILevelMarshaller::toJSON(e.allowed[i]);
-
- json["userDisallowed"]=Json::Value(Json::arrayValue);
- json["userDisallowed"].resize(e.userDisallowed.size());
- for(unsigned int i=0;i<e.userDisallowed.size();i++)
- json["userDisallowed"][i]=HMILevelMarshaller::toJSON(e.userDisallowed[i]);
-
-
- return json;
-}
-
-
-bool HMIPermissionsMarshaller::fromJSON(const Json::Value& json,HMIPermissions& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("allowed")) return false;
- {
- const Json::Value& j=json["allowed"];
- if(!j.isArray()) return false;
- c.allowed.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- HMILevel t;
- if(!HMILevelMarshaller::fromJSON(j[i],t))
- return false;
- c.allowed[i]=t;
- }
-
- }
- if(!json.isMember("userDisallowed")) return false;
- {
- const Json::Value& j=json["userDisallowed"];
- if(!j.isArray()) return false;
- c.userDisallowed.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- HMILevel t;
- if(!HMILevelMarshaller::fromJSON(j[i],t))
- return false;
- c.userDisallowed[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h
deleted file mode 100644
index 4afbe5739..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMIPERMISSIONSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMIPERMISSIONSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct HMIPermissionsMarshaller
- {
- static bool checkIntegrity(HMIPermissions& e);
- static bool checkIntegrityConst(const HMIPermissions& e);
-
- static bool fromString(const std::string& s,HMIPermissions& e);
- static const std::string toString(const HMIPermissions& e);
-
- static bool fromJSON(const Json::Value& s,HMIPermissions& e);
- static Json::Value toJSON(const HMIPermissions& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp
deleted file mode 100644
index 429bc53cc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const HmiZoneCapabilities::HmiZoneCapabilitiesInternal HmiZoneCapabilitiesMarshaller::getIndex(const char* s)
-{
- if(!s)
- return HmiZoneCapabilities::INVALID_ENUM;
- const struct PerfectHashTable* p=HmiZoneCapabilities_intHash::getPointer(s,strlen(s));
- return p ? static_cast<HmiZoneCapabilities::HmiZoneCapabilitiesInternal>(p->idx) : HmiZoneCapabilities::INVALID_ENUM;
-}
-
-
-bool HmiZoneCapabilitiesMarshaller::fromJSON(const Json::Value& s,HmiZoneCapabilities& e)
-{
- e.mInternal=HmiZoneCapabilities::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=HmiZoneCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value HmiZoneCapabilitiesMarshaller::toJSON(const HmiZoneCapabilities& e)
-{
- if(e.mInternal==HmiZoneCapabilities::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool HmiZoneCapabilitiesMarshaller::fromString(const std::string& s,HmiZoneCapabilities& e)
-{
- e.mInternal=HmiZoneCapabilities::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string HmiZoneCapabilitiesMarshaller::toString(const HmiZoneCapabilities& e)
-{
- Json::FastWriter writer;
- return e.mInternal==HmiZoneCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable HmiZoneCapabilitiesMarshaller::mHashTable[2]=
-{
- {"FRONT",0},
- {"BACK",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp
deleted file mode 100644
index 4dd38536b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name HmiZoneCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-FRONT,0
-BACK,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h
deleted file mode 100644
index 1bf347580..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMIZONECAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMIZONECAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for HmiZoneCapabilities
-
- class HmiZoneCapabilitiesMarshaller
- {
- public:
-
- static std::string toName(const HmiZoneCapabilities& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(HmiZoneCapabilities& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=HmiZoneCapabilities::INVALID_ENUM;
- }
-
- static bool checkIntegrity(HmiZoneCapabilities& e) { return e.mInternal!=HmiZoneCapabilities::INVALID_ENUM; }
- static bool checkIntegrityConst(const HmiZoneCapabilities& e) { return e.mInternal!=HmiZoneCapabilities::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,HmiZoneCapabilities& e);
- static const std::string toString(const HmiZoneCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,HmiZoneCapabilities& e);
- static Json::Value toJSON(const HmiZoneCapabilities& e);
-
- static const char* getName(HmiZoneCapabilities::HmiZoneCapabilitiesInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const HmiZoneCapabilities::HmiZoneCapabilitiesInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc
deleted file mode 100644
index 3b9d7dc10..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class HmiZoneCapabilities_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-HmiZoneCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-HmiZoneCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp"
- {"BACK",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp"
- {"FRONT",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp
deleted file mode 100644
index 43c538e2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-#include "ImageMarshaller.h"
-#include "ImageTypeMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Image::Image(const Image& c)
-{
- *this=c;
-}
-
-
-bool Image::checkIntegrity(void)
-{
- return ImageMarshaller::checkIntegrity(*this);
-}
-
-
-Image::Image(void)
-{
-}
-
-
-
-bool Image::set_imageType(const ImageType& imageType_)
-{
- if(!ImageTypeMarshaller::checkIntegrityConst(imageType_)) return false;
- imageType=imageType_;
- return true;
-}
-
-bool Image::set_value(const std::string& value_)
-{
- if(value_.length()>65535) return false;
- value=value_;
- return true;
-}
-
-
-
-
-const ImageType& Image::get_imageType(void) const
-{
- return imageType;
-}
-
-
-const std::string& Image::get_value(void) const
-{
- return value;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp
deleted file mode 100644
index 4e3c8cc7c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-#include "ImageTypeMarshaller.h"
-
-#include "ImageMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ImageMarshaller::checkIntegrity(Image& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ImageMarshaller::fromString(const std::string& s,Image& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ImageMarshaller::toString(const Image& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ImageMarshaller::checkIntegrityConst(const Image& s)
-{
- if(!ImageTypeMarshaller::checkIntegrityConst(s.imageType)) return false;
- if(s.value.length()>65535) return false;
- return true;
-}
-
-Json::Value ImageMarshaller::toJSON(const Image& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["imageType"]=ImageTypeMarshaller::toJSON(e.imageType);
-
- json["value"]=Json::Value(e.value);
-
-
- return json;
-}
-
-
-bool ImageMarshaller::fromJSON(const Json::Value& json,Image& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("imageType")) return false;
- {
- const Json::Value& j=json["imageType"];
- if(!ImageTypeMarshaller::fromJSON(j,c.imageType))
- return false;
- }
- if(!json.isMember("value")) return false;
- {
- const Json::Value& j=json["value"];
- if(!j.isString()) return false;
- c.value=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h
deleted file mode 100644
index 4e3d83b3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_IMAGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_IMAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ImageMarshaller
- {
- static bool checkIntegrity(Image& e);
- static bool checkIntegrityConst(const Image& e);
-
- static bool fromString(const std::string& s,Image& e);
- static const std::string toString(const Image& e);
-
- static bool fromJSON(const Json::Value& s,Image& e);
- static Json::Value toJSON(const Image& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp
deleted file mode 100644
index 961edd8b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ImageType.h"
-#include "ImageTypeMarshaller.h"
-#include "ImageTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ImageType::ImageTypeInternal ImageTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return ImageType::INVALID_ENUM;
- const struct PerfectHashTable* p=ImageType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<ImageType::ImageTypeInternal>(p->idx) : ImageType::INVALID_ENUM;
-}
-
-
-bool ImageTypeMarshaller::fromJSON(const Json::Value& s,ImageType& e)
-{
- e.mInternal=ImageType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=ImageType::INVALID_ENUM);
-}
-
-
-Json::Value ImageTypeMarshaller::toJSON(const ImageType& e)
-{
- if(e.mInternal==ImageType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ImageTypeMarshaller::fromString(const std::string& s,ImageType& e)
-{
- e.mInternal=ImageType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string ImageTypeMarshaller::toString(const ImageType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==ImageType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ImageTypeMarshaller::mHashTable[2]=
-{
- {"STATIC",0},
- {"DYNAMIC",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp
deleted file mode 100644
index 62b224bfa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ImageType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-STATIC,0
-DYNAMIC,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h
deleted file mode 100644
index c9e6e4edc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_IMAGETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_IMAGETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ImageType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ImageType
-
- class ImageTypeMarshaller
- {
- public:
-
- static std::string toName(const ImageType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(ImageType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=ImageType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(ImageType& e) { return e.mInternal!=ImageType::INVALID_ENUM; }
- static bool checkIntegrityConst(const ImageType& e) { return e.mInternal!=ImageType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,ImageType& e);
- static const std::string toString(const ImageType& e);
-
- static bool fromJSON(const Json::Value& s,ImageType& e);
- static Json::Value toJSON(const ImageType& e);
-
- static const char* getName(ImageType::ImageTypeInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const ImageType::ImageTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc
deleted file mode 100644
index 5c3ccddc3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 7
-/* maximum key range = 2, duplicates = 0 */
-
-class ImageType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ImageType_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ImageType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 6, 7
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp"
- {"STATIC",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp"
- {"DYNAMIC",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp
deleted file mode 100644
index 95e108394..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h"
-#include "InteractionModeMarshaller.h"
-#include "InteractionModeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const InteractionMode::InteractionModeInternal InteractionModeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return InteractionMode::INVALID_ENUM;
- const struct PerfectHashTable* p=InteractionMode_intHash::getPointer(s,strlen(s));
- return p ? static_cast<InteractionMode::InteractionModeInternal>(p->idx) : InteractionMode::INVALID_ENUM;
-}
-
-
-bool InteractionModeMarshaller::fromJSON(const Json::Value& s,InteractionMode& e)
-{
- e.mInternal=InteractionMode::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=InteractionMode::INVALID_ENUM);
-}
-
-
-Json::Value InteractionModeMarshaller::toJSON(const InteractionMode& e)
-{
- if(e.mInternal==InteractionMode::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool InteractionModeMarshaller::fromString(const std::string& s,InteractionMode& e)
-{
- e.mInternal=InteractionMode::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string InteractionModeMarshaller::toString(const InteractionMode& e)
-{
- Json::FastWriter writer;
- return e.mInternal==InteractionMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable InteractionModeMarshaller::mHashTable[3]=
-{
- {"MANUAL_ONLY",0},
- {"VR_ONLY",1},
- {"BOTH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp
deleted file mode 100644
index a81968963..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name InteractionMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-MANUAL_ONLY,0
-VR_ONLY,1
-BOTH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h
deleted file mode 100644
index 75b0e3cac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_INTERACTIONMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_INTERACTIONMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for InteractionMode
-
- class InteractionModeMarshaller
- {
- public:
-
- static std::string toName(const InteractionMode& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(InteractionMode& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=InteractionMode::INVALID_ENUM;
- }
-
- static bool checkIntegrity(InteractionMode& e) { return e.mInternal!=InteractionMode::INVALID_ENUM; }
- static bool checkIntegrityConst(const InteractionMode& e) { return e.mInternal!=InteractionMode::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,InteractionMode& e);
- static const std::string toString(const InteractionMode& e);
-
- static bool fromJSON(const Json::Value& s,InteractionMode& e);
- static Json::Value toJSON(const InteractionMode& e);
-
- static const char* getName(InteractionMode::InteractionModeInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const InteractionMode::InteractionModeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc
deleted file mode 100644
index 454e6333d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 11
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 11
-/* maximum key range = 8, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class InteractionMode_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-InteractionMode_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-InteractionMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 0, 0, 7, 0, 0, 0, 11
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp"
- {"BOTH",2},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp"
- {"VR_ONLY",1},
- {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp"
- {"MANUAL_ONLY",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp
deleted file mode 100644
index 055e86a6a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-#include "LanguageMarshaller.h"
-#include "LanguageMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const Language::LanguageInternal LanguageMarshaller::getIndex(const char* s)
-{
- if(!s)
- return Language::INVALID_ENUM;
- const struct PerfectHashTable* p=Language_intHash::getPointer(s,strlen(s));
- return p ? static_cast<Language::LanguageInternal>(p->idx) : Language::INVALID_ENUM;
-}
-
-
-bool LanguageMarshaller::fromJSON(const Json::Value& s,Language& e)
-{
- e.mInternal=Language::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=Language::INVALID_ENUM);
-}
-
-
-Json::Value LanguageMarshaller::toJSON(const Language& e)
-{
- if(e.mInternal==Language::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool LanguageMarshaller::fromString(const std::string& s,Language& e)
-{
- e.mInternal=Language::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string LanguageMarshaller::toString(const Language& e)
-{
- Json::FastWriter writer;
- return e.mInternal==Language::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable LanguageMarshaller::mHashTable[20]=
-{
- {"EN-US",0},
- {"ES-MX",1},
- {"FR-CA",2},
- {"DE-EU",3},
- {"ES-EU",4},
- {"EN-EU",5},
- {"RU-RU",6},
- {"TR-TR",7},
- {"PL-EU",8},
- {"FR-EU",9},
- {"IT-EU",10},
- {"SV-EU",11},
- {"PT-EU",12},
- {"NL-EU",13},
- {"EN-AU",14},
- {"ZH-CN",15},
- {"ZH-TW",16},
- {"JA-JP",17},
- {"AR",18},
- {"KO-KR",19}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp
deleted file mode 100644
index 9e1622550..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp
+++ /dev/null
@@ -1,36 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Language_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-EN-US,0
-ES-MX,1
-FR-CA,2
-DE-EU,3
-ES-EU,4
-EN-EU,5
-RU-RU,6
-TR-TR,7
-PL-EU,8
-FR-EU,9
-IT-EU,10
-SV-EU,11
-PT-EU,12
-NL-EU,13
-EN-AU,14
-ZH-CN,15
-ZH-TW,16
-JA-JP,17
-AR,18
-KO-KR,19
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h
deleted file mode 100644
index c9497572e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_LANGUAGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_LANGUAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for Language
-
- class LanguageMarshaller
- {
- public:
-
- static std::string toName(const Language& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(Language& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=Language::INVALID_ENUM;
- }
-
- static bool checkIntegrity(Language& e) { return e.mInternal!=Language::INVALID_ENUM; }
- static bool checkIntegrityConst(const Language& e) { return e.mInternal!=Language::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,Language& e);
- static const std::string toString(const Language& e);
-
- static bool fromJSON(const Json::Value& s,Language& e);
- static Json::Value toJSON(const Language& e);
-
- static const char* getName(Language::LanguageInternal e)
- {
- return (e>=0 && e<20) ? mHashTable[e].name : NULL;
- }
-
- static const Language::LanguageInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[20];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc
deleted file mode 100644
index 71c457ef8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp */
-/* Computed positions: -k'1-2,4' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 20
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 50
-/* maximum key range = 48, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class Language_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Language_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 1, 51, 3, 28, 5,
- 30, 51, 5, 13, 0, 15, 25, 15, 0, 15,
- 10, 51, 0, 3, 10, 0, 10, 51, 51, 51,
- 0, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[3]];
- /*FALLTHROUGH*/
- case 3:
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-Language_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 2, 0, 5, 5, 0, 0, 0, 5, 5, 0, 5,
- 0, 5, 0, 0, 5, 0, 5, 0, 0, 5, 0, 5, 0, 0,
- 5, 0, 5, 0, 0, 5, 0, 5, 0, 0, 5, 0, 5, 0,
- 0, 5, 0, 5, 0, 0, 0, 0, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"AR",18},
- {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"RU-RU",6},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"JA-JP",17},
- {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"EN-US",0},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"EN-AU",14},
- {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"ZH-CN",15},
- {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"EN-EU",5},
- {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"ES-EU",4},
- {""},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"ZH-TW",16},
- {""}, {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"SV-EU",11},
- {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"TR-TR",7},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"ES-MX",1},
- {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"PT-EU",12},
- {""}, {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"IT-EU",10},
- {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"NL-EU",13},
- {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"FR-CA",2},
- {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"FR-EU",9},
- {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"DE-EU",3},
- {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"PL-EU",8},
- {""}, {""}, {""}, {""},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
- {"KO-KR",19}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp
deleted file mode 100644
index 39c9781b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-#include "ListFiles_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ListFiles_request::~ListFiles_request(void)
-{
-}
-
-
-ListFiles_request::ListFiles_request(const ListFiles_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool ListFiles_request::checkIntegrity(void)
-{
- return ListFiles_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ListFiles_request::ListFiles_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp
deleted file mode 100644
index abf8a76b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-
-
-#include "ListFiles_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ListFiles_requestMarshaller::checkIntegrity(ListFiles_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ListFiles_requestMarshaller::fromString(const std::string& s,ListFiles_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ListFiles_requestMarshaller::toString(const ListFiles_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ListFiles_requestMarshaller::checkIntegrityConst(const ListFiles_request& s)
-{
- return true;
-}
-
-Json::Value ListFiles_requestMarshaller::toJSON(const ListFiles_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- return json;
-}
-
-
-bool ListFiles_requestMarshaller::fromJSON(const Json::Value& json,ListFiles_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h
deleted file mode 100644
index 0b5e68555..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_LISTFILES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_LISTFILES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ListFiles_requestMarshaller
- {
- static bool checkIntegrity(ListFiles_request& e);
- static bool checkIntegrityConst(const ListFiles_request& e);
-
- static bool fromString(const std::string& s,ListFiles_request& e);
- static const std::string toString(const ListFiles_request& e);
-
- static bool fromJSON(const Json::Value& s,ListFiles_request& e);
- static Json::Value toJSON(const ListFiles_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp
deleted file mode 100644
index 85973fd93..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-#include "ListFiles_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ListFiles_response& ListFiles_response::operator =(const ListFiles_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- filenames = c.filenames ? new std::vector<std::string>(c.filenames[0]) : 0;
- spaceAvailable = c.spaceAvailable;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-ListFiles_response::~ListFiles_response(void)
-{
- if (filenames)
- {
- delete filenames;
- }
-}
-
-ListFiles_response::ListFiles_response(const ListFiles_response& c)
-{
- *this = c;
-}
-
-bool ListFiles_response::checkIntegrity(void)
-{
- return ListFiles_responseMarshaller::checkIntegrity(*this);
-}
-
-ListFiles_response::ListFiles_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , filenames(0)
-{}
-
-bool ListFiles_response::set_filenames(const std::vector<std::string>& filenames_)
-{
- unsigned int i = filenames_.size();
- if (i > 1000 || i < 0) // TODO(AK): unsigned int i < 0
- {
- return false;
- }
- while (i--)
- {
- if (filenames_[i].length() > 500)
- {
- return false;
- }
- }
- delete filenames;
- filenames = 0;
-
- filenames = new std::vector<std::string>(filenames_);
- return true;
-}
-
-void ListFiles_response::reset_filenames(void)
-{
- if (filenames)
- {
- delete filenames;
- }
- filenames = 0;
-}
-
-bool ListFiles_response::set_spaceAvailable(unsigned int spaceAvailable_)
-{
- if (spaceAvailable_ > 2000000000)
- {
- return false;
- }
- spaceAvailable = spaceAvailable_;
- return true;
-}
-
-const std::vector<std::string>* ListFiles_response::get_filenames(void) const
-{
- return filenames;
-}
-
-unsigned int ListFiles_response::get_spaceAvailable(void) const
-{
- return spaceAvailable;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp
deleted file mode 100644
index 7ca71414c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-#include "ResultMarshaller.h"
-
-#include "ListFiles_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ListFiles_responseMarshaller::checkIntegrity(ListFiles_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ListFiles_responseMarshaller::fromString(const std::string& s,ListFiles_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ListFiles_responseMarshaller::toString(const ListFiles_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ListFiles_responseMarshaller::checkIntegrityConst(const ListFiles_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.filenames)
- {
- unsigned int i=s.filenames[0].size();
- if(i>1000 || i<0) return false;
- while(i--)
- {
- if(s.filenames[0][i].length()>500) return false;
- }
- }
- if(s.spaceAvailable>2000000000) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value ListFiles_responseMarshaller::toJSON(const ListFiles_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.filenames)
- {
- unsigned int sz=e.filenames->size();
- json["filenames"]=Json::Value(Json::arrayValue);
- json["filenames"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["filenames"][i]=Json::Value(e.filenames[0][i]);
- }
-
- json["spaceAvailable"]=Json::Value(e.spaceAvailable);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool ListFiles_responseMarshaller::fromJSON(const Json::Value& json,ListFiles_response& c)
-{
- if(c.filenames) delete c.filenames;
- c.filenames=0;
-
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("filenames"))
- {
- const Json::Value& j=json["filenames"];
- if(!j.isArray()) return false;
- c.filenames=new std::vector<std::string>();
- c.filenames->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.filenames[0][i]=j[i].asString();
- }
- if(!json.isMember("spaceAvailable")) return false;
- {
- const Json::Value& j=json["spaceAvailable"];
- if(!j.isInt()) return false;
- c.spaceAvailable=j.asInt();
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h
deleted file mode 100644
index 76b8e71b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_LISTFILES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_LISTFILES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ListFiles_responseMarshaller
- {
- static bool checkIntegrity(ListFiles_response& e);
- static bool checkIntegrityConst(const ListFiles_response& e);
-
- static bool fromString(const std::string& s,ListFiles_response& e);
- static const std::string toString(const ListFiles_response& e);
-
- static bool fromJSON(const Json::Value& s,ListFiles_response& e);
- static Json::Value toJSON(const ListFiles_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp
deleted file mode 100644
index 9d22600d5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp
+++ /dev/null
@@ -1,1362 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-NsSmartDeviceLinkRPC::SDLRPCMessage* Marshaller::fromString(const std::string& s,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
- NsSmartDeviceLinkRPC::SDLRPCMessage* rv=0;
- try
- {
- Json::Reader reader;
- Json::Value json;
-
- if(!reader.parse(s,json,false)) return 0;
- if(!(rv=fromJSON(json,fid,mt))) return 0;
- }
- catch(...)
- {
- return 0;
- }
- return rv;
-}
-
-std::string Marshaller::toString(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
- if(!msg) return "";
-
- Json::Value json=toJSON(msg,fid,mt);
-
- if(json.isNull()) return "";
-
- Json::FastWriter writer;
- std::string rv;
- return writer.write(json);
-}
-
-
-NsSmartDeviceLinkRPC::SDLRPCMessage* Marshaller::fromJSON(const Json::Value& json,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
- if(!json.isObject()) return NULL;
- Json::Value j=Json::Value(Json::nullValue);
-
- if(!json.isMember("parameters")) return NULL;
- j=json["parameters"];
-
- switch(fid) // let's rock, china style
- {
- case FunctionID::AddCommandID:
- if(mt==messageType::request)
- {
- AddCommand_request* rv=new AddCommand_request;
- if(AddCommand_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- AddCommand_response* rv=new AddCommand_response;
- if(AddCommand_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::AddSubMenuID:
- if(mt==messageType::request)
- {
- AddSubMenu_request* rv=new AddSubMenu_request;
- if(AddSubMenu_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- AddSubMenu_response* rv=new AddSubMenu_response;
- if(AddSubMenu_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::AlertID:
- if(mt==messageType::request)
- {
- Alert_request* rv=new Alert_request;
- if(Alert_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- Alert_response* rv=new Alert_response;
- if(Alert_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::AlertManeuverID:
- if(mt==messageType::request)
- {
- AlertManeuver_request* rv=new AlertManeuver_request;
- if(AlertManeuver_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- AlertManeuver_response* rv=new AlertManeuver_response;
- if(AlertManeuver_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ChangeRegistrationID:
- if(mt==messageType::request)
- {
- ChangeRegistration_request* rv=new ChangeRegistration_request;
- if(ChangeRegistration_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- ChangeRegistration_response* rv=new ChangeRegistration_response;
- if(ChangeRegistration_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::CreateInteractionChoiceSetID:
- if(mt==messageType::request)
- {
- CreateInteractionChoiceSet_request* rv=new CreateInteractionChoiceSet_request;
- if(CreateInteractionChoiceSet_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- CreateInteractionChoiceSet_response* rv=new CreateInteractionChoiceSet_response;
- if(CreateInteractionChoiceSet_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::DeleteCommandID:
- if(mt==messageType::request)
- {
- DeleteCommand_request* rv=new DeleteCommand_request;
- if(DeleteCommand_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- DeleteCommand_response* rv=new DeleteCommand_response;
- if(DeleteCommand_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::DeleteFileID:
- if(mt==messageType::request)
- {
- DeleteFile_request* rv=new DeleteFile_request;
- if(DeleteFile_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- DeleteFile_response* rv=new DeleteFile_response;
- if(DeleteFile_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::DeleteInteractionChoiceSetID:
- if(mt==messageType::request)
- {
- DeleteInteractionChoiceSet_request* rv=new DeleteInteractionChoiceSet_request;
- if(DeleteInteractionChoiceSet_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- DeleteInteractionChoiceSet_response* rv=new DeleteInteractionChoiceSet_response;
- if(DeleteInteractionChoiceSet_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::DeleteSubMenuID:
- if(mt==messageType::request)
- {
- DeleteSubMenu_request* rv=new DeleteSubMenu_request;
- if(DeleteSubMenu_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- DeleteSubMenu_response* rv=new DeleteSubMenu_response;
- if(DeleteSubMenu_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::DialNumberID:
- if(mt==messageType::request)
- {
- DialNumber_request* rv=new DialNumber_request;
- if(DialNumber_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- DialNumber_response* rv=new DialNumber_response;
- if(DialNumber_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::EncodedSyncPDataID:
- if(mt==messageType::request)
- {
- EncodedSyncPData_request* rv=new EncodedSyncPData_request;
- if(EncodedSyncPData_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- EncodedSyncPData_response* rv=new EncodedSyncPData_response;
- if(EncodedSyncPData_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::EndAudioPassThruID:
- if(mt==messageType::request)
- {
- EndAudioPassThru_request* rv=new EndAudioPassThru_request;
- if(EndAudioPassThru_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- EndAudioPassThru_response* rv=new EndAudioPassThru_response;
- if(EndAudioPassThru_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::GenericResponseID:
- if(mt==messageType::request)
- {
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- GenericResponse_response* rv=new GenericResponse_response;
- if(GenericResponse_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::GetDTCsID:
- if(mt==messageType::request)
- {
- GetDTCs_request* rv=new GetDTCs_request;
- if(GetDTCs_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- GetDTCs_response* rv=new GetDTCs_response;
- if(GetDTCs_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::GetVehicleDataID:
- if(mt==messageType::request)
- {
- GetVehicleData_request* rv=new GetVehicleData_request;
- if(GetVehicleData_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- GetVehicleData_response* rv=new GetVehicleData_response;
- if(GetVehicleData_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ListFilesID:
- if(mt==messageType::request)
- {
- ListFiles_request* rv=new ListFiles_request;
- if(ListFiles_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- ListFiles_response* rv=new ListFiles_response;
- if(ListFiles_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::OnAppInterfaceUnregisteredID:
- if(mt==messageType::notification)
- {
- OnAppInterfaceUnregistered* rv=new OnAppInterfaceUnregistered;
- if(OnAppInterfaceUnregisteredMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnAudioPassThruID:
- if(mt==messageType::notification)
- {
- OnAudioPassThru* rv=new OnAudioPassThru;
- if(OnAudioPassThruMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnButtonEventID:
- if(mt==messageType::notification)
- {
- OnButtonEvent* rv=new OnButtonEvent;
- if(OnButtonEventMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnButtonPressID:
- if(mt==messageType::notification)
- {
- OnButtonPress* rv=new OnButtonPress;
- if(OnButtonPressMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnCommandID:
- if(mt==messageType::notification)
- {
- OnCommand* rv=new OnCommand;
- if(OnCommandMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnDriverDistractionID:
- if(mt==messageType::notification)
- {
- OnDriverDistraction* rv=new OnDriverDistraction;
- if(OnDriverDistractionMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnEncodedSyncPDataID:
- if(mt==messageType::notification)
- {
- OnEncodedSyncPData* rv=new OnEncodedSyncPData;
- if(OnEncodedSyncPDataMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnHMIStatusID:
- if(mt==messageType::notification)
- {
- OnHMIStatus* rv=new OnHMIStatus;
- if(OnHMIStatusMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnLanguageChangeID:
- if(mt==messageType::notification)
- {
- OnLanguageChange* rv=new OnLanguageChange;
- if(OnLanguageChangeMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnPermissionsChangeID:
- if(mt==messageType::notification)
- {
- OnPermissionsChange* rv=new OnPermissionsChange;
- if(OnPermissionsChangeMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnTBTClientStateID:
- if(mt==messageType::notification)
- {
- OnTBTClientState* rv=new OnTBTClientState;
- if(OnTBTClientStateMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::OnVehicleDataID:
- if(mt==messageType::notification)
- {
- OnVehicleData* rv=new OnVehicleData;
- if(OnVehicleDataMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- }
- case FunctionID::PerformAudioPassThruID:
- if(mt==messageType::request)
- {
- PerformAudioPassThru_request* rv=new PerformAudioPassThru_request;
- if(PerformAudioPassThru_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- PerformAudioPassThru_response* rv=new PerformAudioPassThru_response;
- if(PerformAudioPassThru_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::PerformInteractionID:
- if(mt==messageType::request)
- {
- PerformInteraction_request* rv=new PerformInteraction_request;
- if(PerformInteraction_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- PerformInteraction_response* rv=new PerformInteraction_response;
- if(PerformInteraction_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::PutFileID:
- if(mt==messageType::request)
- {
- PutFile_request* rv=new PutFile_request;
- if(PutFile_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- PutFile_response* rv=new PutFile_response;
- if(PutFile_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ReadDIDID:
- if(mt==messageType::request)
- {
- ReadDID_request* rv=new ReadDID_request;
- if(ReadDID_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- ReadDID_response* rv=new ReadDID_response;
- if(ReadDID_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::RegisterAppInterfaceID:
- if(mt==messageType::request)
- {
- RegisterAppInterface_request* rv=new RegisterAppInterface_request;
- if(RegisterAppInterface_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- RegisterAppInterface_response* rv=new RegisterAppInterface_response;
- if(RegisterAppInterface_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ResetGlobalPropertiesID:
- if(mt==messageType::request)
- {
- ResetGlobalProperties_request* rv=new ResetGlobalProperties_request;
- if(ResetGlobalProperties_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- ResetGlobalProperties_response* rv=new ResetGlobalProperties_response;
- if(ResetGlobalProperties_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ScrollableMessageID:
- if(mt==messageType::request)
- {
- ScrollableMessage_request* rv=new ScrollableMessage_request;
- if(ScrollableMessage_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- ScrollableMessage_response* rv=new ScrollableMessage_response;
- if(ScrollableMessage_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SetAppIconID:
- if(mt==messageType::request)
- {
- SetAppIcon_request* rv=new SetAppIcon_request;
- if(SetAppIcon_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- SetAppIcon_response* rv=new SetAppIcon_response;
- if(SetAppIcon_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SetDisplayLayoutID:
- if(mt==messageType::request)
- {
- SetDisplayLayout_request* rv=new SetDisplayLayout_request;
- if(SetDisplayLayout_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- SetDisplayLayout_response* rv=new SetDisplayLayout_response;
- if(SetDisplayLayout_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SetGlobalPropertiesID:
- if(mt==messageType::request)
- {
- SetGlobalProperties_request* rv=new SetGlobalProperties_request;
- if(SetGlobalProperties_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- SetGlobalProperties_response* rv=new SetGlobalProperties_response;
- if(SetGlobalProperties_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SetMediaClockTimerID:
- if(mt==messageType::request)
- {
- SetMediaClockTimer_request* rv=new SetMediaClockTimer_request;
- if(SetMediaClockTimer_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- SetMediaClockTimer_response* rv=new SetMediaClockTimer_response;
- if(SetMediaClockTimer_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ShowID:
- if(mt==messageType::request)
- {
- Show_request* rv=new Show_request;
- if(Show_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- Show_response* rv=new Show_response;
- if(Show_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::ShowConstantTBTID:
- if(mt==messageType::request)
- {
- ShowConstantTBT_request* rv=new ShowConstantTBT_request;
- if(ShowConstantTBT_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- ShowConstantTBT_response* rv=new ShowConstantTBT_response;
- if(ShowConstantTBT_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SliderID:
- if(mt==messageType::request)
- {
- Slider_request* rv=new Slider_request;
- if(Slider_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- Slider_response* rv=new Slider_response;
- if(Slider_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SpeakID:
- if(mt==messageType::request)
- {
- Speak_request* rv=new Speak_request;
- if(Speak_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- Speak_response* rv=new Speak_response;
- if(Speak_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SubscribeButtonID:
- if(mt==messageType::request)
- {
- SubscribeButton_request* rv=new SubscribeButton_request;
- if(SubscribeButton_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- SubscribeButton_response* rv=new SubscribeButton_response;
- if(SubscribeButton_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::SubscribeVehicleDataID:
- if(mt==messageType::request)
- {
- SubscribeVehicleData_request* rv=new SubscribeVehicleData_request;
- if(SubscribeVehicleData_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- SubscribeVehicleData_response* rv=new SubscribeVehicleData_response;
- if(SubscribeVehicleData_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::UnregisterAppInterfaceID:
- if(mt==messageType::request)
- {
- UnregisterAppInterface_request* rv=new UnregisterAppInterface_request;
- if(UnregisterAppInterface_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- UnregisterAppInterface_response* rv=new UnregisterAppInterface_response;
- if(UnregisterAppInterface_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::UnsubscribeButtonID:
- if(mt==messageType::request)
- {
- UnsubscribeButton_request* rv=new UnsubscribeButton_request;
- if(UnsubscribeButton_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- UnsubscribeButton_response* rv=new UnsubscribeButton_response;
- if(UnsubscribeButton_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::UnsubscribeVehicleDataID:
- if(mt==messageType::request)
- {
- UnsubscribeVehicleData_request* rv=new UnsubscribeVehicleData_request;
- if(UnsubscribeVehicleData_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- UnsubscribeVehicleData_response* rv=new UnsubscribeVehicleData_response;
- if(UnsubscribeVehicleData_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- case FunctionID::UpdateTurnListID:
- if(mt==messageType::request)
- {
- UpdateTurnList_request* rv=new UpdateTurnList_request;
- if(UpdateTurnList_requestMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
-
- if(mt==messageType::response)
- {
- UpdateTurnList_response* rv=new UpdateTurnList_response;
- if(UpdateTurnList_responseMarshaller::fromJSON(j,*rv))
- return rv;
- delete rv;
- return NULL;
- }
- return NULL;
- default:;
- }
-
- return NULL;
-}
-
-Json::Value Marshaller::toJSON(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg, FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
- Json::Value j=toJSONparam(msg,fid,mt);
- Json::Value rv=Json::Value(Json::nullValue);
- if(!j.isNull())
- {
- rv=Json::Value(Json::objectValue);
- rv["parameters"]=j;
- }
- return rv;
-}
-
-
-Json::Value Marshaller::toJSONparam(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
- Json::Value j=Json::Value(Json::nullValue);
- if(!msg) return j;
-
- switch(fid)
- {
- case FunctionID::AddCommandID:
- if(mt==messageType::request)
- return AddCommand_requestMarshaller::toJSON(* static_cast<const AddCommand_request*>(msg));
- if(mt==messageType::response)
- return AddCommand_responseMarshaller::toJSON(* static_cast<const AddCommand_response*>(msg));
- return j;
- case FunctionID::AddSubMenuID:
- if(mt==messageType::request)
- return AddSubMenu_requestMarshaller::toJSON(* static_cast<const AddSubMenu_request*>(msg));
- if(mt==messageType::response)
- return AddSubMenu_responseMarshaller::toJSON(* static_cast<const AddSubMenu_response*>(msg));
- return j;
- case FunctionID::AlertID:
- if(mt==messageType::request)
- return Alert_requestMarshaller::toJSON(* static_cast<const Alert_request*>(msg));
- if(mt==messageType::response)
- return Alert_responseMarshaller::toJSON(* static_cast<const Alert_response*>(msg));
- return j;
- case FunctionID::AlertManeuverID:
- if(mt==messageType::request)
- return AlertManeuver_requestMarshaller::toJSON(* static_cast<const AlertManeuver_request*>(msg));
- if(mt==messageType::response)
- return AlertManeuver_responseMarshaller::toJSON(* static_cast<const AlertManeuver_response*>(msg));
- return j;
- case FunctionID::ChangeRegistrationID:
- if(mt==messageType::request)
- return ChangeRegistration_requestMarshaller::toJSON(* static_cast<const ChangeRegistration_request*>(msg));
- if(mt==messageType::response)
- return ChangeRegistration_responseMarshaller::toJSON(* static_cast<const ChangeRegistration_response*>(msg));
- return j;
- case FunctionID::CreateInteractionChoiceSetID:
- if(mt==messageType::request)
- return CreateInteractionChoiceSet_requestMarshaller::toJSON(* static_cast<const CreateInteractionChoiceSet_request*>(msg));
- if(mt==messageType::response)
- return CreateInteractionChoiceSet_responseMarshaller::toJSON(* static_cast<const CreateInteractionChoiceSet_response*>(msg));
- return j;
- case FunctionID::DeleteCommandID:
- if(mt==messageType::request)
- return DeleteCommand_requestMarshaller::toJSON(* static_cast<const DeleteCommand_request*>(msg));
- if(mt==messageType::response)
- return DeleteCommand_responseMarshaller::toJSON(* static_cast<const DeleteCommand_response*>(msg));
- return j;
- case FunctionID::DeleteFileID:
- if(mt==messageType::request)
- return DeleteFile_requestMarshaller::toJSON(* static_cast<const DeleteFile_request*>(msg));
- if(mt==messageType::response)
- return DeleteFile_responseMarshaller::toJSON(* static_cast<const DeleteFile_response*>(msg));
- return j;
- case FunctionID::DeleteInteractionChoiceSetID:
- if(mt==messageType::request)
- return DeleteInteractionChoiceSet_requestMarshaller::toJSON(* static_cast<const DeleteInteractionChoiceSet_request*>(msg));
- if(mt==messageType::response)
- return DeleteInteractionChoiceSet_responseMarshaller::toJSON(* static_cast<const DeleteInteractionChoiceSet_response*>(msg));
- return j;
- case FunctionID::DeleteSubMenuID:
- if(mt==messageType::request)
- return DeleteSubMenu_requestMarshaller::toJSON(* static_cast<const DeleteSubMenu_request*>(msg));
- if(mt==messageType::response)
- return DeleteSubMenu_responseMarshaller::toJSON(* static_cast<const DeleteSubMenu_response*>(msg));
- return j;
- case FunctionID::DialNumberID:
- if(mt==messageType::request)
- return DialNumber_requestMarshaller::toJSON(* static_cast<const DialNumber_request*>(msg));
- if(mt==messageType::response)
- return DialNumber_responseMarshaller::toJSON(* static_cast<const DialNumber_response*>(msg));
- return j;
- case FunctionID::EncodedSyncPDataID:
- if(mt==messageType::request)
- return EncodedSyncPData_requestMarshaller::toJSON(* static_cast<const EncodedSyncPData_request*>(msg));
- if(mt==messageType::response)
- return EncodedSyncPData_responseMarshaller::toJSON(* static_cast<const EncodedSyncPData_response*>(msg));
- return j;
- case FunctionID::EndAudioPassThruID:
- if(mt==messageType::request)
- return EndAudioPassThru_requestMarshaller::toJSON(* static_cast<const EndAudioPassThru_request*>(msg));
- if(mt==messageType::response)
- return EndAudioPassThru_responseMarshaller::toJSON(* static_cast<const EndAudioPassThru_response*>(msg));
- return j;
- case FunctionID::GenericResponseID:
- if(mt==messageType::request)
- return Json::nullValue;
- if(mt==messageType::response)
- return GenericResponse_responseMarshaller::toJSON(* static_cast<const GenericResponse_response*>(msg));
- return j;
- case FunctionID::GetDTCsID:
- if(mt==messageType::request)
- return GetDTCs_requestMarshaller::toJSON(* static_cast<const GetDTCs_request*>(msg));
- if(mt==messageType::response)
- return GetDTCs_responseMarshaller::toJSON(* static_cast<const GetDTCs_response*>(msg));
- return j;
- case FunctionID::GetVehicleDataID:
- if(mt==messageType::request)
- return GetVehicleData_requestMarshaller::toJSON(* static_cast<const GetVehicleData_request*>(msg));
- if(mt==messageType::response)
- return GetVehicleData_responseMarshaller::toJSON(* static_cast<const GetVehicleData_response*>(msg));
- return j;
- case FunctionID::ListFilesID:
- if(mt==messageType::request)
- return ListFiles_requestMarshaller::toJSON(* static_cast<const ListFiles_request*>(msg));
- if(mt==messageType::response)
- return ListFiles_responseMarshaller::toJSON(* static_cast<const ListFiles_response*>(msg));
- return j;
- case FunctionID::OnAppInterfaceUnregisteredID:
- return mt==messageType::notification ? OnAppInterfaceUnregisteredMarshaller::toJSON(* static_cast<const OnAppInterfaceUnregistered*>(msg)) : j;
- case FunctionID::OnAudioPassThruID:
- return mt==messageType::notification ? OnAudioPassThruMarshaller::toJSON(* static_cast<const OnAudioPassThru*>(msg)) : j;
- case FunctionID::OnButtonEventID:
- return mt==messageType::notification ? OnButtonEventMarshaller::toJSON(* static_cast<const OnButtonEvent*>(msg)) : j;
- case FunctionID::OnButtonPressID:
- return mt==messageType::notification ? OnButtonPressMarshaller::toJSON(* static_cast<const OnButtonPress*>(msg)) : j;
- case FunctionID::OnCommandID:
- return mt==messageType::notification ? OnCommandMarshaller::toJSON(* static_cast<const OnCommand*>(msg)) : j;
- case FunctionID::OnDriverDistractionID:
- return mt==messageType::notification ? OnDriverDistractionMarshaller::toJSON(* static_cast<const OnDriverDistraction*>(msg)) : j;
- case FunctionID::OnEncodedSyncPDataID:
- return mt==messageType::notification ? OnEncodedSyncPDataMarshaller::toJSON(* static_cast<const OnEncodedSyncPData*>(msg)) : j;
- case FunctionID::OnHMIStatusID:
- return mt==messageType::notification ? OnHMIStatusMarshaller::toJSON(* static_cast<const OnHMIStatus*>(msg)) : j;
- case FunctionID::OnLanguageChangeID:
- return mt==messageType::notification ? OnLanguageChangeMarshaller::toJSON(* static_cast<const OnLanguageChange*>(msg)) : j;
- case FunctionID::OnPermissionsChangeID:
- return mt==messageType::notification ? OnPermissionsChangeMarshaller::toJSON(* static_cast<const OnPermissionsChange*>(msg)) : j;
- case FunctionID::OnTBTClientStateID:
- return mt==messageType::notification ? OnTBTClientStateMarshaller::toJSON(* static_cast<const OnTBTClientState*>(msg)) : j;
- case FunctionID::OnVehicleDataID:
- return mt==messageType::notification ? OnVehicleDataMarshaller::toJSON(* static_cast<const OnVehicleData*>(msg)) : j;
- case FunctionID::PerformAudioPassThruID:
- if(mt==messageType::request)
- return PerformAudioPassThru_requestMarshaller::toJSON(* static_cast<const PerformAudioPassThru_request*>(msg));
- if(mt==messageType::response)
- return PerformAudioPassThru_responseMarshaller::toJSON(* static_cast<const PerformAudioPassThru_response*>(msg));
- return j;
- case FunctionID::PerformInteractionID:
- if(mt==messageType::request)
- return PerformInteraction_requestMarshaller::toJSON(* static_cast<const PerformInteraction_request*>(msg));
- if(mt==messageType::response)
- return PerformInteraction_responseMarshaller::toJSON(* static_cast<const PerformInteraction_response*>(msg));
- return j;
- case FunctionID::PutFileID:
- if(mt==messageType::request)
- return PutFile_requestMarshaller::toJSON(* static_cast<const PutFile_request*>(msg));
- if(mt==messageType::response)
- return PutFile_responseMarshaller::toJSON(* static_cast<const PutFile_response*>(msg));
- return j;
- case FunctionID::ReadDIDID:
- if(mt==messageType::request)
- return ReadDID_requestMarshaller::toJSON(* static_cast<const ReadDID_request*>(msg));
- if(mt==messageType::response)
- return ReadDID_responseMarshaller::toJSON(* static_cast<const ReadDID_response*>(msg));
- return j;
- case FunctionID::RegisterAppInterfaceID:
- if(mt==messageType::request)
- return RegisterAppInterface_requestMarshaller::toJSON(* static_cast<const RegisterAppInterface_request*>(msg));
- if(mt==messageType::response)
- return RegisterAppInterface_responseMarshaller::toJSON(* static_cast<const RegisterAppInterface_response*>(msg));
- return j;
- case FunctionID::ResetGlobalPropertiesID:
- if(mt==messageType::request)
- return ResetGlobalProperties_requestMarshaller::toJSON(* static_cast<const ResetGlobalProperties_request*>(msg));
- if(mt==messageType::response)
- return ResetGlobalProperties_responseMarshaller::toJSON(* static_cast<const ResetGlobalProperties_response*>(msg));
- return j;
- case FunctionID::ScrollableMessageID:
- if(mt==messageType::request)
- return ScrollableMessage_requestMarshaller::toJSON(* static_cast<const ScrollableMessage_request*>(msg));
- if(mt==messageType::response)
- return ScrollableMessage_responseMarshaller::toJSON(* static_cast<const ScrollableMessage_response*>(msg));
- return j;
- case FunctionID::SetAppIconID:
- if(mt==messageType::request)
- return SetAppIcon_requestMarshaller::toJSON(* static_cast<const SetAppIcon_request*>(msg));
- if(mt==messageType::response)
- return SetAppIcon_responseMarshaller::toJSON(* static_cast<const SetAppIcon_response*>(msg));
- return j;
- case FunctionID::SetDisplayLayoutID:
- if(mt==messageType::request)
- return SetDisplayLayout_requestMarshaller::toJSON(* static_cast<const SetDisplayLayout_request*>(msg));
- if(mt==messageType::response)
- return SetDisplayLayout_responseMarshaller::toJSON(* static_cast<const SetDisplayLayout_response*>(msg));
- return j;
- case FunctionID::SetGlobalPropertiesID:
- if(mt==messageType::request)
- return SetGlobalProperties_requestMarshaller::toJSON(* static_cast<const SetGlobalProperties_request*>(msg));
- if(mt==messageType::response)
- return SetGlobalProperties_responseMarshaller::toJSON(* static_cast<const SetGlobalProperties_response*>(msg));
- return j;
- case FunctionID::SetMediaClockTimerID:
- if(mt==messageType::request)
- return SetMediaClockTimer_requestMarshaller::toJSON(* static_cast<const SetMediaClockTimer_request*>(msg));
- if(mt==messageType::response)
- return SetMediaClockTimer_responseMarshaller::toJSON(* static_cast<const SetMediaClockTimer_response*>(msg));
- return j;
- case FunctionID::ShowID:
- if(mt==messageType::request)
- return Show_requestMarshaller::toJSON(* static_cast<const Show_request*>(msg));
- if(mt==messageType::response)
- return Show_responseMarshaller::toJSON(* static_cast<const Show_response*>(msg));
- return j;
- case FunctionID::ShowConstantTBTID:
- if(mt==messageType::request)
- return ShowConstantTBT_requestMarshaller::toJSON(* static_cast<const ShowConstantTBT_request*>(msg));
- if(mt==messageType::response)
- return ShowConstantTBT_responseMarshaller::toJSON(* static_cast<const ShowConstantTBT_response*>(msg));
- return j;
- case FunctionID::SliderID:
- if(mt==messageType::request)
- return Slider_requestMarshaller::toJSON(* static_cast<const Slider_request*>(msg));
- if(mt==messageType::response)
- return Slider_responseMarshaller::toJSON(* static_cast<const Slider_response*>(msg));
- return j;
- case FunctionID::SpeakID:
- if(mt==messageType::request)
- return Speak_requestMarshaller::toJSON(* static_cast<const Speak_request*>(msg));
- if(mt==messageType::response)
- return Speak_responseMarshaller::toJSON(* static_cast<const Speak_response*>(msg));
- return j;
- case FunctionID::SubscribeButtonID:
- if(mt==messageType::request)
- return SubscribeButton_requestMarshaller::toJSON(* static_cast<const SubscribeButton_request*>(msg));
- if(mt==messageType::response)
- return SubscribeButton_responseMarshaller::toJSON(* static_cast<const SubscribeButton_response*>(msg));
- return j;
- case FunctionID::SubscribeVehicleDataID:
- if(mt==messageType::request)
- return SubscribeVehicleData_requestMarshaller::toJSON(* static_cast<const SubscribeVehicleData_request*>(msg));
- if(mt==messageType::response)
- return SubscribeVehicleData_responseMarshaller::toJSON(* static_cast<const SubscribeVehicleData_response*>(msg));
- return j;
- case FunctionID::UnregisterAppInterfaceID:
- if(mt==messageType::request)
- return UnregisterAppInterface_requestMarshaller::toJSON(* static_cast<const UnregisterAppInterface_request*>(msg));
- if(mt==messageType::response)
- return UnregisterAppInterface_responseMarshaller::toJSON(* static_cast<const UnregisterAppInterface_response*>(msg));
- return j;
- case FunctionID::UnsubscribeButtonID:
- if(mt==messageType::request)
- return UnsubscribeButton_requestMarshaller::toJSON(* static_cast<const UnsubscribeButton_request*>(msg));
- if(mt==messageType::response)
- return UnsubscribeButton_responseMarshaller::toJSON(* static_cast<const UnsubscribeButton_response*>(msg));
- return j;
- case FunctionID::UnsubscribeVehicleDataID:
- if(mt==messageType::request)
- return UnsubscribeVehicleData_requestMarshaller::toJSON(* static_cast<const UnsubscribeVehicleData_request*>(msg));
- if(mt==messageType::response)
- return UnsubscribeVehicleData_responseMarshaller::toJSON(* static_cast<const UnsubscribeVehicleData_response*>(msg));
- return j;
- case FunctionID::UpdateTurnListID:
- if(mt==messageType::request)
- return UpdateTurnList_requestMarshaller::toJSON(* static_cast<const UpdateTurnList_request*>(msg));
- if(mt==messageType::response)
- return UpdateTurnList_responseMarshaller::toJSON(* static_cast<const UpdateTurnList_response*>(msg));
- return j;
- default:;
- }
- return j;
-}
-
-RegisterAppInterface_requestMarshaller Marshaller::mRegisterAppInterface_request;
-RegisterAppInterface_responseMarshaller Marshaller::mRegisterAppInterface_response;
-UnregisterAppInterface_requestMarshaller Marshaller::mUnregisterAppInterface_request;
-UnregisterAppInterface_responseMarshaller Marshaller::mUnregisterAppInterface_response;
-SetGlobalProperties_requestMarshaller Marshaller::mSetGlobalProperties_request;
-SetGlobalProperties_responseMarshaller Marshaller::mSetGlobalProperties_response;
-ResetGlobalProperties_requestMarshaller Marshaller::mResetGlobalProperties_request;
-ResetGlobalProperties_responseMarshaller Marshaller::mResetGlobalProperties_response;
-AddCommand_requestMarshaller Marshaller::mAddCommand_request;
-AddCommand_responseMarshaller Marshaller::mAddCommand_response;
-DeleteCommand_requestMarshaller Marshaller::mDeleteCommand_request;
-DeleteCommand_responseMarshaller Marshaller::mDeleteCommand_response;
-AddSubMenu_requestMarshaller Marshaller::mAddSubMenu_request;
-AddSubMenu_responseMarshaller Marshaller::mAddSubMenu_response;
-DeleteSubMenu_requestMarshaller Marshaller::mDeleteSubMenu_request;
-DeleteSubMenu_responseMarshaller Marshaller::mDeleteSubMenu_response;
-CreateInteractionChoiceSet_requestMarshaller Marshaller::mCreateInteractionChoiceSet_request;
-CreateInteractionChoiceSet_responseMarshaller Marshaller::mCreateInteractionChoiceSet_response;
-PerformInteraction_requestMarshaller Marshaller::mPerformInteraction_request;
-PerformInteraction_responseMarshaller Marshaller::mPerformInteraction_response;
-DeleteInteractionChoiceSet_requestMarshaller Marshaller::mDeleteInteractionChoiceSet_request;
-DeleteInteractionChoiceSet_responseMarshaller Marshaller::mDeleteInteractionChoiceSet_response;
-Alert_requestMarshaller Marshaller::mAlert_request;
-Alert_responseMarshaller Marshaller::mAlert_response;
-Show_requestMarshaller Marshaller::mShow_request;
-Show_responseMarshaller Marshaller::mShow_response;
-Speak_requestMarshaller Marshaller::mSpeak_request;
-Speak_responseMarshaller Marshaller::mSpeak_response;
-SetMediaClockTimer_requestMarshaller Marshaller::mSetMediaClockTimer_request;
-SetMediaClockTimer_responseMarshaller Marshaller::mSetMediaClockTimer_response;
-EncodedSyncPData_requestMarshaller Marshaller::mEncodedSyncPData_request;
-EncodedSyncPData_responseMarshaller Marshaller::mEncodedSyncPData_response;
-DialNumber_requestMarshaller Marshaller::mDialNumber_request;
-DialNumber_responseMarshaller Marshaller::mDialNumber_response;
-PerformAudioPassThru_requestMarshaller Marshaller::mPerformAudioPassThru_request;
-PerformAudioPassThru_responseMarshaller Marshaller::mPerformAudioPassThru_response;
-EndAudioPassThru_requestMarshaller Marshaller::mEndAudioPassThru_request;
-EndAudioPassThru_responseMarshaller Marshaller::mEndAudioPassThru_response;
-SubscribeButton_requestMarshaller Marshaller::mSubscribeButton_request;
-SubscribeButton_responseMarshaller Marshaller::mSubscribeButton_response;
-UnsubscribeButton_requestMarshaller Marshaller::mUnsubscribeButton_request;
-UnsubscribeButton_responseMarshaller Marshaller::mUnsubscribeButton_response;
-SubscribeVehicleData_requestMarshaller Marshaller::mSubscribeVehicleData_request;
-SubscribeVehicleData_responseMarshaller Marshaller::mSubscribeVehicleData_response;
-UnsubscribeVehicleData_requestMarshaller Marshaller::mUnsubscribeVehicleData_request;
-UnsubscribeVehicleData_responseMarshaller Marshaller::mUnsubscribeVehicleData_response;
-GetVehicleData_requestMarshaller Marshaller::mGetVehicleData_request;
-GetVehicleData_responseMarshaller Marshaller::mGetVehicleData_response;
-ReadDID_requestMarshaller Marshaller::mReadDID_request;
-ReadDID_responseMarshaller Marshaller::mReadDID_response;
-GetDTCs_requestMarshaller Marshaller::mGetDTCs_request;
-GetDTCs_responseMarshaller Marshaller::mGetDTCs_response;
-ScrollableMessage_requestMarshaller Marshaller::mScrollableMessage_request;
-ScrollableMessage_responseMarshaller Marshaller::mScrollableMessage_response;
-Slider_requestMarshaller Marshaller::mSlider_request;
-Slider_responseMarshaller Marshaller::mSlider_response;
-ShowConstantTBT_requestMarshaller Marshaller::mShowConstantTBT_request;
-ShowConstantTBT_responseMarshaller Marshaller::mShowConstantTBT_response;
-AlertManeuver_requestMarshaller Marshaller::mAlertManeuver_request;
-AlertManeuver_responseMarshaller Marshaller::mAlertManeuver_response;
-UpdateTurnList_requestMarshaller Marshaller::mUpdateTurnList_request;
-UpdateTurnList_responseMarshaller Marshaller::mUpdateTurnList_response;
-ChangeRegistration_requestMarshaller Marshaller::mChangeRegistration_request;
-ChangeRegistration_responseMarshaller Marshaller::mChangeRegistration_response;
-GenericResponse_responseMarshaller Marshaller::mGenericResponse_response;
-PutFile_requestMarshaller Marshaller::mPutFile_request;
-PutFile_responseMarshaller Marshaller::mPutFile_response;
-DeleteFile_requestMarshaller Marshaller::mDeleteFile_request;
-DeleteFile_responseMarshaller Marshaller::mDeleteFile_response;
-ListFiles_requestMarshaller Marshaller::mListFiles_request;
-ListFiles_responseMarshaller Marshaller::mListFiles_response;
-SetAppIcon_requestMarshaller Marshaller::mSetAppIcon_request;
-SetAppIcon_responseMarshaller Marshaller::mSetAppIcon_response;
-SetDisplayLayout_requestMarshaller Marshaller::mSetDisplayLayout_request;
-SetDisplayLayout_responseMarshaller Marshaller::mSetDisplayLayout_response;
-OnHMIStatusMarshaller Marshaller::mOnHMIStatus;
-OnAppInterfaceUnregisteredMarshaller Marshaller::mOnAppInterfaceUnregistered;
-OnButtonEventMarshaller Marshaller::mOnButtonEvent;
-OnButtonPressMarshaller Marshaller::mOnButtonPress;
-OnVehicleDataMarshaller Marshaller::mOnVehicleData;
-OnCommandMarshaller Marshaller::mOnCommand;
-OnEncodedSyncPDataMarshaller Marshaller::mOnEncodedSyncPData;
-OnTBTClientStateMarshaller Marshaller::mOnTBTClientState;
-OnDriverDistractionMarshaller Marshaller::mOnDriverDistraction;
-OnPermissionsChangeMarshaller Marshaller::mOnPermissionsChange;
-OnAudioPassThruMarshaller Marshaller::mOnAudioPassThru;
-OnLanguageChangeMarshaller Marshaller::mOnLanguageChange;
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp
deleted file mode 100644
index 1f8c9b40d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h"
-#include "MediaClockFormatMarshaller.h"
-#include "MediaClockFormatMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const MediaClockFormat::MediaClockFormatInternal MediaClockFormatMarshaller::getIndex(const char* s)
-{
- if(!s)
- return MediaClockFormat::INVALID_ENUM;
- const struct PerfectHashTable* p=MediaClockFormat_intHash::getPointer(s,strlen(s));
- return p ? static_cast<MediaClockFormat::MediaClockFormatInternal>(p->idx) : MediaClockFormat::INVALID_ENUM;
-}
-
-
-bool MediaClockFormatMarshaller::fromJSON(const Json::Value& s,MediaClockFormat& e)
-{
- e.mInternal=MediaClockFormat::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=MediaClockFormat::INVALID_ENUM);
-}
-
-
-Json::Value MediaClockFormatMarshaller::toJSON(const MediaClockFormat& e)
-{
- if(e.mInternal==MediaClockFormat::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool MediaClockFormatMarshaller::fromString(const std::string& s,MediaClockFormat& e)
-{
- e.mInternal=MediaClockFormat::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string MediaClockFormatMarshaller::toString(const MediaClockFormat& e)
-{
- Json::FastWriter writer;
- return e.mInternal==MediaClockFormat::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable MediaClockFormatMarshaller::mHashTable[5]=
-{
- {"CLOCK1",0},
- {"CLOCK2",1},
- {"CLOCKTEXT1",2},
- {"CLOCKTEXT2",3},
- {"CLOCKTEXT3",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp
deleted file mode 100644
index f3b9383c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name MediaClockFormat_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-CLOCK1,0
-CLOCK2,1
-CLOCKTEXT1,2
-CLOCKTEXT2,3
-CLOCKTEXT3,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h
deleted file mode 100644
index 1f3ccd36b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_MEDIACLOCKFORMATMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_MEDIACLOCKFORMATMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for MediaClockFormat
-
- class MediaClockFormatMarshaller
- {
- public:
-
- static std::string toName(const MediaClockFormat& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(MediaClockFormat& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=MediaClockFormat::INVALID_ENUM;
- }
-
- static bool checkIntegrity(MediaClockFormat& e) { return e.mInternal!=MediaClockFormat::INVALID_ENUM; }
- static bool checkIntegrityConst(const MediaClockFormat& e) { return e.mInternal!=MediaClockFormat::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,MediaClockFormat& e);
- static const std::string toString(const MediaClockFormat& e);
-
- static bool fromJSON(const Json::Value& s,MediaClockFormat& e);
- static Json::Value toJSON(const MediaClockFormat& e);
-
- static const char* getName(MediaClockFormat::MediaClockFormatInternal e)
- {
- return (e>=0 && e<5) ? mHashTable[e].name : NULL;
- }
-
- static const MediaClockFormat::MediaClockFormatInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[5];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc
deleted file mode 100644
index 579404325..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp */
-/* Computed positions: -k'$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 15
-/* maximum key range = 10, duplicates = 0 */
-
-class MediaClockFormat_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-MediaClockFormat_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 5,
- 0, 2, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16
- };
- return len + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-MediaClockFormat_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 10, 6, 10, 0,
- 0, 10
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
- {"CLOCK2",1},
- {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
- {"CLOCKTEXT2",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
- {"CLOCK1",0},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
- {"CLOCKTEXT3",4},
- {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
- {"CLOCKTEXT1",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp
deleted file mode 100644
index e6094516b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-#include "MenuParamsMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-MenuParams& MenuParams::operator =(const MenuParams& c)
-{
- menuName=c.menuName;
- parentID=c.parentID ? new unsigned int(c.parentID[0]) : 0;
- position=c.position ? new unsigned int(c.position[0]) : 0;
-
- return *this;
-}
-
-
-MenuParams::~MenuParams(void)
-{
- if(parentID)
- delete parentID;
- if(position)
- delete position;
-}
-
-
-MenuParams::MenuParams(const MenuParams& c)
-{
- *this=c;
-}
-
-
-bool MenuParams::checkIntegrity(void)
-{
- return MenuParamsMarshaller::checkIntegrity(*this);
-}
-
-
-MenuParams::MenuParams(void) :
- parentID(0),
- position(0)
-{
-}
-
-
-
-bool MenuParams::set_menuName(const std::string& menuName_)
-{
- if(menuName_.length()>500) return false;
- menuName=menuName_;
- return true;
-}
-
-bool MenuParams::set_parentID(unsigned int parentID_)
-{
- if(parentID_>2000000000) return false;
- delete parentID;
- parentID=0;
-
- parentID=new unsigned int(parentID_);
- return true;
-}
-
-void MenuParams::reset_parentID(void)
-{
- if(parentID)
- delete parentID;
- parentID=0;
-}
-
-bool MenuParams::set_position(unsigned int position_)
-{
- if(position_>1000) return false;
- delete position;
- position=0;
-
- position=new unsigned int(position_);
- return true;
-}
-
-void MenuParams::reset_position(void)
-{
- if(position)
- delete position;
- position=0;
-}
-
-
-
-
-const std::string& MenuParams::get_menuName(void) const
-{
- return menuName;
-}
-
-
-const unsigned int* MenuParams::get_parentID(void) const
-{
- return parentID;
-}
-
-
-const unsigned int* MenuParams::get_position(void) const
-{
- return position;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp
deleted file mode 100644
index 7e9e24218..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-
-
-#include "MenuParamsMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool MenuParamsMarshaller::checkIntegrity(MenuParams& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool MenuParamsMarshaller::fromString(const std::string& s,MenuParams& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string MenuParamsMarshaller::toString(const MenuParams& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool MenuParamsMarshaller::checkIntegrityConst(const MenuParams& s)
-{
- if(s.menuName.length()>500) return false;
- if(s.parentID && *s.parentID>2000000000) return false;
- if(s.position && *s.position>1000) return false;
- return true;
-}
-
-Json::Value MenuParamsMarshaller::toJSON(const MenuParams& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["menuName"]=Json::Value(e.menuName);
-
- if(e.parentID)
- json["parentID"]=Json::Value(*e.parentID);
-
- if(e.position)
- json["position"]=Json::Value(*e.position);
-
-
- return json;
-}
-
-
-bool MenuParamsMarshaller::fromJSON(const Json::Value& json,MenuParams& c)
-{
- if(c.parentID) delete c.parentID;
- c.parentID=0;
-
- if(c.position) delete c.position;
- c.position=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("menuName")) return false;
- {
- const Json::Value& j=json["menuName"];
- if(!j.isString()) return false;
- c.menuName=j.asString();
- }
- if(json.isMember("parentID"))
- {
- const Json::Value& j=json["parentID"];
- if(!j.isInt()) return false;
- c.parentID=new unsigned int(j.asInt());
- }
- if(json.isMember("position"))
- {
- const Json::Value& j=json["position"];
- if(!j.isInt()) return false;
- c.position=new unsigned int(j.asInt());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h
deleted file mode 100644
index f25ab627c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_MENUPARAMSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_MENUPARAMSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct MenuParamsMarshaller
- {
- static bool checkIntegrity(MenuParams& e);
- static bool checkIntegrityConst(const MenuParams& e);
-
- static bool fromString(const std::string& s,MenuParams& e);
- static const std::string toString(const MenuParams& e);
-
- static bool fromJSON(const Json::Value& s,MenuParams& e);
- static Json::Value toJSON(const MenuParams& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp
deleted file mode 100644
index cea50c4bb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-#include "OnAppInterfaceUnregisteredMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnAppInterfaceUnregistered::~OnAppInterfaceUnregistered(void)
-{
-}
-
-
-OnAppInterfaceUnregistered::OnAppInterfaceUnregistered(const OnAppInterfaceUnregistered& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnAppInterfaceUnregistered::checkIntegrity(void)
-{
- return OnAppInterfaceUnregisteredMarshaller::checkIntegrity(*this);
-}
-
-
-OnAppInterfaceUnregistered::OnAppInterfaceUnregistered(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnAppInterfaceUnregistered::set_reason(const AppInterfaceUnregisteredReason& reason_)
-{
- if(!AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(reason_)) return false;
- reason=reason_;
- return true;
-}
-
-
-
-
-const AppInterfaceUnregisteredReason& OnAppInterfaceUnregistered::get_reason(void) const
-{
- return reason;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp
deleted file mode 100644
index 8a3071d80..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-
-#include "OnAppInterfaceUnregisteredMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnAppInterfaceUnregisteredMarshaller::checkIntegrity(OnAppInterfaceUnregistered& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::fromString(const std::string& s,OnAppInterfaceUnregistered& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnAppInterfaceUnregisteredMarshaller::toString(const OnAppInterfaceUnregistered& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::checkIntegrityConst(const OnAppInterfaceUnregistered& s)
-{
- if(!AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(s.reason)) return false;
- return true;
-}
-
-Json::Value OnAppInterfaceUnregisteredMarshaller::toJSON(const OnAppInterfaceUnregistered& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["reason"]=AppInterfaceUnregisteredReasonMarshaller::toJSON(e.reason);
-
- return json;
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::fromJSON(const Json::Value& json,OnAppInterfaceUnregistered& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("reason")) return false;
- {
- const Json::Value& j=json["reason"];
- if(!AppInterfaceUnregisteredReasonMarshaller::fromJSON(j,c.reason))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h
deleted file mode 100644
index e249146ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONAPPINTERFACEUNREGISTEREDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONAPPINTERFACEUNREGISTEREDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnAppInterfaceUnregisteredMarshaller
- {
- static bool checkIntegrity(OnAppInterfaceUnregistered& e);
- static bool checkIntegrityConst(const OnAppInterfaceUnregistered& e);
-
- static bool fromString(const std::string& s,OnAppInterfaceUnregistered& e);
- static const std::string toString(const OnAppInterfaceUnregistered& e);
-
- static bool fromJSON(const Json::Value& s,OnAppInterfaceUnregistered& e);
- static Json::Value toJSON(const OnAppInterfaceUnregistered& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp
deleted file mode 100644
index 6592ccec9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-#include "OnAudioPassThruMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnAudioPassThru::~OnAudioPassThru(void)
-{
-}
-
-
-OnAudioPassThru::OnAudioPassThru(const OnAudioPassThru& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnAudioPassThru::checkIntegrity(void)
-{
- return OnAudioPassThruMarshaller::checkIntegrity(*this);
-}
-
-
-OnAudioPassThru::OnAudioPassThru(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp
deleted file mode 100644
index b823dc0db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-
-
-#include "OnAudioPassThruMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnAudioPassThruMarshaller::checkIntegrity(OnAudioPassThru& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnAudioPassThruMarshaller::fromString(const std::string& s,OnAudioPassThru& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnAudioPassThruMarshaller::toString(const OnAudioPassThru& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAudioPassThruMarshaller::checkIntegrityConst(const OnAudioPassThru& s)
-{
- return true;
-}
-
-Json::Value OnAudioPassThruMarshaller::toJSON(const OnAudioPassThru& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- return json=Json::Value(Json::nullValue);
-}
-
-
-bool OnAudioPassThruMarshaller::fromJSON(const Json::Value& json,OnAudioPassThru& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h
deleted file mode 100644
index 3b69417f0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONAUDIOPASSTHRUMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONAUDIOPASSTHRUMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnAudioPassThruMarshaller
- {
- static bool checkIntegrity(OnAudioPassThru& e);
- static bool checkIntegrityConst(const OnAudioPassThru& e);
-
- static bool fromString(const std::string& s,OnAudioPassThru& e);
- static const std::string toString(const OnAudioPassThru& e);
-
- static bool fromJSON(const Json::Value& s,OnAudioPassThru& e);
- static Json::Value toJSON(const OnAudioPassThru& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp
deleted file mode 100644
index 5dd2436a2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-#include "OnButtonEventMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnButtonEvent::~OnButtonEvent(void)
-{
-}
-
-
-OnButtonEvent::OnButtonEvent(const OnButtonEvent& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnButtonEvent::checkIntegrity(void)
-{
- return OnButtonEventMarshaller::checkIntegrity(*this);
-}
-
-
-OnButtonEvent::OnButtonEvent(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnButtonEvent::set_buttonName(const ButtonName& buttonName_)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_)) return false;
- buttonName=buttonName_;
- return true;
-}
-
-bool OnButtonEvent::set_buttonEventMode(const ButtonEventMode& buttonEventMode_)
-{
- if(!ButtonEventModeMarshaller::checkIntegrityConst(buttonEventMode_)) return false;
- buttonEventMode=buttonEventMode_;
- return true;
-}
-
-bool OnButtonEvent::set_customButtonID(unsigned int customButtonID_)
-{
- if(customButtonID_>65536) return false;
- customButtonID=customButtonID_;
- return true;
-}
-
-
-
-
-const ButtonName& OnButtonEvent::get_buttonName(void) const
-{
- return buttonName;
-}
-
-const ButtonEventMode& OnButtonEvent::get_buttonEventMode(void) const
-{
- return buttonEventMode;
-}
-
-unsigned int OnButtonEvent::get_customButtonID(void) const
-{
- return customButtonID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp
deleted file mode 100644
index ecf9f5c94..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#include "OnButtonEventMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnButtonEventMarshaller::checkIntegrity(OnButtonEvent& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnButtonEventMarshaller::fromString(const std::string& s,OnButtonEvent& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnButtonEventMarshaller::toString(const OnButtonEvent& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonEventMarshaller::checkIntegrityConst(const OnButtonEvent& s)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName)) return false;
- if(!ButtonEventModeMarshaller::checkIntegrityConst(s.buttonEventMode)) return false;
- if(s.customButtonID>65536) return false;
- return true;
-}
-
-Json::Value OnButtonEventMarshaller::toJSON(const OnButtonEvent& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
- json["buttonEventMode"]=ButtonEventModeMarshaller::toJSON(e.buttonEventMode);
-
- json["customButtonID"]=Json::Value(e.customButtonID);
-
- return json;
-}
-
-
-bool OnButtonEventMarshaller::fromJSON(const Json::Value& json,OnButtonEvent& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("buttonName")) return false;
- {
- const Json::Value& j=json["buttonName"];
- if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
- return false;
- }
- if(!json.isMember("buttonEventMode")) return false;
- {
- const Json::Value& j=json["buttonEventMode"];
- if(!ButtonEventModeMarshaller::fromJSON(j,c.buttonEventMode))
- return false;
- }
- if(!json.isMember("customButtonID")) return false;
- {
- const Json::Value& j=json["customButtonID"];
- if(!j.isInt()) return false;
- c.customButtonID=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h
deleted file mode 100644
index f3df6184d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONBUTTONEVENTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONBUTTONEVENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnButtonEventMarshaller
- {
- static bool checkIntegrity(OnButtonEvent& e);
- static bool checkIntegrityConst(const OnButtonEvent& e);
-
- static bool fromString(const std::string& s,OnButtonEvent& e);
- static const std::string toString(const OnButtonEvent& e);
-
- static bool fromJSON(const Json::Value& s,OnButtonEvent& e);
- static Json::Value toJSON(const OnButtonEvent& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp
deleted file mode 100644
index 47be4f7bb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-#include "OnButtonPressMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonPressModeMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnButtonPress::~OnButtonPress(void)
-{
-}
-
-
-OnButtonPress::OnButtonPress(const OnButtonPress& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnButtonPress::checkIntegrity(void)
-{
- return OnButtonPressMarshaller::checkIntegrity(*this);
-}
-
-
-OnButtonPress::OnButtonPress(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnButtonPress::set_buttonName(const ButtonName& buttonName_)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_)) return false;
- buttonName=buttonName_;
- return true;
-}
-
-bool OnButtonPress::set_buttonPressMode(const ButtonPressMode& buttonPressMode_)
-{
- if(!ButtonPressModeMarshaller::checkIntegrityConst(buttonPressMode_)) return false;
- buttonPressMode=buttonPressMode_;
- return true;
-}
-
-bool OnButtonPress::set_customButtonID(unsigned int customButtonID_)
-{
- if(customButtonID_>65536) return false;
- customButtonID=customButtonID_;
- return true;
-}
-
-
-
-
-const ButtonName& OnButtonPress::get_buttonName(void) const
-{
- return buttonName;
-}
-
-const ButtonPressMode& OnButtonPress::get_buttonPressMode(void) const
-{
- return buttonPressMode;
-}
-
-unsigned int OnButtonPress::get_customButtonID(void) const
-{
- return customButtonID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp
deleted file mode 100644
index db7ec8a55..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonPressModeMarshaller.h"
-
-#include "OnButtonPressMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnButtonPressMarshaller::checkIntegrity(OnButtonPress& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnButtonPressMarshaller::fromString(const std::string& s,OnButtonPress& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnButtonPressMarshaller::toString(const OnButtonPress& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonPressMarshaller::checkIntegrityConst(const OnButtonPress& s)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName)) return false;
- if(!ButtonPressModeMarshaller::checkIntegrityConst(s.buttonPressMode)) return false;
- if(s.customButtonID>65536) return false;
- return true;
-}
-
-Json::Value OnButtonPressMarshaller::toJSON(const OnButtonPress& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
- json["buttonPressMode"]=ButtonPressModeMarshaller::toJSON(e.buttonPressMode);
-
- json["customButtonID"]=Json::Value(e.customButtonID);
-
- return json;
-}
-
-
-bool OnButtonPressMarshaller::fromJSON(const Json::Value& json,OnButtonPress& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("buttonName")) return false;
- {
- const Json::Value& j=json["buttonName"];
- if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
- return false;
- }
- if(!json.isMember("buttonPressMode")) return false;
- {
- const Json::Value& j=json["buttonPressMode"];
- if(!ButtonPressModeMarshaller::fromJSON(j,c.buttonPressMode))
- return false;
- }
- if(!json.isMember("customButtonID")) return false;
- {
- const Json::Value& j=json["customButtonID"];
- if(!j.isInt()) return false;
- c.customButtonID=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h
deleted file mode 100644
index a78cfcf32..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONBUTTONPRESSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONBUTTONPRESSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnButtonPressMarshaller
- {
- static bool checkIntegrity(OnButtonPress& e);
- static bool checkIntegrityConst(const OnButtonPress& e);
-
- static bool fromString(const std::string& s,OnButtonPress& e);
- static const std::string toString(const OnButtonPress& e);
-
- static bool fromJSON(const Json::Value& s,OnButtonPress& e);
- static Json::Value toJSON(const OnButtonPress& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp
deleted file mode 100644
index 9852c0b48..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-#include "OnCommandMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnCommand::~OnCommand(void)
-{
-}
-
-
-OnCommand::OnCommand(const OnCommand& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnCommand::checkIntegrity(void)
-{
- return OnCommandMarshaller::checkIntegrity(*this);
-}
-
-
-OnCommand::OnCommand(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnCommand::set_cmdID(unsigned int cmdID_)
-{
- if(cmdID_>2000000000) return false;
- cmdID=cmdID_;
- return true;
-}
-
-bool OnCommand::set_triggerSource(const TriggerSource& triggerSource_)
-{
- if(!TriggerSourceMarshaller::checkIntegrityConst(triggerSource_)) return false;
- triggerSource=triggerSource_;
- return true;
-}
-
-
-
-
-unsigned int OnCommand::get_cmdID(void) const
-{
- return cmdID;
-}
-
-const TriggerSource& OnCommand::get_triggerSource(void) const
-{
- return triggerSource;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp
deleted file mode 100644
index b255a9132..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-#include "TriggerSourceMarshaller.h"
-
-#include "OnCommandMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnCommandMarshaller::checkIntegrity(OnCommand& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnCommandMarshaller::fromString(const std::string& s,OnCommand& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnCommandMarshaller::toString(const OnCommand& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnCommandMarshaller::checkIntegrityConst(const OnCommand& s)
-{
- if(s.cmdID>2000000000) return false;
- if(!TriggerSourceMarshaller::checkIntegrityConst(s.triggerSource)) return false;
- return true;
-}
-
-Json::Value OnCommandMarshaller::toJSON(const OnCommand& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["cmdID"]=Json::Value(e.cmdID);
-
- json["triggerSource"]=TriggerSourceMarshaller::toJSON(e.triggerSource);
-
- return json;
-}
-
-
-bool OnCommandMarshaller::fromJSON(const Json::Value& json,OnCommand& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("cmdID")) return false;
- {
- const Json::Value& j=json["cmdID"];
- if(!j.isInt()) return false;
- c.cmdID=j.asInt();
- }
- if(!json.isMember("triggerSource")) return false;
- {
- const Json::Value& j=json["triggerSource"];
- if(!TriggerSourceMarshaller::fromJSON(j,c.triggerSource))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h
deleted file mode 100644
index 5a2194b76..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONCOMMANDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnCommandMarshaller
- {
- static bool checkIntegrity(OnCommand& e);
- static bool checkIntegrityConst(const OnCommand& e);
-
- static bool fromString(const std::string& s,OnCommand& e);
- static const std::string toString(const OnCommand& e);
-
- static bool fromJSON(const Json::Value& s,OnCommand& e);
- static Json::Value toJSON(const OnCommand& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp
deleted file mode 100644
index afe6af9f3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-#include "OnDriverDistractionMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "DriverDistractionStateMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnDriverDistraction::~OnDriverDistraction(void)
-{
-}
-
-
-OnDriverDistraction::OnDriverDistraction(const OnDriverDistraction& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnDriverDistraction::checkIntegrity(void)
-{
- return OnDriverDistractionMarshaller::checkIntegrity(*this);
-}
-
-
-OnDriverDistraction::OnDriverDistraction(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnDriverDistraction::set_state(const DriverDistractionState& state_)
-{
- if(!DriverDistractionStateMarshaller::checkIntegrityConst(state_)) return false;
- state=state_;
- return true;
-}
-
-
-
-
-const DriverDistractionState& OnDriverDistraction::get_state(void) const
-{
- return state;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp
deleted file mode 100644
index bc70d7ab4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-#include "DriverDistractionStateMarshaller.h"
-
-#include "OnDriverDistractionMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnDriverDistractionMarshaller::checkIntegrity(OnDriverDistraction& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnDriverDistractionMarshaller::fromString(const std::string& s,OnDriverDistraction& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnDriverDistractionMarshaller::toString(const OnDriverDistraction& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnDriverDistractionMarshaller::checkIntegrityConst(const OnDriverDistraction& s)
-{
- if(!DriverDistractionStateMarshaller::checkIntegrityConst(s.state)) return false;
- return true;
-}
-
-Json::Value OnDriverDistractionMarshaller::toJSON(const OnDriverDistraction& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["state"]=DriverDistractionStateMarshaller::toJSON(e.state);
-
- return json;
-}
-
-
-bool OnDriverDistractionMarshaller::fromJSON(const Json::Value& json,OnDriverDistraction& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("state")) return false;
- {
- const Json::Value& j=json["state"];
- if(!DriverDistractionStateMarshaller::fromJSON(j,c.state))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h
deleted file mode 100644
index c5995e904..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnDriverDistractionMarshaller
- {
- static bool checkIntegrity(OnDriverDistraction& e);
- static bool checkIntegrityConst(const OnDriverDistraction& e);
-
- static bool fromString(const std::string& s,OnDriverDistraction& e);
- static const std::string toString(const OnDriverDistraction& e);
-
- static bool fromJSON(const Json::Value& s,OnDriverDistraction& e);
- static Json::Value toJSON(const OnDriverDistraction& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp
deleted file mode 100644
index fdecaad45..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-#include "OnEncodedSyncPDataMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-OnEncodedSyncPData& OnEncodedSyncPData::operator =(const OnEncodedSyncPData& c)
-{
- data= c.data;
- URL= c.URL ? new std::string(c.URL[0]) : 0;
- Timeout= c.Timeout ? new int(c.Timeout[0]) : 0;
-
- return *this;
-}
-
-
-OnEncodedSyncPData::~OnEncodedSyncPData(void)
-{
- if(URL)
- delete URL;
- if(Timeout)
- delete Timeout;
-}
-
-
-OnEncodedSyncPData::OnEncodedSyncPData(const OnEncodedSyncPData& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnEncodedSyncPData::checkIntegrity(void)
-{
- return OnEncodedSyncPDataMarshaller::checkIntegrity(*this);
-}
-
-
-OnEncodedSyncPData::OnEncodedSyncPData(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- URL(0),
- Timeout(0)
-{
-}
-
-
-
-bool OnEncodedSyncPData::set_data(const std::vector<std::string>& data_)
-{
- unsigned int i=data_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(data_[i].length()>10000) return false;
- }
- data=data_;
- return true;
-}
-
-bool OnEncodedSyncPData::set_URL(const std::string& URL_)
-{
- if(URL_.length()>1000) return false;
- delete URL;
- URL=0;
-
- URL=new std::string(URL_);
- return true;
-}
-
-void OnEncodedSyncPData::reset_URL(void)
-{
- if(URL)
- delete URL;
- URL=0;
-}
-
-bool OnEncodedSyncPData::set_Timeout(int Timeout_)
-{
- if(Timeout_>2000000000) return false;
- delete Timeout;
- Timeout=0;
-
- Timeout=new int(Timeout_);
- return true;
-}
-
-void OnEncodedSyncPData::reset_Timeout(void)
-{
- if(Timeout)
- delete Timeout;
- Timeout=0;
-}
-
-
-
-
-const std::vector<std::string>& OnEncodedSyncPData::get_data(void) const
-{
- return data;
-}
-
-const std::string* OnEncodedSyncPData::get_URL(void) const
-{
- return URL;
-}
-
-const int* OnEncodedSyncPData::get_Timeout(void) const
-{
- return Timeout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp
deleted file mode 100644
index 47003bc2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-
-
-#include "OnEncodedSyncPDataMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnEncodedSyncPDataMarshaller::checkIntegrity(OnEncodedSyncPData& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnEncodedSyncPDataMarshaller::fromString(const std::string& s,OnEncodedSyncPData& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnEncodedSyncPDataMarshaller::toString(const OnEncodedSyncPData& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnEncodedSyncPDataMarshaller::checkIntegrityConst(const OnEncodedSyncPData& s)
-{
- {
- unsigned int i=s.data.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.data[i].length()>10000) return false;
- }
- }
- if(s.URL && s.URL->length()>1000) return false;
- if(s.Timeout && *s.Timeout>2000000000) return false;
- if(s.Timeout && *s.Timeout<-2000000000) return false;
- return true;
-}
-
-Json::Value OnEncodedSyncPDataMarshaller::toJSON(const OnEncodedSyncPData& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["data"]=Json::Value(Json::arrayValue);
- json["data"].resize(e.data.size());
- for(unsigned int i=0;i<e.data.size();i++)
- json["data"][i]=Json::Value(e.data[i]);
-
- if(e.URL)
- json["URL"]=Json::Value(*e.URL);
-
- if(e.Timeout)
- json["Timeout"]=Json::Value(*e.Timeout);
-
- return json;
-}
-
-
-bool OnEncodedSyncPDataMarshaller::fromJSON(const Json::Value& json,OnEncodedSyncPData& c)
-{
- if(c.URL) delete c.URL;
- c.URL=0;
-
- if(c.Timeout) delete c.Timeout;
- c.Timeout=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("data")) return false;
- {
- const Json::Value& j=json["data"];
- if(!j.isArray()) return false;
- c.data.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.data[i]=j[i].asString();
- }
- if(json.isMember("URL"))
- {
- const Json::Value& j=json["URL"];
- if(!j.isString()) return false;
- c.URL=new std::string(j.asString());
- }
- if(json.isMember("Timeout"))
- {
- const Json::Value& j=json["Timeout"];
- if(!j.isInt()) return false;
- c.Timeout=new int(j.asInt());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h
deleted file mode 100644
index 34723a4be..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONENCODEDSYNCPDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONENCODEDSYNCPDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnEncodedSyncPDataMarshaller
- {
- static bool checkIntegrity(OnEncodedSyncPData& e);
- static bool checkIntegrityConst(const OnEncodedSyncPData& e);
-
- static bool fromString(const std::string& s,OnEncodedSyncPData& e);
- static const std::string toString(const OnEncodedSyncPData& e);
-
- static bool fromJSON(const Json::Value& s,OnEncodedSyncPData& e);
- static Json::Value toJSON(const OnEncodedSyncPData& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp
deleted file mode 100644
index 8179abc2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-#include "OnHMIStatusMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "HMILevelMarshaller.h"
-#include "SystemContextMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnHMIStatus::~OnHMIStatus(void)
-{
-}
-
-
-OnHMIStatus::OnHMIStatus(const OnHMIStatus& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnHMIStatus::checkIntegrity(void)
-{
- return OnHMIStatusMarshaller::checkIntegrity(*this);
-}
-
-
-OnHMIStatus::OnHMIStatus(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnHMIStatus::set_hmiLevel(const HMILevel& hmiLevel_)
-{
- if(!HMILevelMarshaller::checkIntegrityConst(hmiLevel_)) return false;
- hmiLevel=hmiLevel_;
- return true;
-}
-
-bool OnHMIStatus::set_audioStreamingState(const AudioStreamingState& audioStreamingState_)
-{
- if(!AudioStreamingStateMarshaller::checkIntegrityConst(audioStreamingState_)) return false;
- audioStreamingState=audioStreamingState_;
- return true;
-}
-
-bool OnHMIStatus::set_systemContext(const SystemContext& systemContext_)
-{
- if(!SystemContextMarshaller::checkIntegrityConst(systemContext_)) return false;
- systemContext=systemContext_;
- return true;
-}
-
-
-
-
-const HMILevel& OnHMIStatus::get_hmiLevel(void) const
-{
- return hmiLevel;
-}
-
-const AudioStreamingState& OnHMIStatus::get_audioStreamingState(void) const
-{
- return audioStreamingState;
-}
-
-const SystemContext& OnHMIStatus::get_systemContext(void) const
-{
- return systemContext;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp
deleted file mode 100644
index 07a2ad937..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "HMILevelMarshaller.h"
-#include "SystemContextMarshaller.h"
-
-#include "OnHMIStatusMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnHMIStatusMarshaller::checkIntegrity(OnHMIStatus& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnHMIStatusMarshaller::fromString(const std::string& s,OnHMIStatus& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnHMIStatusMarshaller::toString(const OnHMIStatus& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnHMIStatusMarshaller::checkIntegrityConst(const OnHMIStatus& s)
-{
- if(!HMILevelMarshaller::checkIntegrityConst(s.hmiLevel)) return false;
- if(!AudioStreamingStateMarshaller::checkIntegrityConst(s.audioStreamingState)) return false;
- if(!SystemContextMarshaller::checkIntegrityConst(s.systemContext)) return false;
- return true;
-}
-
-Json::Value OnHMIStatusMarshaller::toJSON(const OnHMIStatus& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["hmiLevel"]=HMILevelMarshaller::toJSON(e.hmiLevel);
-
- json["audioStreamingState"]=AudioStreamingStateMarshaller::toJSON(e.audioStreamingState);
-
- json["systemContext"]=SystemContextMarshaller::toJSON(e.systemContext);
-
- return json;
-}
-
-
-bool OnHMIStatusMarshaller::fromJSON(const Json::Value& json,OnHMIStatus& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("hmiLevel")) return false;
- {
- const Json::Value& j=json["hmiLevel"];
- if(!HMILevelMarshaller::fromJSON(j,c.hmiLevel))
- return false;
- }
- if(!json.isMember("audioStreamingState")) return false;
- {
- const Json::Value& j=json["audioStreamingState"];
- if(!AudioStreamingStateMarshaller::fromJSON(j,c.audioStreamingState))
- return false;
- }
- if(!json.isMember("systemContext")) return false;
- {
- const Json::Value& j=json["systemContext"];
- if(!SystemContextMarshaller::fromJSON(j,c.systemContext))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h
deleted file mode 100644
index b174db1c4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONHMISTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONHMISTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnHMIStatusMarshaller
- {
- static bool checkIntegrity(OnHMIStatus& e);
- static bool checkIntegrityConst(const OnHMIStatus& e);
-
- static bool fromString(const std::string& s,OnHMIStatus& e);
- static const std::string toString(const OnHMIStatus& e);
-
- static bool fromJSON(const Json::Value& s,OnHMIStatus& e);
- static Json::Value toJSON(const OnHMIStatus& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp
deleted file mode 100644
index 4a13f9c15..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-#include "OnLanguageChangeMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "LanguageMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnLanguageChange::~OnLanguageChange(void)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(const OnLanguageChange& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnLanguageChange::checkIntegrity(void)
-{
- return OnLanguageChangeMarshaller::checkIntegrity(*this);
-}
-
-
-OnLanguageChange::OnLanguageChange(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnLanguageChange::set_language(const Language& language_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(language_)) return false;
- language=language_;
- return true;
-}
-
-bool OnLanguageChange::set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguage_)) return false;
- hmiDisplayLanguage=hmiDisplayLanguage_;
- return true;
-}
-
-
-
-
-const Language& OnLanguageChange::get_language(void) const
-{
- return language;
-}
-
-const Language& OnLanguageChange::get_hmiDisplayLanguage(void) const
-{
- return hmiDisplayLanguage;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp
deleted file mode 100644
index f75b7fef7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-#include "LanguageMarshaller.h"
-
-#include "OnLanguageChangeMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnLanguageChangeMarshaller::checkIntegrity(OnLanguageChange& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnLanguageChangeMarshaller::fromString(const std::string& s,OnLanguageChange& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnLanguageChangeMarshaller::toString(const OnLanguageChange& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnLanguageChangeMarshaller::checkIntegrityConst(const OnLanguageChange& s)
-{
- if(!LanguageMarshaller::checkIntegrityConst(s.language)) return false;
- if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage)) return false;
- return true;
-}
-
-Json::Value OnLanguageChangeMarshaller::toJSON(const OnLanguageChange& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["language"]=LanguageMarshaller::toJSON(e.language);
-
- json["hmiDisplayLanguage"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguage);
-
- return json;
-}
-
-
-bool OnLanguageChangeMarshaller::fromJSON(const Json::Value& json,OnLanguageChange& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("language")) return false;
- {
- const Json::Value& j=json["language"];
- if(!LanguageMarshaller::fromJSON(j,c.language))
- return false;
- }
- if(!json.isMember("hmiDisplayLanguage")) return false;
- {
- const Json::Value& j=json["hmiDisplayLanguage"];
- if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguage))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h
deleted file mode 100644
index 5b8d17f4c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnLanguageChangeMarshaller
- {
- static bool checkIntegrity(OnLanguageChange& e);
- static bool checkIntegrityConst(const OnLanguageChange& e);
-
- static bool fromString(const std::string& s,OnLanguageChange& e);
- static const std::string toString(const OnLanguageChange& e);
-
- static bool fromJSON(const Json::Value& s,OnLanguageChange& e);
- static Json::Value toJSON(const OnLanguageChange& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp
deleted file mode 100644
index fbe8630d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-#include "OnPermissionsChangeMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "PermissionItemMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnPermissionsChange::~OnPermissionsChange(void)
-{
-}
-
-
-OnPermissionsChange::OnPermissionsChange(const OnPermissionsChange& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnPermissionsChange::checkIntegrity(void)
-{
- return OnPermissionsChangeMarshaller::checkIntegrity(*this);
-}
-
-
-OnPermissionsChange::OnPermissionsChange(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnPermissionsChange::set_permissionItem(const std::vector<PermissionItem>& permissionItem_)
-{
- unsigned int i=permissionItem_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!PermissionItemMarshaller::checkIntegrityConst(permissionItem_[i])) return false;
- }
- permissionItem=permissionItem_;
- return true;
-}
-
-
-
-
-const std::vector<PermissionItem>& OnPermissionsChange::get_permissionItem(void) const
-{
- return permissionItem;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp
deleted file mode 100644
index a6b46460c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-#include "PermissionItemMarshaller.h"
-
-#include "OnPermissionsChangeMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnPermissionsChangeMarshaller::checkIntegrity(OnPermissionsChange& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnPermissionsChangeMarshaller::fromString(const std::string& s,OnPermissionsChange& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnPermissionsChangeMarshaller::toString(const OnPermissionsChange& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnPermissionsChangeMarshaller::checkIntegrityConst(const OnPermissionsChange& s)
-{
- {
- unsigned int i=s.permissionItem.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!PermissionItemMarshaller::checkIntegrityConst(s.permissionItem[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value OnPermissionsChangeMarshaller::toJSON(const OnPermissionsChange& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["permissionItem"]=Json::Value(Json::arrayValue);
- json["permissionItem"].resize(e.permissionItem.size());
- for(unsigned int i=0;i<e.permissionItem.size();i++)
- json["permissionItem"][i]=PermissionItemMarshaller::toJSON(e.permissionItem[i]);
-
- return json;
-}
-
-
-bool OnPermissionsChangeMarshaller::fromJSON(const Json::Value& json,OnPermissionsChange& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("permissionItem")) return false;
- {
- const Json::Value& j=json["permissionItem"];
- if(!j.isArray()) return false;
- c.permissionItem.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- PermissionItem t;
- if(!PermissionItemMarshaller::fromJSON(j[i],t))
- return false;
- c.permissionItem[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h
deleted file mode 100644
index cbe0e7097..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONPERMISSIONSCHANGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONPERMISSIONSCHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnPermissionsChangeMarshaller
- {
- static bool checkIntegrity(OnPermissionsChange& e);
- static bool checkIntegrityConst(const OnPermissionsChange& e);
-
- static bool fromString(const std::string& s,OnPermissionsChange& e);
- static const std::string toString(const OnPermissionsChange& e);
-
- static bool fromJSON(const Json::Value& s,OnPermissionsChange& e);
- static Json::Value toJSON(const OnPermissionsChange& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp
deleted file mode 100644
index 3976b2d43..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-#include "OnTBTClientStateMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TBTStateMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnTBTClientState::~OnTBTClientState(void)
-{
-}
-
-
-OnTBTClientState::OnTBTClientState(const OnTBTClientState& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnTBTClientState::checkIntegrity(void)
-{
- return OnTBTClientStateMarshaller::checkIntegrity(*this);
-}
-
-
-OnTBTClientState::OnTBTClientState(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnTBTClientState::set_state(const TBTState& state_)
-{
- if(!TBTStateMarshaller::checkIntegrityConst(state_)) return false;
- state=state_;
- return true;
-}
-
-
-
-
-const TBTState& OnTBTClientState::get_state(void) const
-{
- return state;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp
deleted file mode 100644
index 54e22fab8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-#include "TBTStateMarshaller.h"
-
-#include "OnTBTClientStateMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnTBTClientStateMarshaller::checkIntegrity(OnTBTClientState& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnTBTClientStateMarshaller::fromString(const std::string& s,OnTBTClientState& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnTBTClientStateMarshaller::toString(const OnTBTClientState& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnTBTClientStateMarshaller::checkIntegrityConst(const OnTBTClientState& s)
-{
- if(!TBTStateMarshaller::checkIntegrityConst(s.state)) return false;
- return true;
-}
-
-Json::Value OnTBTClientStateMarshaller::toJSON(const OnTBTClientState& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["state"]=TBTStateMarshaller::toJSON(e.state);
-
- return json;
-}
-
-
-bool OnTBTClientStateMarshaller::fromJSON(const Json::Value& json,OnTBTClientState& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("state")) return false;
- {
- const Json::Value& j=json["state"];
- if(!TBTStateMarshaller::fromJSON(j,c.state))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h
deleted file mode 100644
index 1e641003b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnTBTClientStateMarshaller
- {
- static bool checkIntegrity(OnTBTClientState& e);
- static bool checkIntegrityConst(const OnTBTClientState& e);
-
- static bool fromString(const std::string& s,OnTBTClientState& e);
- static const std::string toString(const OnTBTClientState& e);
-
- static bool fromJSON(const Json::Value& s,OnTBTClientState& e);
- static Json::Value toJSON(const OnTBTClientState& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp
deleted file mode 100644
index 366a92360..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-#include "OnVehicleDataMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-OnVehicleData& OnVehicleData::operator =(const OnVehicleData& c)
-{
- gps= c.gps ? new GPSData(c.gps[0]) : 0;
- speed= c.speed ? new float(c.speed[0]) : 0;
- rpm= c.rpm ? new unsigned int(c.rpm[0]) : 0;
- fuelLevel= c.fuelLevel ? new float(c.fuelLevel[0]) : 0;
- avgFuelEconomy= c.avgFuelEconomy ? new float(c.avgFuelEconomy[0]) : 0;
- batteryVoltage= c.batteryVoltage ? new float(c.batteryVoltage[0]) : 0;
- externalTemperature= c.externalTemperature ? new float(c.externalTemperature[0]) : 0;
- vin= c.vin ? new std::string(c.vin[0]) : 0;
- prndl= c.prndl ? new PRNDL(c.prndl[0]) : 0;
- tirePressure= c.tirePressure ? new TireStatus(c.tirePressure[0]) : 0;
- batteryPackVoltage= c.batteryPackVoltage ? new float(c.batteryPackVoltage[0]) : 0;
- batteryPackCurrent= c.batteryPackCurrent ? new float(c.batteryPackCurrent[0]) : 0;
- batteryPackTemperature= c.batteryPackTemperature ? new int(c.batteryPackTemperature[0]) : 0;
- engineTorque= c.engineTorque ? new int(c.engineTorque[0]) : 0;
- odometer= c.odometer ? new unsigned int(c.odometer[0]) : 0;
- tripOdometer= c.tripOdometer ? new unsigned int(c.tripOdometer[0]) : 0;
- genericbinary= c.genericbinary ? new std::string(c.genericbinary[0]) : 0;
-
- return *this;
-}
-
-
-OnVehicleData::~OnVehicleData(void)
-{
- if(gps)
- delete gps;
- if(speed)
- delete speed;
- if(rpm)
- delete rpm;
- if(fuelLevel)
- delete fuelLevel;
- if(avgFuelEconomy)
- delete avgFuelEconomy;
- if(batteryVoltage)
- delete batteryVoltage;
- if(externalTemperature)
- delete externalTemperature;
- if(vin)
- delete vin;
- if(prndl)
- delete prndl;
- if(tirePressure)
- delete tirePressure;
- if(batteryPackVoltage)
- delete batteryPackVoltage;
- if(batteryPackCurrent)
- delete batteryPackCurrent;
- if(batteryPackTemperature)
- delete batteryPackTemperature;
- if(engineTorque)
- delete engineTorque;
- if(odometer)
- delete odometer;
- if(tripOdometer)
- delete tripOdometer;
- if(genericbinary)
- delete genericbinary;
-}
-
-
-OnVehicleData::OnVehicleData(const OnVehicleData& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool OnVehicleData::checkIntegrity(void)
-{
- return OnVehicleDataMarshaller::checkIntegrity(*this);
-}
-
-
-OnVehicleData::OnVehicleData(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- gps(0),
- speed(0),
- rpm(0),
- fuelLevel(0),
- avgFuelEconomy(0),
- batteryVoltage(0),
- externalTemperature(0),
- vin(0),
- prndl(0),
- tirePressure(0),
- batteryPackVoltage(0),
- batteryPackCurrent(0),
- batteryPackTemperature(0),
- engineTorque(0),
- odometer(0),
- tripOdometer(0),
- genericbinary(0)
-{
-}
-
-
-
-bool OnVehicleData::set_gps(const GPSData& gps_)
-{
- if(!GPSDataMarshaller::checkIntegrityConst(gps_)) return false;
- delete gps;
- gps=0;
-
- gps=new GPSData(gps_);
- return true;
-}
-
-void OnVehicleData::reset_gps(void)
-{
- if(gps)
- delete gps;
- gps=0;
-}
-
-bool OnVehicleData::set_speed(float speed_)
-{
- if(speed_>500) return false;
- if(speed_<-100) return false;
- delete speed;
- speed=0;
-
- speed=new float(speed_);
- return true;
-}
-
-void OnVehicleData::reset_speed(void)
-{
- if(speed)
- delete speed;
- speed=0;
-}
-
-bool OnVehicleData::set_rpm(unsigned int rpm_)
-{
- if(rpm_>20000) return false;
- delete rpm;
- rpm=0;
-
- rpm=new unsigned int(rpm_);
- return true;
-}
-
-void OnVehicleData::reset_rpm(void)
-{
- if(rpm)
- delete rpm;
- rpm=0;
-}
-
-bool OnVehicleData::set_fuelLevel(float fuelLevel_)
-{
- if(fuelLevel_>100) return false;
- if(fuelLevel_<0) return false;
- delete fuelLevel;
- fuelLevel=0;
-
- fuelLevel=new float(fuelLevel_);
- return true;
-}
-
-void OnVehicleData::reset_fuelLevel(void)
-{
- if(fuelLevel)
- delete fuelLevel;
- fuelLevel=0;
-}
-
-bool OnVehicleData::set_avgFuelEconomy(float avgFuelEconomy_)
-{
- if(avgFuelEconomy_>7000) return false;
- if(avgFuelEconomy_<0) return false;
- delete avgFuelEconomy;
- avgFuelEconomy=0;
-
- avgFuelEconomy=new float(avgFuelEconomy_);
- return true;
-}
-
-void OnVehicleData::reset_avgFuelEconomy(void)
-{
- if(avgFuelEconomy)
- delete avgFuelEconomy;
- avgFuelEconomy=0;
-}
-
-bool OnVehicleData::set_batteryVoltage(float batteryVoltage_)
-{
- if(batteryVoltage_>26) return false;
- if(batteryVoltage_<0) return false;
- delete batteryVoltage;
- batteryVoltage=0;
-
- batteryVoltage=new float(batteryVoltage_);
- return true;
-}
-
-void OnVehicleData::reset_batteryVoltage(void)
-{
- if(batteryVoltage)
- delete batteryVoltage;
- batteryVoltage=0;
-}
-
-bool OnVehicleData::set_externalTemperature(float externalTemperature_)
-{
- if(externalTemperature_>100) return false;
- if(externalTemperature_<-40) return false;
- delete externalTemperature;
- externalTemperature=0;
-
- externalTemperature=new float(externalTemperature_);
- return true;
-}
-
-void OnVehicleData::reset_externalTemperature(void)
-{
- if(externalTemperature)
- delete externalTemperature;
- externalTemperature=0;
-}
-
-bool OnVehicleData::set_vin(const std::string& vin_)
-{
- if(vin_.length()>17) return false;
- delete vin;
- vin=0;
-
- vin=new std::string(vin_);
- return true;
-}
-
-void OnVehicleData::reset_vin(void)
-{
- if(vin)
- delete vin;
- vin=0;
-}
-
-bool OnVehicleData::set_prndl(const PRNDL& prndl_)
-{
- if(!PRNDLMarshaller::checkIntegrityConst(prndl_)) return false;
- delete prndl;
- prndl=0;
-
- prndl=new PRNDL(prndl_);
- return true;
-}
-
-void OnVehicleData::reset_prndl(void)
-{
- if(prndl)
- delete prndl;
- prndl=0;
-}
-
-bool OnVehicleData::set_tirePressure(const TireStatus& tirePressure_)
-{
- if(!TireStatusMarshaller::checkIntegrityConst(tirePressure_)) return false;
- delete tirePressure;
- tirePressure=0;
-
- tirePressure=new TireStatus(tirePressure_);
- return true;
-}
-
-void OnVehicleData::reset_tirePressure(void)
-{
- if(tirePressure)
- delete tirePressure;
- tirePressure=0;
-}
-
-bool OnVehicleData::set_batteryPackVoltage(float batteryPackVoltage_)
-{
- if(batteryPackVoltage_>1000) return false;
- if(batteryPackVoltage_<-1000) return false;
- delete batteryPackVoltage;
- batteryPackVoltage=0;
-
- batteryPackVoltage=new float(batteryPackVoltage_);
- return true;
-}
-
-void OnVehicleData::reset_batteryPackVoltage(void)
-{
- if(batteryPackVoltage)
- delete batteryPackVoltage;
- batteryPackVoltage=0;
-}
-
-bool OnVehicleData::set_batteryPackCurrent(float batteryPackCurrent_)
-{
- if(batteryPackCurrent_>1000) return false;
- if(batteryPackCurrent_<-1000) return false;
- delete batteryPackCurrent;
- batteryPackCurrent=0;
-
- batteryPackCurrent=new float(batteryPackCurrent_);
- return true;
-}
-
-void OnVehicleData::reset_batteryPackCurrent(void)
-{
- if(batteryPackCurrent)
- delete batteryPackCurrent;
- batteryPackCurrent=0;
-}
-
-bool OnVehicleData::set_batteryPackTemperature(int batteryPackTemperature_)
-{
- if(batteryPackTemperature_>250) return false;
- delete batteryPackTemperature;
- batteryPackTemperature=0;
-
- batteryPackTemperature=new int(batteryPackTemperature_);
- return true;
-}
-
-void OnVehicleData::reset_batteryPackTemperature(void)
-{
- if(batteryPackTemperature)
- delete batteryPackTemperature;
- batteryPackTemperature=0;
-}
-
-bool OnVehicleData::set_engineTorque(int engineTorque_)
-{
- if(engineTorque_>55000) return false;
- delete engineTorque;
- engineTorque=0;
-
- engineTorque=new int(engineTorque_);
- return true;
-}
-
-void OnVehicleData::reset_engineTorque(void)
-{
- if(engineTorque)
- delete engineTorque;
- engineTorque=0;
-}
-
-bool OnVehicleData::set_odometer(unsigned int odometer_)
-{
- if(odometer_>2000000) return false;
- delete odometer;
- odometer=0;
-
- odometer=new unsigned int(odometer_);
- return true;
-}
-
-void OnVehicleData::reset_odometer(void)
-{
- if(odometer)
- delete odometer;
- odometer=0;
-}
-
-bool OnVehicleData::set_tripOdometer(unsigned int tripOdometer_)
-{
- if(tripOdometer_>2000000) return false;
- delete tripOdometer;
- tripOdometer=0;
-
- tripOdometer=new unsigned int(tripOdometer_);
- return true;
-}
-
-void OnVehicleData::reset_tripOdometer(void)
-{
- if(tripOdometer)
- delete tripOdometer;
- tripOdometer=0;
-}
-
-bool OnVehicleData::set_genericbinary(const std::string& genericbinary_)
-{
- if(genericbinary_.length()>500) return false;
- delete genericbinary;
- genericbinary=0;
-
- genericbinary=new std::string(genericbinary_);
- return true;
-}
-
-void OnVehicleData::reset_genericbinary(void)
-{
- if(genericbinary)
- delete genericbinary;
- genericbinary=0;
-}
-
-
-
-
-const GPSData* OnVehicleData::get_gps(void) const
-{
- return gps;
-}
-
-const float* OnVehicleData::get_speed(void) const
-{
- return speed;
-}
-
-const unsigned int* OnVehicleData::get_rpm(void) const
-{
- return rpm;
-}
-
-const float* OnVehicleData::get_fuelLevel(void) const
-{
- return fuelLevel;
-}
-
-const float* OnVehicleData::get_avgFuelEconomy(void) const
-{
- return avgFuelEconomy;
-}
-
-const float* OnVehicleData::get_batteryVoltage(void) const
-{
- return batteryVoltage;
-}
-
-const float* OnVehicleData::get_externalTemperature(void) const
-{
- return externalTemperature;
-}
-
-const std::string* OnVehicleData::get_vin(void) const
-{
- return vin;
-}
-
-const PRNDL* OnVehicleData::get_prndl(void) const
-{
- return prndl;
-}
-
-const TireStatus* OnVehicleData::get_tirePressure(void) const
-{
- return tirePressure;
-}
-
-const float* OnVehicleData::get_batteryPackVoltage(void) const
-{
- return batteryPackVoltage;
-}
-
-const float* OnVehicleData::get_batteryPackCurrent(void) const
-{
- return batteryPackCurrent;
-}
-
-const int* OnVehicleData::get_batteryPackTemperature(void) const
-{
- return batteryPackTemperature;
-}
-
-const int* OnVehicleData::get_engineTorque(void) const
-{
- return engineTorque;
-}
-
-const unsigned int* OnVehicleData::get_odometer(void) const
-{
- return odometer;
-}
-
-const unsigned int* OnVehicleData::get_tripOdometer(void) const
-{
- return tripOdometer;
-}
-
-const std::string* OnVehicleData::get_genericbinary(void) const
-{
- return genericbinary;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp
deleted file mode 100644
index ab52df37e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-#include "OnVehicleDataMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnVehicleDataMarshaller::checkIntegrity(OnVehicleData& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool OnVehicleDataMarshaller::fromString(const std::string& s,OnVehicleData& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string OnVehicleDataMarshaller::toString(const OnVehicleData& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnVehicleDataMarshaller::checkIntegrityConst(const OnVehicleData& s)
-{
- if(s.gps && !GPSDataMarshaller::checkIntegrityConst(*s.gps)) return false;
- if(s.speed && *s.speed>500) return false;
- if(s.speed && *s.speed<-100) return false;
- if(s.rpm && *s.rpm>20000) return false;
- if(s.fuelLevel && *s.fuelLevel>100) return false;
- if(s.fuelLevel && *s.fuelLevel<0) return false;
- if(s.avgFuelEconomy && *s.avgFuelEconomy>7000) return false;
- if(s.avgFuelEconomy && *s.avgFuelEconomy<0) return false;
- if(s.batteryVoltage && *s.batteryVoltage>26) return false;
- if(s.batteryVoltage && *s.batteryVoltage<0) return false;
- if(s.externalTemperature && *s.externalTemperature>100) return false;
- if(s.externalTemperature && *s.externalTemperature<-40) return false;
- if(s.vin && s.vin->length()>17) return false;
- if(s.prndl && !PRNDLMarshaller::checkIntegrityConst(*s.prndl)) return false;
- if(s.tirePressure && !TireStatusMarshaller::checkIntegrityConst(*s.tirePressure)) return false;
- if(s.batteryPackVoltage && *s.batteryPackVoltage>1000) return false;
- if(s.batteryPackVoltage && *s.batteryPackVoltage<-1000) return false;
- if(s.batteryPackCurrent && *s.batteryPackCurrent>1000) return false;
- if(s.batteryPackCurrent && *s.batteryPackCurrent<-1000) return false;
- if(s.batteryPackTemperature && *s.batteryPackTemperature>250) return false;
- if(s.batteryPackTemperature && *s.batteryPackTemperature<-50) return false;
- if(s.engineTorque && *s.engineTorque>55000) return false;
- if(s.engineTorque && *s.engineTorque<-10000) return false;
- if(s.odometer && *s.odometer>2000000) return false;
- if(s.tripOdometer && *s.tripOdometer>2000000) return false;
- if(s.genericbinary && s.genericbinary->length()>500) return false;
- return true;
-}
-
-Json::Value OnVehicleDataMarshaller::toJSON(const OnVehicleData& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.gps)
- json["gps"]=GPSDataMarshaller::toJSON(*e.gps);
-
- if(e.speed)
- json["speed"]=Json::Value(*e.speed);
-
- if(e.rpm)
- json["rpm"]=Json::Value(*e.rpm);
-
- if(e.fuelLevel)
- json["fuelLevel"]=Json::Value(*e.fuelLevel);
-
- if(e.avgFuelEconomy)
- json["avgFuelEconomy"]=Json::Value(*e.avgFuelEconomy);
-
- if(e.batteryVoltage)
- json["batteryVoltage"]=Json::Value(*e.batteryVoltage);
-
- if(e.externalTemperature)
- json["externalTemperature"]=Json::Value(*e.externalTemperature);
-
- if(e.vin)
- json["vin"]=Json::Value(*e.vin);
-
- if(e.prndl)
- json["prndl"]=PRNDLMarshaller::toJSON(*e.prndl);
-
- if(e.tirePressure)
- json["tirePressure"]=TireStatusMarshaller::toJSON(*e.tirePressure);
-
- if(e.batteryPackVoltage)
- json["batteryPackVoltage"]=Json::Value(*e.batteryPackVoltage);
-
- if(e.batteryPackCurrent)
- json["batteryPackCurrent"]=Json::Value(*e.batteryPackCurrent);
-
- if(e.batteryPackTemperature)
- json["batteryPackTemperature"]=Json::Value(*e.batteryPackTemperature);
-
- if(e.engineTorque)
- json["engineTorque"]=Json::Value(*e.engineTorque);
-
- if(e.odometer)
- json["odometer"]=Json::Value(*e.odometer);
-
- if(e.tripOdometer)
- json["tripOdometer"]=Json::Value(*e.tripOdometer);
-
- if(e.genericbinary)
- json["genericbinary"]=Json::Value(*e.genericbinary);
-
- return json;
-}
-
-
-bool OnVehicleDataMarshaller::fromJSON(const Json::Value& json,OnVehicleData& c)
-{
- if(c.gps) delete c.gps;
- c.gps=0;
-
- if(c.speed) delete c.speed;
- c.speed=0;
-
- if(c.rpm) delete c.rpm;
- c.rpm=0;
-
- if(c.fuelLevel) delete c.fuelLevel;
- c.fuelLevel=0;
-
- if(c.avgFuelEconomy) delete c.avgFuelEconomy;
- c.avgFuelEconomy=0;
-
- if(c.batteryVoltage) delete c.batteryVoltage;
- c.batteryVoltage=0;
-
- if(c.externalTemperature) delete c.externalTemperature;
- c.externalTemperature=0;
-
- if(c.vin) delete c.vin;
- c.vin=0;
-
- if(c.prndl) delete c.prndl;
- c.prndl=0;
-
- if(c.tirePressure) delete c.tirePressure;
- c.tirePressure=0;
-
- if(c.batteryPackVoltage) delete c.batteryPackVoltage;
- c.batteryPackVoltage=0;
-
- if(c.batteryPackCurrent) delete c.batteryPackCurrent;
- c.batteryPackCurrent=0;
-
- if(c.batteryPackTemperature) delete c.batteryPackTemperature;
- c.batteryPackTemperature=0;
-
- if(c.engineTorque) delete c.engineTorque;
- c.engineTorque=0;
-
- if(c.odometer) delete c.odometer;
- c.odometer=0;
-
- if(c.tripOdometer) delete c.tripOdometer;
- c.tripOdometer=0;
-
- if(c.genericbinary) delete c.genericbinary;
- c.genericbinary=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("gps"))
- {
- const Json::Value& j=json["gps"];
- c.gps=new GPSData();
- if(!GPSDataMarshaller::fromJSON(j,c.gps[0]))
- return false;
- }
- if(json.isMember("speed"))
- {
- const Json::Value& j=json["speed"];
- if(!j.isNumeric()) return false;
- c.speed=new float(j.asDouble());
- }
- if(json.isMember("rpm"))
- {
- const Json::Value& j=json["rpm"];
- if(!j.isInt()) return false;
- c.rpm=new unsigned int(j.asInt());
- }
- if(json.isMember("fuelLevel"))
- {
- const Json::Value& j=json["fuelLevel"];
- if(!j.isNumeric()) return false;
- c.fuelLevel=new float(j.asDouble());
- }
- if(json.isMember("avgFuelEconomy"))
- {
- const Json::Value& j=json["avgFuelEconomy"];
- if(!j.isNumeric()) return false;
- c.avgFuelEconomy=new float(j.asDouble());
- }
- if(json.isMember("batteryVoltage"))
- {
- const Json::Value& j=json["batteryVoltage"];
- if(!j.isNumeric()) return false;
- c.batteryVoltage=new float(j.asDouble());
- }
- if(json.isMember("externalTemperature"))
- {
- const Json::Value& j=json["externalTemperature"];
- if(!j.isNumeric()) return false;
- c.externalTemperature=new float(j.asDouble());
- }
- if(json.isMember("vin"))
- {
- const Json::Value& j=json["vin"];
- if(!j.isString()) return false;
- c.vin=new std::string(j.asString());
- }
- if(json.isMember("prndl"))
- {
- const Json::Value& j=json["prndl"];
- c.prndl=new PRNDL();
- if(!PRNDLMarshaller::fromJSON(j,c.prndl[0]))
- return false;
- }
- if(json.isMember("tirePressure"))
- {
- const Json::Value& j=json["tirePressure"];
- c.tirePressure=new TireStatus();
- if(!TireStatusMarshaller::fromJSON(j,c.tirePressure[0]))
- return false;
- }
- if(json.isMember("batteryPackVoltage"))
- {
- const Json::Value& j=json["batteryPackVoltage"];
- if(!j.isNumeric()) return false;
- c.batteryPackVoltage=new float(j.asDouble());
- }
- if(json.isMember("batteryPackCurrent"))
- {
- const Json::Value& j=json["batteryPackCurrent"];
- if(!j.isNumeric()) return false;
- c.batteryPackCurrent=new float(j.asDouble());
- }
- if(json.isMember("batteryPackTemperature"))
- {
- const Json::Value& j=json["batteryPackTemperature"];
- if(!j.isInt()) return false;
- c.batteryPackTemperature=new int(j.asInt());
- }
- if(json.isMember("engineTorque"))
- {
- const Json::Value& j=json["engineTorque"];
- if(!j.isInt()) return false;
- c.engineTorque=new int(j.asInt());
- }
- if(json.isMember("odometer"))
- {
- const Json::Value& j=json["odometer"];
- if(!j.isInt()) return false;
- c.odometer=new unsigned int(j.asInt());
- }
- if(json.isMember("tripOdometer"))
- {
- const Json::Value& j=json["tripOdometer"];
- if(!j.isInt()) return false;
- c.tripOdometer=new unsigned int(j.asInt());
- }
- if(json.isMember("genericbinary"))
- {
- const Json::Value& j=json["genericbinary"];
- if(!j.isString()) return false;
- c.genericbinary=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h
deleted file mode 100644
index 4e7f966da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONVEHICLEDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONVEHICLEDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct OnVehicleDataMarshaller
- {
- static bool checkIntegrity(OnVehicleData& e);
- static bool checkIntegrityConst(const OnVehicleData& e);
-
- static bool fromString(const std::string& s,OnVehicleData& e);
- static const std::string toString(const OnVehicleData& e);
-
- static bool fromJSON(const Json::Value& s,OnVehicleData& e);
- static Json::Value toJSON(const OnVehicleData& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp
deleted file mode 100644
index 23e857b97..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/PRNDL.h"
-#include "PRNDLMarshaller.h"
-#include "PRNDLMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const PRNDL::PRNDLInternal PRNDLMarshaller::getIndex(const char* s)
-{
- if(!s)
- return PRNDL::INVALID_ENUM;
- const struct PerfectHashTable* p=PRNDL_intHash::getPointer(s,strlen(s));
- return p ? static_cast<PRNDL::PRNDLInternal>(p->idx) : PRNDL::INVALID_ENUM;
-}
-
-
-bool PRNDLMarshaller::fromJSON(const Json::Value& s,PRNDL& e)
-{
- e.mInternal=PRNDL::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=PRNDL::INVALID_ENUM);
-}
-
-
-Json::Value PRNDLMarshaller::toJSON(const PRNDL& e)
-{
- if(e.mInternal==PRNDL::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool PRNDLMarshaller::fromString(const std::string& s,PRNDL& e)
-{
- e.mInternal=PRNDL::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string PRNDLMarshaller::toString(const PRNDL& e)
-{
- Json::FastWriter writer;
- return e.mInternal==PRNDL::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable PRNDLMarshaller::mHashTable[14]=
-{
- {"PARK",0},
- {"REVERSE",1},
- {"NEUTRAL",2},
- {"LOWGEAR",3},
- {"FORWARD_DRIVE_2",4},
- {"FORWARD_DRIVE_3",5},
- {"FORWARD_DRIVE_4",6},
- {"FORWARD_DRIVE_5",7},
- {"FORWARD_DRIVE_6",8},
- {"SECOND_GEAR_HOLD",9},
- {"THIRD_GEAR_HOLD",10},
- {"FOURTH_GEAR_HOLD",11},
- {"FIFTH_GEAR_HOLD",12},
- {"SIXTH_GEAR_HOLD",13}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp
deleted file mode 100644
index c57a7e56a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp
+++ /dev/null
@@ -1,30 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name PRNDL_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-PARK,0
-REVERSE,1
-NEUTRAL,2
-LOWGEAR,3
-FORWARD_DRIVE_2,4
-FORWARD_DRIVE_3,5
-FORWARD_DRIVE_4,6
-FORWARD_DRIVE_5,7
-FORWARD_DRIVE_6,8
-SECOND_GEAR_HOLD,9
-THIRD_GEAR_HOLD,10
-FOURTH_GEAR_HOLD,11
-FIFTH_GEAR_HOLD,12
-SIXTH_GEAR_HOLD,13
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h
deleted file mode 100644
index 46422b4d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PRNDLMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PRNDLMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PRNDL.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for PRNDL
-
- class PRNDLMarshaller
- {
- public:
-
- static std::string toName(const PRNDL& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(PRNDL& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=PRNDL::INVALID_ENUM;
- }
-
- static bool checkIntegrity(PRNDL& e) { return e.mInternal!=PRNDL::INVALID_ENUM; }
- static bool checkIntegrityConst(const PRNDL& e) { return e.mInternal!=PRNDL::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,PRNDL& e);
- static const std::string toString(const PRNDL& e);
-
- static bool fromJSON(const Json::Value& s,PRNDL& e);
- static Json::Value toJSON(const PRNDL& e);
-
- static const char* getName(PRNDL::PRNDLInternal e)
- {
- return (e>=0 && e<14) ? mHashTable[e].name : NULL;
- }
-
- static const PRNDL::PRNDLInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[14];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc
deleted file mode 100644
index 835205540..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp */
-/* Computed positions: -k'1,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 14
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 16
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 35
-/* maximum key range = 32, duplicates = 0 */
-
-class PRNDL_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-PRNDL_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 14, 9, 4, 15, 10, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 0, 10,
- 5, 36, 36, 36, 36, 0, 0, 36, 5, 36,
- 0, 36, 0, 0, 10, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36
- };
- return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-PRNDL_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 0, 0, 7, 0, 0, 0, 0, 7, 0,
- 0, 15, 16, 7, 0, 0, 15, 16, 0, 0, 15, 15, 0, 0,
- 0, 15, 15, 0, 0, 0, 15, 15
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"PARK",0},
- {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"LOWGEAR",3},
- {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"NEUTRAL",2},
- {""}, {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"SIXTH_GEAR_HOLD",13},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"SECOND_GEAR_HOLD",9},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"REVERSE",1},
- {""}, {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FIFTH_GEAR_HOLD",12},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FOURTH_GEAR_HOLD",11},
- {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FORWARD_DRIVE_4",6},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"THIRD_GEAR_HOLD",10},
- {""}, {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FORWARD_DRIVE_3",5},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FORWARD_DRIVE_6",8},
- {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FORWARD_DRIVE_2",4},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
- {"FORWARD_DRIVE_5",7}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp
deleted file mode 100644
index e3597d369..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h"
-#include "ParameterPermissionsMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ParameterPermissions::ParameterPermissions(const ParameterPermissions& c)
-{
- *this=c;
-}
-
-
-bool ParameterPermissions::checkIntegrity(void)
-{
- return ParameterPermissionsMarshaller::checkIntegrity(*this);
-}
-
-
-ParameterPermissions::ParameterPermissions(void)
-{
-}
-
-
-
-bool ParameterPermissions::set_allowed(const std::vector<std::string>& allowed_)
-{
- unsigned int i=allowed_.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- if(allowed_[i].length()>100) return false;
- }
- allowed=allowed_;
- return true;
-}
-
-bool ParameterPermissions::set_userDisallowed(const std::vector<std::string>& userDisallowed_)
-{
- unsigned int i=userDisallowed_.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- }
- userDisallowed=userDisallowed_;
- return true;
-}
-
-
-
-
-const std::vector<std::string>& ParameterPermissions::get_allowed(void) const
-{
- return allowed;
-}
-
-
-const std::vector<std::string>& ParameterPermissions::get_userDisallowed(void) const
-{
- return userDisallowed;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp
deleted file mode 100644
index f0d40f309..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h"
-
-
-#include "ParameterPermissionsMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ParameterPermissionsMarshaller::checkIntegrity(ParameterPermissions& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ParameterPermissionsMarshaller::fromString(const std::string& s,ParameterPermissions& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ParameterPermissionsMarshaller::toString(const ParameterPermissions& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ParameterPermissionsMarshaller::checkIntegrityConst(const ParameterPermissions& s)
-{
- {
- unsigned int i=s.allowed.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- if(s.allowed[i].length()>100) return false;
- }
- }
- {
- unsigned int i=s.userDisallowed.size();
- if(i>100 || i<0) return false;
- while(i--)
- {
- }
- }
- return true;
-}
-
-Json::Value ParameterPermissionsMarshaller::toJSON(const ParameterPermissions& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["allowed"]=Json::Value(Json::arrayValue);
- json["allowed"].resize(e.allowed.size());
- for(unsigned int i=0;i<e.allowed.size();i++)
- json["allowed"][i]=Json::Value(e.allowed[i]);
-
- json["userDisallowed"]=Json::Value(Json::arrayValue);
- json["userDisallowed"].resize(e.userDisallowed.size());
- for(unsigned int i=0;i<e.userDisallowed.size();i++)
- json["userDisallowed"][i]=Json::Value(e.userDisallowed[i]);
-
-
- return json;
-}
-
-
-bool ParameterPermissionsMarshaller::fromJSON(const Json::Value& json,ParameterPermissions& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("allowed")) return false;
- {
- const Json::Value& j=json["allowed"];
- if(!j.isArray()) return false;
- c.allowed.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.allowed[i]=j[i].asString();
- }
- if(!json.isMember("userDisallowed")) return false;
- {
- const Json::Value& j=json["userDisallowed"];
- if(!j.isArray()) return false;
- c.userDisallowed.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.userDisallowed[i]=j[i].asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h
deleted file mode 100644
index 78a017cfe..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PARAMETERPERMISSIONSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PARAMETERPERMISSIONSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ParameterPermissionsMarshaller
- {
- static bool checkIntegrity(ParameterPermissions& e);
- static bool checkIntegrityConst(const ParameterPermissions& e);
-
- static bool fromString(const std::string& s,ParameterPermissions& e);
- static const std::string toString(const ParameterPermissions& e);
-
- static bool fromJSON(const Json::Value& s,ParameterPermissions& e);
- static Json::Value toJSON(const ParameterPermissions& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h
deleted file mode 100644
index e62b1404a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef PERFECTHASHTABLE_INCLUDE
-#define PERFECTHASHTABLE_INCLUDE
-
-namespace NsSmartDeviceLinkRPCV2
-{
- struct PerfectHashTable
- {
- const char *name;
- unsigned int idx;
- };
-}
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp
deleted file mode 100644
index bb53486ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-#include "PerformAudioPassThru_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioTypeMarshaller.h"
-#include "SamplingRateMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformAudioPassThru_request& PerformAudioPassThru_request::operator =(const PerformAudioPassThru_request& c)
-{
- initialPrompt= c.initialPrompt;
- audioPassThruDisplayText1= c.audioPassThruDisplayText1 ? new std::string(c.audioPassThruDisplayText1[0]) : 0;
- audioPassThruDisplayText2= c.audioPassThruDisplayText2 ? new std::string(c.audioPassThruDisplayText2[0]) : 0;
- samplingRate= c.samplingRate;
- maxDuration= c.maxDuration;
- bitsPerSample= c.bitsPerSample;
- audioType= c.audioType;
-
- return *this;
-}
-
-
-PerformAudioPassThru_request::~PerformAudioPassThru_request(void)
-{
- if(audioPassThruDisplayText1)
- delete audioPassThruDisplayText1;
- if(audioPassThruDisplayText2)
- delete audioPassThruDisplayText2;
-}
-
-
-PerformAudioPassThru_request::PerformAudioPassThru_request(const PerformAudioPassThru_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool PerformAudioPassThru_request::checkIntegrity(void)
-{
- return PerformAudioPassThru_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PerformAudioPassThru_request::PerformAudioPassThru_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- audioPassThruDisplayText1(0),
- audioPassThruDisplayText2(0)
-{
-}
-
-
-
-bool PerformAudioPassThru_request::set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_)
-{
- unsigned int i=initialPrompt_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(initialPrompt_[i])) return false;
- }
- initialPrompt=initialPrompt_;
- return true;
-}
-
-bool PerformAudioPassThru_request::set_audioPassThruDisplayText1(const std::string& audioPassThruDisplayText1_)
-{
- if(audioPassThruDisplayText1_.length()>500) return false;
- delete audioPassThruDisplayText1;
- audioPassThruDisplayText1=0;
-
- audioPassThruDisplayText1=new std::string(audioPassThruDisplayText1_);
- return true;
-}
-
-void PerformAudioPassThru_request::reset_audioPassThruDisplayText1(void)
-{
- if(audioPassThruDisplayText1)
- delete audioPassThruDisplayText1;
- audioPassThruDisplayText1=0;
-}
-
-bool PerformAudioPassThru_request::set_audioPassThruDisplayText2(const std::string& audioPassThruDisplayText2_)
-{
- if(audioPassThruDisplayText2_.length()>500) return false;
- delete audioPassThruDisplayText2;
- audioPassThruDisplayText2=0;
-
- audioPassThruDisplayText2=new std::string(audioPassThruDisplayText2_);
- return true;
-}
-
-void PerformAudioPassThru_request::reset_audioPassThruDisplayText2(void)
-{
- if(audioPassThruDisplayText2)
- delete audioPassThruDisplayText2;
- audioPassThruDisplayText2=0;
-}
-
-bool PerformAudioPassThru_request::set_samplingRate(const SamplingRate& samplingRate_)
-{
- if(!SamplingRateMarshaller::checkIntegrityConst(samplingRate_)) return false;
- samplingRate=samplingRate_;
- return true;
-}
-
-bool PerformAudioPassThru_request::set_maxDuration(unsigned int maxDuration_)
-{
- if(maxDuration_>1000000) return false;
- maxDuration=maxDuration_;
- return true;
-}
-
-bool PerformAudioPassThru_request::set_bitsPerSample(const AudioCaptureQuality& bitsPerSample_)
-{
- if(!AudioCaptureQualityMarshaller::checkIntegrityConst(bitsPerSample_)) return false;
- bitsPerSample=bitsPerSample_;
- return true;
-}
-
-bool PerformAudioPassThru_request::set_audioType(const AudioType& audioType_)
-{
- if(!AudioTypeMarshaller::checkIntegrityConst(audioType_)) return false;
- audioType=audioType_;
- return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& PerformAudioPassThru_request::get_initialPrompt(void) const
-{
- return initialPrompt;
-}
-
-const std::string* PerformAudioPassThru_request::get_audioPassThruDisplayText1(void) const
-{
- return audioPassThruDisplayText1;
-}
-
-const std::string* PerformAudioPassThru_request::get_audioPassThruDisplayText2(void) const
-{
- return audioPassThruDisplayText2;
-}
-
-const SamplingRate& PerformAudioPassThru_request::get_samplingRate(void) const
-{
- return samplingRate;
-}
-
-unsigned int PerformAudioPassThru_request::get_maxDuration(void) const
-{
- return maxDuration;
-}
-
-const AudioCaptureQuality& PerformAudioPassThru_request::get_bitsPerSample(void) const
-{
- return bitsPerSample;
-}
-
-const AudioType& PerformAudioPassThru_request::get_audioType(void) const
-{
- return audioType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp
deleted file mode 100644
index 00a38360c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioTypeMarshaller.h"
-#include "SamplingRateMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "PerformAudioPassThru_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformAudioPassThru_requestMarshaller::checkIntegrity(PerformAudioPassThru_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PerformAudioPassThru_requestMarshaller::fromString(const std::string& s,PerformAudioPassThru_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PerformAudioPassThru_requestMarshaller::toString(const PerformAudioPassThru_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformAudioPassThru_requestMarshaller::checkIntegrityConst(const PerformAudioPassThru_request& s)
-{
- {
- unsigned int i=s.initialPrompt.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.initialPrompt[i])) return false;
- }
- }
- if(s.audioPassThruDisplayText1 && s.audioPassThruDisplayText1->length()>500) return false;
- if(s.audioPassThruDisplayText2 && s.audioPassThruDisplayText2->length()>500) return false;
- if(!SamplingRateMarshaller::checkIntegrityConst(s.samplingRate)) return false;
- if(s.maxDuration>1000000) return false;
- if(!AudioCaptureQualityMarshaller::checkIntegrityConst(s.bitsPerSample)) return false;
- if(!AudioTypeMarshaller::checkIntegrityConst(s.audioType)) return false;
- return true;
-}
-
-Json::Value PerformAudioPassThru_requestMarshaller::toJSON(const PerformAudioPassThru_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["initialPrompt"]=Json::Value(Json::arrayValue);
- json["initialPrompt"].resize(e.initialPrompt.size());
- for(unsigned int i=0;i<e.initialPrompt.size();i++)
- json["initialPrompt"][i]=TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
- if(e.audioPassThruDisplayText1)
- json["audioPassThruDisplayText1"]=Json::Value(*e.audioPassThruDisplayText1);
-
- if(e.audioPassThruDisplayText2)
- json["audioPassThruDisplayText2"]=Json::Value(*e.audioPassThruDisplayText2);
-
- json["samplingRate"]=SamplingRateMarshaller::toJSON(e.samplingRate);
-
- json["maxDuration"]=Json::Value(e.maxDuration);
-
- json["bitsPerSample"]=AudioCaptureQualityMarshaller::toJSON(e.bitsPerSample);
-
- json["audioType"]=AudioTypeMarshaller::toJSON(e.audioType);
-
- return json;
-}
-
-
-bool PerformAudioPassThru_requestMarshaller::fromJSON(const Json::Value& json,PerformAudioPassThru_request& c)
-{
- if(c.audioPassThruDisplayText1) delete c.audioPassThruDisplayText1;
- c.audioPassThruDisplayText1=0;
-
- if(c.audioPassThruDisplayText2) delete c.audioPassThruDisplayText2;
- c.audioPassThruDisplayText2=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("initialPrompt")) return false;
- {
- const Json::Value& j=json["initialPrompt"];
- if(!j.isArray()) return false;
- c.initialPrompt.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.initialPrompt[i]=t;
- }
-
- }
- if(json.isMember("audioPassThruDisplayText1"))
- {
- const Json::Value& j=json["audioPassThruDisplayText1"];
- if(!j.isString()) return false;
- c.audioPassThruDisplayText1=new std::string(j.asString());
- }
- if(json.isMember("audioPassThruDisplayText2"))
- {
- const Json::Value& j=json["audioPassThruDisplayText2"];
- if(!j.isString()) return false;
- c.audioPassThruDisplayText2=new std::string(j.asString());
- }
- if(!json.isMember("samplingRate")) return false;
- {
- const Json::Value& j=json["samplingRate"];
- if(!SamplingRateMarshaller::fromJSON(j,c.samplingRate))
- return false;
- }
- if(!json.isMember("maxDuration")) return false;
- {
- const Json::Value& j=json["maxDuration"];
- if(!j.isInt()) return false;
- c.maxDuration=j.asInt();
- }
- if(!json.isMember("bitsPerSample")) return false;
- {
- const Json::Value& j=json["bitsPerSample"];
- if(!AudioCaptureQualityMarshaller::fromJSON(j,c.bitsPerSample))
- return false;
- }
- if(!json.isMember("audioType")) return false;
- {
- const Json::Value& j=json["audioType"];
- if(!AudioTypeMarshaller::fromJSON(j,c.audioType))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h
deleted file mode 100644
index 128fa0935..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PerformAudioPassThru_requestMarshaller
- {
- static bool checkIntegrity(PerformAudioPassThru_request& e);
- static bool checkIntegrityConst(const PerformAudioPassThru_request& e);
-
- static bool fromString(const std::string& s,PerformAudioPassThru_request& e);
- static const std::string toString(const PerformAudioPassThru_request& e);
-
- static bool fromJSON(const Json::Value& s,PerformAudioPassThru_request& e);
- static Json::Value toJSON(const PerformAudioPassThru_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp
deleted file mode 100644
index 6524cbbb8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-#include "PerformAudioPassThru_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformAudioPassThru_response& PerformAudioPassThru_response::operator =(const PerformAudioPassThru_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-PerformAudioPassThru_response::~PerformAudioPassThru_response(void)
-{}
-
-PerformAudioPassThru_response::PerformAudioPassThru_response(const PerformAudioPassThru_response& c)
-{
- *this = c;
-}
-
-bool PerformAudioPassThru_response::checkIntegrity(void)
-{
- return PerformAudioPassThru_responseMarshaller::checkIntegrity(*this);
-}
-
-PerformAudioPassThru_response::PerformAudioPassThru_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp
deleted file mode 100644
index 3704f19c0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-#include "ResultMarshaller.h"
-
-#include "PerformAudioPassThru_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformAudioPassThru_responseMarshaller::checkIntegrity(PerformAudioPassThru_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PerformAudioPassThru_responseMarshaller::fromString(const std::string& s,PerformAudioPassThru_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PerformAudioPassThru_responseMarshaller::toString(const PerformAudioPassThru_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformAudioPassThru_responseMarshaller::checkIntegrityConst(const PerformAudioPassThru_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value PerformAudioPassThru_responseMarshaller::toJSON(const PerformAudioPassThru_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool PerformAudioPassThru_responseMarshaller::fromJSON(const Json::Value& json,PerformAudioPassThru_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h
deleted file mode 100644
index 80d91a4f3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PerformAudioPassThru_responseMarshaller
- {
- static bool checkIntegrity(PerformAudioPassThru_response& e);
- static bool checkIntegrityConst(const PerformAudioPassThru_response& e);
-
- static bool fromString(const std::string& s,PerformAudioPassThru_response& e);
- static const std::string toString(const PerformAudioPassThru_response& e);
-
- static bool fromJSON(const Json::Value& s,PerformAudioPassThru_response& e);
- static Json::Value toJSON(const PerformAudioPassThru_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp
deleted file mode 100644
index e5f05927d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-#include "PerformInteraction_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "InteractionModeMarshaller.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformInteraction_request& PerformInteraction_request::operator =(const PerformInteraction_request& c)
-{
- initialText= c.initialText;
- initialPrompt= c.initialPrompt;
- interactionMode= c.interactionMode;
- interactionChoiceSetIDList= c.interactionChoiceSetIDList;
- helpPrompt= c.helpPrompt ? new std::vector<TTSChunk>(c.helpPrompt[0]) : 0;
- timeoutPrompt= c.timeoutPrompt ? new std::vector<TTSChunk>(c.timeoutPrompt[0]) : 0;
- timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
- vrHelp= c.vrHelp ? new std::vector<VrHelpItem>(c.vrHelp[0]) : 0;
-
- return *this;
-}
-
-
-PerformInteraction_request::~PerformInteraction_request(void)
-{
- if(helpPrompt)
- delete helpPrompt;
- if(timeoutPrompt)
- delete timeoutPrompt;
- if(timeout)
- delete timeout;
- if(vrHelp)
- delete vrHelp;
-}
-
-
-PerformInteraction_request::PerformInteraction_request(const PerformInteraction_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool PerformInteraction_request::checkIntegrity(void)
-{
- return PerformInteraction_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PerformInteraction_request::PerformInteraction_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- helpPrompt(0),
- timeoutPrompt(0),
- timeout(0),
- vrHelp(0)
-{
-}
-
-
-
-bool PerformInteraction_request::set_initialText(const std::string& initialText_)
-{
- if(initialText_.length()>500) return false;
- initialText=initialText_;
- return true;
-}
-
-bool PerformInteraction_request::set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_)
-{
- unsigned int i=initialPrompt_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(initialPrompt_[i])) return false;
- }
- initialPrompt=initialPrompt_;
- return true;
-}
-
-bool PerformInteraction_request::set_interactionMode(const InteractionMode& interactionMode_)
-{
- if(!InteractionModeMarshaller::checkIntegrityConst(interactionMode_)) return false;
- interactionMode=interactionMode_;
- return true;
-}
-
-bool PerformInteraction_request::set_interactionChoiceSetIDList(const std::vector<unsigned int>& interactionChoiceSetIDList_)
-{
- unsigned int i=interactionChoiceSetIDList_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(interactionChoiceSetIDList_[i]>2000000000) return false;
- }
- interactionChoiceSetIDList=interactionChoiceSetIDList_;
- return true;
-}
-
-bool PerformInteraction_request::set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_)
-{
- unsigned int i=helpPrompt_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(helpPrompt_[i])) return false;
- }
- delete helpPrompt;
- helpPrompt=0;
-
- helpPrompt=new std::vector<TTSChunk>(helpPrompt_);
- return true;
-}
-
-void PerformInteraction_request::reset_helpPrompt(void)
-{
- if(helpPrompt)
- delete helpPrompt;
- helpPrompt=0;
-}
-
-bool PerformInteraction_request::set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_)
-{
- unsigned int i=timeoutPrompt_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(timeoutPrompt_[i])) return false;
- }
- delete timeoutPrompt;
- timeoutPrompt=0;
-
- timeoutPrompt=new std::vector<TTSChunk>(timeoutPrompt_);
- return true;
-}
-
-void PerformInteraction_request::reset_timeoutPrompt(void)
-{
- if(timeoutPrompt)
- delete timeoutPrompt;
- timeoutPrompt=0;
-}
-
-bool PerformInteraction_request::set_timeout(unsigned int timeout_)
-{
- if(timeout_>100000) return false;
- if(timeout_<5000) return false;
- delete timeout;
- timeout=0;
-
- timeout=new unsigned int(timeout_);
- return true;
-}
-
-void PerformInteraction_request::reset_timeout(void)
-{
- if(timeout)
- delete timeout;
- timeout=0;
-}
-
-bool PerformInteraction_request::set_vrHelp(const std::vector<VrHelpItem>& vrHelp_)
-{
- unsigned int i=vrHelp_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VrHelpItemMarshaller::checkIntegrityConst(vrHelp_[i])) return false;
- }
- delete vrHelp;
- vrHelp=0;
-
- vrHelp=new std::vector<VrHelpItem>(vrHelp_);
- return true;
-}
-
-void PerformInteraction_request::reset_vrHelp(void)
-{
- if(vrHelp)
- delete vrHelp;
- vrHelp=0;
-}
-
-
-
-
-const std::string& PerformInteraction_request::get_initialText(void) const
-{
- return initialText;
-}
-
-const std::vector<TTSChunk>& PerformInteraction_request::get_initialPrompt(void) const
-{
- return initialPrompt;
-}
-
-const InteractionMode& PerformInteraction_request::get_interactionMode(void) const
-{
- return interactionMode;
-}
-
-const std::vector<unsigned int>& PerformInteraction_request::get_interactionChoiceSetIDList(void) const
-{
- return interactionChoiceSetIDList;
-}
-
-const std::vector<TTSChunk>* PerformInteraction_request::get_helpPrompt(void) const
-{
- return helpPrompt;
-}
-
-const std::vector<TTSChunk>* PerformInteraction_request::get_timeoutPrompt(void) const
-{
- return timeoutPrompt;
-}
-
-const unsigned int* PerformInteraction_request::get_timeout(void) const
-{
- return timeout;
-}
-
-const std::vector<VrHelpItem>* PerformInteraction_request::get_vrHelp(void) const
-{
- return vrHelp;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp
deleted file mode 100644
index 1541973c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-#include "InteractionModeMarshaller.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#include "PerformInteraction_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformInteraction_requestMarshaller::checkIntegrity(PerformInteraction_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PerformInteraction_requestMarshaller::fromString(const std::string& s,PerformInteraction_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PerformInteraction_requestMarshaller::toString(const PerformInteraction_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteraction_requestMarshaller::checkIntegrityConst(const PerformInteraction_request& s)
-{
- if(s.initialText.length()>500) return false;
- {
- unsigned int i=s.initialPrompt.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.initialPrompt[i])) return false;
- }
- }
- if(!InteractionModeMarshaller::checkIntegrityConst(s.interactionMode)) return false;
- {
- unsigned int i=s.interactionChoiceSetIDList.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.interactionChoiceSetIDList[i]>2000000000) return false;
- }
- }
- if(s.helpPrompt)
- {
- unsigned int i=s.helpPrompt[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.helpPrompt[0][i])) return false;
- }
- }
- if(s.timeoutPrompt)
- {
- unsigned int i=s.timeoutPrompt[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.timeoutPrompt[0][i])) return false;
- }
- }
- if(s.timeout && *s.timeout>100000) return false;
- if(s.timeout && *s.timeout<5000) return false;
- if(s.vrHelp)
- {
- unsigned int i=s.vrHelp[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VrHelpItemMarshaller::checkIntegrityConst(s.vrHelp[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value PerformInteraction_requestMarshaller::toJSON(const PerformInteraction_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["initialText"]=Json::Value(e.initialText);
-
- json["initialPrompt"]=Json::Value(Json::arrayValue);
- json["initialPrompt"].resize(e.initialPrompt.size());
- for(unsigned int i=0;i<e.initialPrompt.size();i++)
- json["initialPrompt"][i]=TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
- json["interactionMode"]=InteractionModeMarshaller::toJSON(e.interactionMode);
-
- json["interactionChoiceSetIDList"]=Json::Value(Json::arrayValue);
- json["interactionChoiceSetIDList"].resize(e.interactionChoiceSetIDList.size());
- for(unsigned int i=0;i<e.interactionChoiceSetIDList.size();i++)
- json["interactionChoiceSetIDList"][i]=Json::Value(e.interactionChoiceSetIDList[i]);
-
- if(e.helpPrompt)
- {
- unsigned int sz=e.helpPrompt->size();
- json["helpPrompt"]=Json::Value(Json::arrayValue);
- json["helpPrompt"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["helpPrompt"][i]=TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
- }
-
- if(e.timeoutPrompt)
- {
- unsigned int sz=e.timeoutPrompt->size();
- json["timeoutPrompt"]=Json::Value(Json::arrayValue);
- json["timeoutPrompt"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["timeoutPrompt"][i]=TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
- }
-
- if(e.timeout)
- json["timeout"]=Json::Value(*e.timeout);
-
- if(e.vrHelp)
- {
- unsigned int sz=e.vrHelp->size();
- json["vrHelp"]=Json::Value(Json::arrayValue);
- json["vrHelp"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["vrHelp"][i]=VrHelpItemMarshaller::toJSON(e.vrHelp[0][i]);
- }
-
- return json;
-}
-
-
-bool PerformInteraction_requestMarshaller::fromJSON(const Json::Value& json,PerformInteraction_request& c)
-{
- if(c.helpPrompt) delete c.helpPrompt;
- c.helpPrompt=0;
-
- if(c.timeoutPrompt) delete c.timeoutPrompt;
- c.timeoutPrompt=0;
-
- if(c.timeout) delete c.timeout;
- c.timeout=0;
-
- if(c.vrHelp) delete c.vrHelp;
- c.vrHelp=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("initialText")) return false;
- {
- const Json::Value& j=json["initialText"];
- if(!j.isString()) return false;
- c.initialText=j.asString();
- }
- if(!json.isMember("initialPrompt")) return false;
- {
- const Json::Value& j=json["initialPrompt"];
- if(!j.isArray()) return false;
- c.initialPrompt.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.initialPrompt[i]=t;
- }
-
- }
- if(!json.isMember("interactionMode")) return false;
- {
- const Json::Value& j=json["interactionMode"];
- if(!InteractionModeMarshaller::fromJSON(j,c.interactionMode))
- return false;
- }
- if(!json.isMember("interactionChoiceSetIDList")) return false;
- {
- const Json::Value& j=json["interactionChoiceSetIDList"];
- if(!j.isArray()) return false;
- c.interactionChoiceSetIDList.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isInt())
- return false;
- else
- c.interactionChoiceSetIDList[i]=j[i].asInt();
- }
- if(json.isMember("helpPrompt"))
- {
- const Json::Value& j=json["helpPrompt"];
- if(!j.isArray()) return false;
- c.helpPrompt=new std::vector<TTSChunk>();
- c.helpPrompt->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.helpPrompt[0][i]=t;
- }
-
- }
- if(json.isMember("timeoutPrompt"))
- {
- const Json::Value& j=json["timeoutPrompt"];
- if(!j.isArray()) return false;
- c.timeoutPrompt=new std::vector<TTSChunk>();
- c.timeoutPrompt->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.timeoutPrompt[0][i]=t;
- }
-
- }
- if(json.isMember("timeout"))
- {
- const Json::Value& j=json["timeout"];
- if(!j.isInt()) return false;
- c.timeout=new unsigned int(j.asInt());
- }
- if(json.isMember("vrHelp"))
- {
- const Json::Value& j=json["vrHelp"];
- if(!j.isArray()) return false;
- c.vrHelp=new std::vector<VrHelpItem>();
- c.vrHelp->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VrHelpItem t;
- if(!VrHelpItemMarshaller::fromJSON(j[i],t))
- return false;
- c.vrHelp[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h
deleted file mode 100644
index c41160c74..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PerformInteraction_requestMarshaller
- {
- static bool checkIntegrity(PerformInteraction_request& e);
- static bool checkIntegrityConst(const PerformInteraction_request& e);
-
- static bool fromString(const std::string& s,PerformInteraction_request& e);
- static const std::string toString(const PerformInteraction_request& e);
-
- static bool fromJSON(const Json::Value& s,PerformInteraction_request& e);
- static Json::Value toJSON(const PerformInteraction_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp
deleted file mode 100644
index 380fdb50e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-#include "PerformInteraction_responseMarshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformInteraction_response& PerformInteraction_response::operator =(const PerformInteraction_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- choiceID = c.choiceID ? new unsigned int(c.choiceID[0]) : 0;
- triggerSource = c.triggerSource ? new TriggerSource(c.triggerSource[0]) : 0;
-
- return *this;
-}
-
-
-PerformInteraction_response::~PerformInteraction_response(void)
-{
- if (choiceID)
- {
- delete choiceID;
- }
- if (triggerSource)
- {
- delete triggerSource;
- }
-}
-
-PerformInteraction_response::PerformInteraction_response(const PerformInteraction_response& c)
-{
- *this = c;
-}
-
-bool PerformInteraction_response::checkIntegrity(void)
-{
- return PerformInteraction_responseMarshaller::checkIntegrity(*this);
-}
-
-PerformInteraction_response::PerformInteraction_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , choiceID(0)
- , triggerSource(0)
-{
-}
-
-bool PerformInteraction_response::set_choiceID(unsigned int choiceID_)
-{
- if (choiceID_ > 2000000000)
- {
- return false;
- }
- delete choiceID;
- choiceID = 0;
-
- choiceID = new unsigned int(choiceID_);
- return true;
-}
-
-void PerformInteraction_response::reset_choiceID(void)
-{
- if (choiceID)
- {
- delete choiceID;
- }
- choiceID = 0;
-}
-
-bool PerformInteraction_response::set_triggerSource(const TriggerSource& triggerSource_)
-{
- if (!TriggerSourceMarshaller::checkIntegrityConst(triggerSource_))
- {
- return false;
- }
- delete triggerSource;
- triggerSource = 0;
-
- triggerSource = new TriggerSource(triggerSource_);
- return true;
-}
-
-void PerformInteraction_response::reset_triggerSource(void)
-{
- if (triggerSource)
- {
- delete triggerSource;
- }
- triggerSource = 0;
-}
-
-const unsigned int* PerformInteraction_response::get_choiceID(void) const
-{
- return choiceID;
-}
-
-const TriggerSource* PerformInteraction_response::get_triggerSource(void) const
-{
- return triggerSource;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp
deleted file mode 100644
index 55408aceb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-#include "ResultMarshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-#include "PerformInteraction_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformInteraction_responseMarshaller::checkIntegrity(PerformInteraction_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PerformInteraction_responseMarshaller::fromString(const std::string& s,PerformInteraction_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PerformInteraction_responseMarshaller::toString(const PerformInteraction_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteraction_responseMarshaller::checkIntegrityConst(const PerformInteraction_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.choiceID && *s.choiceID>2000000000) return false;
- if(s.triggerSource && !TriggerSourceMarshaller::checkIntegrityConst(*s.triggerSource)) return false;
- return true;
-}
-
-Json::Value PerformInteraction_responseMarshaller::toJSON(const PerformInteraction_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.choiceID)
- json["choiceID"]=Json::Value(*e.choiceID);
-
- if(e.triggerSource)
- json["triggerSource"]=TriggerSourceMarshaller::toJSON(*e.triggerSource);
-
- return json;
-}
-
-
-bool PerformInteraction_responseMarshaller::fromJSON(const Json::Value& json,PerformInteraction_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.choiceID) delete c.choiceID;
- c.choiceID=0;
-
- if(c.triggerSource) delete c.triggerSource;
- c.triggerSource=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("choiceID"))
- {
- const Json::Value& j=json["choiceID"];
- if(!j.isInt()) return false;
- c.choiceID=new unsigned int(j.asInt());
- }
- if(json.isMember("triggerSource"))
- {
- const Json::Value& j=json["triggerSource"];
- c.triggerSource=new TriggerSource();
- if(!TriggerSourceMarshaller::fromJSON(j,c.triggerSource[0]))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h
deleted file mode 100644
index 9de7a9e02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PerformInteraction_responseMarshaller
- {
- static bool checkIntegrity(PerformInteraction_response& e);
- static bool checkIntegrityConst(const PerformInteraction_response& e);
-
- static bool fromString(const std::string& s,PerformInteraction_response& e);
- static const std::string toString(const PerformInteraction_response& e);
-
- static bool fromJSON(const Json::Value& s,PerformInteraction_response& e);
- static Json::Value toJSON(const PerformInteraction_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp
deleted file mode 100644
index ec6d3ad97..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h"
-#include "PermissionItemMarshaller.h"
-#include "HMIPermissionsMarshaller.h"
-#include "ParameterPermissionsMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-PermissionItem::PermissionItem(const PermissionItem& c)
-{
- *this=c;
-}
-
-
-bool PermissionItem::checkIntegrity(void)
-{
- return PermissionItemMarshaller::checkIntegrity(*this);
-}
-
-
-PermissionItem::PermissionItem(void)
-{
-}
-
-
-
-bool PermissionItem::set_hmiPermissions(const HMIPermissions& hmiPermissions_)
-{
- if(!HMIPermissionsMarshaller::checkIntegrityConst(hmiPermissions_)) return false;
- hmiPermissions=hmiPermissions_;
- return true;
-}
-
-bool PermissionItem::set_parameterPermissions(const ParameterPermissions& parameterPermissions_)
-{
- if(!ParameterPermissionsMarshaller::checkIntegrityConst(parameterPermissions_)) return false;
- parameterPermissions=parameterPermissions_;
- return true;
-}
-
-bool PermissionItem::set_rpcName(const std::string& rpcName_)
-{
- if(rpcName_.length()>100) return false;
- rpcName=rpcName_;
- return true;
-}
-
-
-
-
-const HMIPermissions& PermissionItem::get_hmiPermissions(void) const
-{
- return hmiPermissions;
-}
-
-
-const ParameterPermissions& PermissionItem::get_parameterPermissions(void) const
-{
- return parameterPermissions;
-}
-
-
-const std::string& PermissionItem::get_rpcName(void) const
-{
- return rpcName;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp
deleted file mode 100644
index 1e8c75fd6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h"
-#include "HMIPermissionsMarshaller.h"
-#include "ParameterPermissionsMarshaller.h"
-
-#include "PermissionItemMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PermissionItemMarshaller::checkIntegrity(PermissionItem& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PermissionItemMarshaller::fromString(const std::string& s,PermissionItem& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PermissionItemMarshaller::toString(const PermissionItem& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PermissionItemMarshaller::checkIntegrityConst(const PermissionItem& s)
-{
- if(!HMIPermissionsMarshaller::checkIntegrityConst(s.hmiPermissions)) return false;
- if(!ParameterPermissionsMarshaller::checkIntegrityConst(s.parameterPermissions)) return false;
- if(s.rpcName.length()>100) return false;
- return true;
-}
-
-Json::Value PermissionItemMarshaller::toJSON(const PermissionItem& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["hmiPermissions"]=HMIPermissionsMarshaller::toJSON(e.hmiPermissions);
-
- json["parameterPermissions"]=ParameterPermissionsMarshaller::toJSON(e.parameterPermissions);
-
- json["rpcName"]=Json::Value(e.rpcName);
-
-
- return json;
-}
-
-
-bool PermissionItemMarshaller::fromJSON(const Json::Value& json,PermissionItem& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("hmiPermissions")) return false;
- {
- const Json::Value& j=json["hmiPermissions"];
- if(!HMIPermissionsMarshaller::fromJSON(j,c.hmiPermissions))
- return false;
- }
- if(!json.isMember("parameterPermissions")) return false;
- {
- const Json::Value& j=json["parameterPermissions"];
- if(!ParameterPermissionsMarshaller::fromJSON(j,c.parameterPermissions))
- return false;
- }
- if(!json.isMember("rpcName")) return false;
- {
- const Json::Value& j=json["rpcName"];
- if(!j.isString()) return false;
- c.rpcName=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h
deleted file mode 100644
index baf9a772c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERMISSIONITEMMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERMISSIONITEMMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PermissionItemMarshaller
- {
- static bool checkIntegrity(PermissionItem& e);
- static bool checkIntegrityConst(const PermissionItem& e);
-
- static bool fromString(const std::string& s,PermissionItem& e);
- static const std::string toString(const PermissionItem& e);
-
- static bool fromJSON(const Json::Value& s,PermissionItem& e);
- static Json::Value toJSON(const PermissionItem& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp
deleted file mode 100644
index e98b82f58..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h"
-#include "PermissionStatusMarshaller.h"
-#include "PermissionStatusMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const PermissionStatus::PermissionStatusInternal PermissionStatusMarshaller::getIndex(const char* s)
-{
- if(!s)
- return PermissionStatus::INVALID_ENUM;
- const struct PerfectHashTable* p=PermissionStatus_intHash::getPointer(s,strlen(s));
- return p ? static_cast<PermissionStatus::PermissionStatusInternal>(p->idx) : PermissionStatus::INVALID_ENUM;
-}
-
-
-bool PermissionStatusMarshaller::fromJSON(const Json::Value& s,PermissionStatus& e)
-{
- e.mInternal=PermissionStatus::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=PermissionStatus::INVALID_ENUM);
-}
-
-
-Json::Value PermissionStatusMarshaller::toJSON(const PermissionStatus& e)
-{
- if(e.mInternal==PermissionStatus::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool PermissionStatusMarshaller::fromString(const std::string& s,PermissionStatus& e)
-{
- e.mInternal=PermissionStatus::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string PermissionStatusMarshaller::toString(const PermissionStatus& e)
-{
- Json::FastWriter writer;
- return e.mInternal==PermissionStatus::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable PermissionStatusMarshaller::mHashTable[4]=
-{
- {"ALLOWED",0},
- {"DISALLOWED",1},
- {"USER_DISALLOWED",2},
- {"USER_CONSENT_PENDING",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp
deleted file mode 100644
index 162260ec4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name PermissionStatus_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-ALLOWED,0
-DISALLOWED,1
-USER_DISALLOWED,2
-USER_CONSENT_PENDING,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h
deleted file mode 100644
index 6ff13a367..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERMISSIONSTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERMISSIONSTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for PermissionStatus
-
- class PermissionStatusMarshaller
- {
- public:
-
- static std::string toName(const PermissionStatus& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(PermissionStatus& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=PermissionStatus::INVALID_ENUM;
- }
-
- static bool checkIntegrity(PermissionStatus& e) { return e.mInternal!=PermissionStatus::INVALID_ENUM; }
- static bool checkIntegrityConst(const PermissionStatus& e) { return e.mInternal!=PermissionStatus::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,PermissionStatus& e);
- static const std::string toString(const PermissionStatus& e);
-
- static bool fromJSON(const Json::Value& s,PermissionStatus& e);
- static Json::Value toJSON(const PermissionStatus& e);
-
- static const char* getName(PermissionStatus::PermissionStatusInternal e)
- {
- return (e>=0 && e<4) ? mHashTable[e].name : NULL;
- }
-
- static const PermissionStatus::PermissionStatusInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[4];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc
deleted file mode 100644
index 3e9834518..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 20
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 20
-/* maximum key range = 14, duplicates = 0 */
-
-class PermissionStatus_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-PermissionStatus_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-PermissionStatus_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 0, 0, 0,
- 0, 15, 0, 0, 0, 0, 20
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
- {"ALLOWED",0},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
- {"DISALLOWED",1},
- {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
- {"USER_DISALLOWED",2},
- {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
- {"USER_CONSENT_PENDING",3}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp
deleted file mode 100644
index 5c5a32a02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-#include "PresetBankCapabilitiesMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-PresetBankCapabilities::PresetBankCapabilities(const PresetBankCapabilities& c)
-{
- *this=c;
-}
-
-
-bool PresetBankCapabilities::checkIntegrity(void)
-{
- return PresetBankCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-PresetBankCapabilities::PresetBankCapabilities(void)
-{
-}
-
-
-
-bool PresetBankCapabilities::set_onScreenPresetsAvailable(bool onScreenPresetsAvailable_)
-{
- onScreenPresetsAvailable=onScreenPresetsAvailable_;
- return true;
-}
-
-
-
-
-bool PresetBankCapabilities::get_onScreenPresetsAvailable(void) const
-{
- return onScreenPresetsAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp
deleted file mode 100644
index a9b5efe8d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-
-
-#include "PresetBankCapabilitiesMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PresetBankCapabilitiesMarshaller::checkIntegrity(PresetBankCapabilities& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PresetBankCapabilitiesMarshaller::fromString(const std::string& s,PresetBankCapabilities& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PresetBankCapabilitiesMarshaller::toString(const PresetBankCapabilities& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PresetBankCapabilitiesMarshaller::checkIntegrityConst(const PresetBankCapabilities& s)
-{
- return true;
-}
-
-Json::Value PresetBankCapabilitiesMarshaller::toJSON(const PresetBankCapabilities& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["onScreenPresetsAvailable"]=Json::Value(e.onScreenPresetsAvailable);
-
-
- return json;
-}
-
-
-bool PresetBankCapabilitiesMarshaller::fromJSON(const Json::Value& json,PresetBankCapabilities& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("onScreenPresetsAvailable")) return false;
- {
- const Json::Value& j=json["onScreenPresetsAvailable"];
- if(!j.isBool()) return false;
- c.onScreenPresetsAvailable=j.asBool();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h
deleted file mode 100644
index fd0c4a776..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PRESETBANKCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PRESETBANKCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PresetBankCapabilitiesMarshaller
- {
- static bool checkIntegrity(PresetBankCapabilities& e);
- static bool checkIntegrityConst(const PresetBankCapabilities& e);
-
- static bool fromString(const std::string& s,PresetBankCapabilities& e);
- static const std::string toString(const PresetBankCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,PresetBankCapabilities& e);
- static Json::Value toJSON(const PresetBankCapabilities& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp
deleted file mode 100644
index 52260d301..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-#include "PutFile_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "FileTypeMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PutFile_request& PutFile_request::operator =(const PutFile_request& c)
-{
- syncFileName= c.syncFileName;
- fileType= c.fileType;
- persistentFile= c.persistentFile ? new bool(c.persistentFile[0]) : 0;
- fileData= c.fileData ? new std::string(c.fileData[0]) : 0;
-
- return *this;
-}
-
-
-PutFile_request::~PutFile_request(void)
-{
- if(persistentFile)
- delete persistentFile;
- if(fileData)
- delete fileData;
-}
-
-
-PutFile_request::PutFile_request(const PutFile_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool PutFile_request::checkIntegrity(void)
-{
- return PutFile_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PutFile_request::PutFile_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- persistentFile(0),
- fileData(0)
-{
-}
-
-
-
-bool PutFile_request::set_syncFileName(const std::string& syncFileName_)
-{
- if(syncFileName_.length()>500) return false;
- syncFileName=syncFileName_;
- return true;
-}
-
-bool PutFile_request::set_fileType(const FileType& fileType_)
-{
- if(!FileTypeMarshaller::checkIntegrityConst(fileType_)) return false;
- fileType=fileType_;
- return true;
-}
-
-bool PutFile_request::set_persistentFile(bool persistentFile_)
-{
- delete persistentFile;
- persistentFile=0;
-
- persistentFile=new bool(persistentFile_);
- return true;
-}
-
-void PutFile_request::reset_persistentFile(void)
-{
- if(persistentFile)
- delete persistentFile;
- persistentFile=0;
-}
-
-bool PutFile_request::set_fileData(const std::string& fileData_)
-{
- delete fileData;
- fileData=0;
-
- fileData=new std::string(fileData_);
- return true;
-}
-
-void PutFile_request::reset_fileData(void)
-{
- if(fileData)
- delete fileData;
- fileData=0;
-}
-
-
-
-
-const std::string& PutFile_request::get_syncFileName(void) const
-{
- return syncFileName;
-}
-
-const FileType& PutFile_request::get_fileType(void) const
-{
- return fileType;
-}
-
-const bool* PutFile_request::get_persistentFile(void) const
-{
- return persistentFile;
-}
-
-const std::string* PutFile_request::get_fileData(void) const
-{
- return fileData;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp
deleted file mode 100644
index d05375ace..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-#include "FileTypeMarshaller.h"
-
-#include "PutFile_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PutFile_requestMarshaller::checkIntegrity(PutFile_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PutFile_requestMarshaller::fromString(const std::string& s,PutFile_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PutFile_requestMarshaller::toString(const PutFile_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PutFile_requestMarshaller::checkIntegrityConst(const PutFile_request& s)
-{
- if(s.syncFileName.length()>500) return false;
- if(!FileTypeMarshaller::checkIntegrityConst(s.fileType)) return false;
- return true;
-}
-
-Json::Value PutFile_requestMarshaller::toJSON(const PutFile_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["syncFileName"]=Json::Value(e.syncFileName);
-
- json["fileType"]=FileTypeMarshaller::toJSON(e.fileType);
-
- if(e.persistentFile)
- json["persistentFile"]=Json::Value(*e.persistentFile);
-
- if(e.fileData)
- json["fileData"]=Json::Value(*e.fileData);
-
- return json;
-}
-
-
-bool PutFile_requestMarshaller::fromJSON(const Json::Value& json,PutFile_request& c)
-{
- if(c.persistentFile) delete c.persistentFile;
- c.persistentFile=0;
-
- if(c.fileData) delete c.fileData;
- c.fileData=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("syncFileName")) return false;
- {
- const Json::Value& j=json["syncFileName"];
- if(!j.isString()) return false;
- c.syncFileName=j.asString();
- }
- if(!json.isMember("fileType")) return false;
- {
- const Json::Value& j=json["fileType"];
- if(!FileTypeMarshaller::fromJSON(j,c.fileType))
- return false;
- }
- if(json.isMember("persistentFile"))
- {
- const Json::Value& j=json["persistentFile"];
- if(!j.isBool()) return false;
- c.persistentFile=new bool(j.asBool());
- }
- if(json.isMember("fileData"))
- {
- const Json::Value& j=json["fileData"];
- if(!j.isString()) return false;
- c.fileData=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h
deleted file mode 100644
index 73f081579..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PUTFILE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PUTFILE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PutFile_requestMarshaller
- {
- static bool checkIntegrity(PutFile_request& e);
- static bool checkIntegrityConst(const PutFile_request& e);
-
- static bool fromString(const std::string& s,PutFile_request& e);
- static const std::string toString(const PutFile_request& e);
-
- static bool fromJSON(const Json::Value& s,PutFile_request& e);
- static Json::Value toJSON(const PutFile_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp
deleted file mode 100644
index 6d7180b77..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-#include "PutFile_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PutFile_response& PutFile_response::operator =(const PutFile_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- spaceAvailable = c.spaceAvailable;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-
-PutFile_response::~PutFile_response(void)
-{}
-
-PutFile_response::PutFile_response(const PutFile_response& c)
-{
- *this = c;
-}
-
-bool PutFile_response::checkIntegrity(void)
-{
- return PutFile_responseMarshaller::checkIntegrity(*this);
-}
-
-PutFile_response::PutFile_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
-
-bool PutFile_response::set_spaceAvailable(unsigned int spaceAvailable_)
-{
- if (spaceAvailable_ > 2000000000)
- {
- return false;
- }
- spaceAvailable = spaceAvailable_;
- return true;
-}
-
-unsigned int PutFile_response::get_spaceAvailable(void) const
-{
- return spaceAvailable;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp
deleted file mode 100644
index 1f6141b2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-#include "ResultMarshaller.h"
-
-#include "PutFile_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PutFile_responseMarshaller::checkIntegrity(PutFile_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool PutFile_responseMarshaller::fromString(const std::string& s,PutFile_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string PutFile_responseMarshaller::toString(const PutFile_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PutFile_responseMarshaller::checkIntegrityConst(const PutFile_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.spaceAvailable>2000000000) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value PutFile_responseMarshaller::toJSON(const PutFile_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- json["spaceAvailable"]=Json::Value(e.spaceAvailable);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool PutFile_responseMarshaller::fromJSON(const Json::Value& json,PutFile_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(!json.isMember("spaceAvailable")) return false;
- {
- const Json::Value& j=json["spaceAvailable"];
- if(!j.isInt()) return false;
- c.spaceAvailable=j.asInt();
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h
deleted file mode 100644
index 4c2d9ca87..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PUTFILE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PUTFILE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct PutFile_responseMarshaller
- {
- static bool checkIntegrity(PutFile_response& e);
- static bool checkIntegrityConst(const PutFile_response& e);
-
- static bool fromString(const std::string& s,PutFile_response& e);
- static const std::string toString(const PutFile_response& e);
-
- static bool fromJSON(const Json::Value& s,PutFile_response& e);
- static Json::Value toJSON(const PutFile_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp
deleted file mode 100644
index c1db3fcfd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-#include "ReadDID_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ReadDID_request& ReadDID_request::operator =(const ReadDID_request& c)
-{
- ecuName= c.ecuName;
- didLocation= c.didLocation;
- encrypted= c.encrypted ? new bool(c.encrypted[0]) : 0;
-
- return *this;
-}
-
-
-ReadDID_request::~ReadDID_request(void)
-{
- if(encrypted)
- delete encrypted;
-}
-
-
-ReadDID_request::ReadDID_request(const ReadDID_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool ReadDID_request::checkIntegrity(void)
-{
- return ReadDID_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ReadDID_request::ReadDID_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- encrypted(0)
-{
-}
-
-
-
-bool ReadDID_request::set_ecuName(unsigned int ecuName_)
-{
- if(ecuName_>65535) return false;
- ecuName=ecuName_;
- return true;
-}
-
-bool ReadDID_request::set_didLocation(const std::vector<unsigned int>& didLocation_)
-{
- unsigned int i=didLocation_.size();
- if(i>1000 || i<0) return false;
- while(i--)
- {
- if(didLocation_[i]>65535) return false;
- }
- didLocation=didLocation_;
- return true;
-}
-
-bool ReadDID_request::set_encrypted(bool encrypted_)
-{
- delete encrypted;
- encrypted=0;
-
- encrypted=new bool(encrypted_);
- return true;
-}
-
-void ReadDID_request::reset_encrypted(void)
-{
- if(encrypted)
- delete encrypted;
- encrypted=0;
-}
-
-
-
-
-unsigned int ReadDID_request::get_ecuName(void) const
-{
- return ecuName;
-}
-
-const std::vector<unsigned int>& ReadDID_request::get_didLocation(void) const
-{
- return didLocation;
-}
-
-const bool* ReadDID_request::get_encrypted(void) const
-{
- return encrypted;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp
deleted file mode 100644
index 648d415f8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-
-
-#include "ReadDID_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ReadDID_requestMarshaller::checkIntegrity(ReadDID_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ReadDID_requestMarshaller::fromString(const std::string& s,ReadDID_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ReadDID_requestMarshaller::toString(const ReadDID_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ReadDID_requestMarshaller::checkIntegrityConst(const ReadDID_request& s)
-{
- if(s.ecuName>65535) return false;
- {
- unsigned int i=s.didLocation.size();
- if(i>1000 || i<0) return false;
- while(i--)
- {
- if(s.didLocation[i]>65535) return false;
- }
- }
- return true;
-}
-
-Json::Value ReadDID_requestMarshaller::toJSON(const ReadDID_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["ecuName"]=Json::Value(e.ecuName);
-
- json["didLocation"]=Json::Value(Json::arrayValue);
- json["didLocation"].resize(e.didLocation.size());
- for(unsigned int i=0;i<e.didLocation.size();i++)
- json["didLocation"][i]=Json::Value(e.didLocation[i]);
-
- if(e.encrypted)
- json["encrypted"]=Json::Value(*e.encrypted);
-
- return json;
-}
-
-
-bool ReadDID_requestMarshaller::fromJSON(const Json::Value& json,ReadDID_request& c)
-{
- if(c.encrypted) delete c.encrypted;
- c.encrypted=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("ecuName")) return false;
- {
- const Json::Value& j=json["ecuName"];
- if(!j.isInt()) return false;
- c.ecuName=j.asInt();
- }
- if(!json.isMember("didLocation")) return false;
- {
- const Json::Value& j=json["didLocation"];
- if(!j.isArray()) return false;
- c.didLocation.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isInt())
- return false;
- else
- c.didLocation[i]=j[i].asInt();
- }
- if(json.isMember("encrypted"))
- {
- const Json::Value& j=json["encrypted"];
- if(!j.isBool()) return false;
- c.encrypted=new bool(j.asBool());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h
deleted file mode 100644
index efa5d39a1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_READDID_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_READDID_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ReadDID_requestMarshaller
- {
- static bool checkIntegrity(ReadDID_request& e);
- static bool checkIntegrityConst(const ReadDID_request& e);
-
- static bool fromString(const std::string& s,ReadDID_request& e);
- static const std::string toString(const ReadDID_request& e);
-
- static bool fromJSON(const Json::Value& s,ReadDID_request& e);
- static Json::Value toJSON(const ReadDID_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp
deleted file mode 100644
index be08c903e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-#include "ReadDID_responseMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ReadDID_response& ReadDID_response::operator =(const ReadDID_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- dataResult = c.dataResult ? new std::vector<VehicleDataResultCode>(c.dataResult[0]) : 0;
- data = c.data ? new std::vector<std::string>(c.data[0]) : 0;
-
- return *this;
-}
-
-ReadDID_response::~ReadDID_response(void)
-{
- if (dataResult)
- {
- delete dataResult;
- }
- if (data)
- {
- delete data;
- }
-}
-
-ReadDID_response::ReadDID_response(const ReadDID_response& c)
-{
- *this = c;
-}
-
-bool ReadDID_response::checkIntegrity(void)
-{
- return ReadDID_responseMarshaller::checkIntegrity(*this);
-}
-
-ReadDID_response::ReadDID_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , dataResult(0)
- , data(0)
-{
-}
-
-bool ReadDID_response::set_dataResult(const std::vector<VehicleDataResultCode>& dataResult_)
-{
- unsigned int i = dataResult_.size();
- if (i > 1000 || i < 0) // TODO(AK): unsigned int i < 0
- {
- return false;
- }
- while (i--)
- {
- if (!VehicleDataResultCodeMarshaller::checkIntegrityConst(dataResult_[i]))
- {
- return false;
- }
- }
- delete dataResult;
- dataResult = 0;
-
- dataResult = new std::vector<VehicleDataResultCode>(dataResult_);
- return true;
-}
-
-void ReadDID_response::reset_dataResult(void)
-{
- if (dataResult)
- {
- delete dataResult;
- }
- dataResult = 0;
-}
-
-bool ReadDID_response::set_data(const std::vector<std::string>& data_)
-{
- unsigned int i = data_.size();
- if (i > 1000 || i < 0) // TODO(AK): unsigned int i < 0
- {
- return false;
- }
- while (i--)
- {
- if (data_[i].length() > 5000)
- {
- return false;
- }
- }
- delete data;
- data = 0;
-
- data = new std::vector<std::string>(data_);
- return true;
-}
-
-void ReadDID_response::reset_data(void)
-{
- if (data)
- {
- delete data;
- }
- data = 0;
-}
-
-const std::vector<VehicleDataResultCode>* ReadDID_response::get_dataResult(void) const
-{
- return dataResult;
-}
-
-const std::vector<std::string>* ReadDID_response::get_data(void) const
-{
- return data;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp
deleted file mode 100644
index bfadc37b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-#include "ResultMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.h"
-
-#include "ReadDID_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ReadDID_responseMarshaller::checkIntegrity(ReadDID_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ReadDID_responseMarshaller::fromString(const std::string& s,ReadDID_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ReadDID_responseMarshaller::toString(const ReadDID_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ReadDID_responseMarshaller::checkIntegrityConst(const ReadDID_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.dataResult)
- {
- unsigned int i=s.dataResult[0].size();
- if(i>1000 || i<0) return false;
- while(i--)
- {
- if(!VehicleDataResultCodeMarshaller::checkIntegrityConst(s.dataResult[0][i])) return false;
- }
- }
- if(s.data)
- {
- unsigned int i=s.data[0].size();
- if(i>1000 || i<0) return false;
- while(i--)
- {
- if(s.data[0][i].length()>5000) return false;
- }
- }
- return true;
-}
-
-Json::Value ReadDID_responseMarshaller::toJSON(const ReadDID_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.dataResult)
- {
- unsigned int sz=e.dataResult->size();
- json["dataResult"]=Json::Value(Json::arrayValue);
- json["dataResult"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["dataResult"][i]=VehicleDataResultCodeMarshaller::toJSON(e.dataResult[0][i]);
- }
-
- if(e.data)
- {
- unsigned int sz=e.data->size();
- json["data"]=Json::Value(Json::arrayValue);
- json["data"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["data"][i]=Json::Value(e.data[0][i]);
- }
-
- return json;
-}
-
-
-bool ReadDID_responseMarshaller::fromJSON(const Json::Value& json,ReadDID_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.dataResult) delete c.dataResult;
- c.dataResult=0;
-
- if(c.data) delete c.data;
- c.data=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("dataResult"))
- {
- const Json::Value& j=json["dataResult"];
- if(!j.isArray()) return false;
- c.dataResult=new std::vector<VehicleDataResultCode>();
- c.dataResult->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VehicleDataResultCode t;
- if(!VehicleDataResultCodeMarshaller::fromJSON(j[i],t))
- return false;
- c.dataResult[0][i]=t;
- }
-
- }
- if(json.isMember("data"))
- {
- const Json::Value& j=json["data"];
- if(!j.isArray()) return false;
- c.data=new std::vector<std::string>();
- c.data->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.data[0][i]=j[i].asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h
deleted file mode 100644
index 332ea17ad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_READDID_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_READDID_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ReadDID_responseMarshaller
- {
- static bool checkIntegrity(ReadDID_response& e);
- static bool checkIntegrityConst(const ReadDID_response& e);
-
- static bool fromString(const std::string& s,ReadDID_response& e);
- static const std::string toString(const ReadDID_response& e);
-
- static bool fromJSON(const Json::Value& s,ReadDID_response& e);
- static Json::Value toJSON(const ReadDID_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp
deleted file mode 100644
index c79ab4b0f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-#include "RegisterAppInterface_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-RegisterAppInterface_request& RegisterAppInterface_request::operator =(const RegisterAppInterface_request& c)
-{
- syncMsgVersion= c.syncMsgVersion;
- appName= c.appName;
- ttsName= c.ttsName ? new std::vector<TTSChunk>(c.ttsName[0]) : 0;
- ngnMediaScreenAppName= c.ngnMediaScreenAppName ? new std::string(c.ngnMediaScreenAppName[0]) : 0;
- vrSynonyms= c.vrSynonyms ? new std::vector<std::string>(c.vrSynonyms[0]) : 0;
- isMediaApplication= c.isMediaApplication;
- languageDesired= c.languageDesired;
- hmiDisplayLanguageDesired= c.hmiDisplayLanguageDesired;
- appType= c.appType ? new std::vector<AppType>(c.appType[0]) : 0;
- appID= c.appID;
-
- return *this;
-}
-
-
-RegisterAppInterface_request::~RegisterAppInterface_request(void)
-{
- if(ttsName)
- delete ttsName;
- if(ngnMediaScreenAppName)
- delete ngnMediaScreenAppName;
- if(vrSynonyms)
- delete vrSynonyms;
- if(appType)
- delete appType;
-}
-
-
-RegisterAppInterface_request::RegisterAppInterface_request(const RegisterAppInterface_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool RegisterAppInterface_request::checkIntegrity(void)
-{
- return RegisterAppInterface_requestMarshaller::checkIntegrity(*this);
-}
-
-
-RegisterAppInterface_request::RegisterAppInterface_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- ttsName(0),
- ngnMediaScreenAppName(0),
- vrSynonyms(0),
- appType(0)
-{
-}
-
-
-
-bool RegisterAppInterface_request::set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_)
-{
- if(!SyncMsgVersionMarshaller::checkIntegrityConst(syncMsgVersion_)) return false;
- syncMsgVersion=syncMsgVersion_;
- return true;
-}
-
-bool RegisterAppInterface_request::set_appName(const std::string& appName_)
-{
- if(appName_.length()>100) return false;
- appName=appName_;
- return true;
-}
-
-bool RegisterAppInterface_request::set_ttsName(const std::vector<TTSChunk>& ttsName_)
-{
- unsigned int i=ttsName_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(ttsName_[i])) return false;
- }
- delete ttsName;
- ttsName=0;
-
- ttsName=new std::vector<TTSChunk>(ttsName_);
- return true;
-}
-
-void RegisterAppInterface_request::reset_ttsName(void)
-{
- if(ttsName)
- delete ttsName;
- ttsName=0;
-}
-
-bool RegisterAppInterface_request::set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_)
-{
- if(ngnMediaScreenAppName_.length()>100) return false;
- delete ngnMediaScreenAppName;
- ngnMediaScreenAppName=0;
-
- ngnMediaScreenAppName=new std::string(ngnMediaScreenAppName_);
- return true;
-}
-
-void RegisterAppInterface_request::reset_ngnMediaScreenAppName(void)
-{
- if(ngnMediaScreenAppName)
- delete ngnMediaScreenAppName;
- ngnMediaScreenAppName=0;
-}
-
-bool RegisterAppInterface_request::set_vrSynonyms(const std::vector<std::string>& vrSynonyms_)
-{
- unsigned int i=vrSynonyms_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(vrSynonyms_[i].length()>40) return false;
- }
- delete vrSynonyms;
- vrSynonyms=0;
-
- vrSynonyms=new std::vector<std::string>(vrSynonyms_);
- return true;
-}
-
-void RegisterAppInterface_request::reset_vrSynonyms(void)
-{
- if(vrSynonyms)
- delete vrSynonyms;
- vrSynonyms=0;
-}
-
-bool RegisterAppInterface_request::set_isMediaApplication(bool isMediaApplication_)
-{
- isMediaApplication=isMediaApplication_;
- return true;
-}
-
-bool RegisterAppInterface_request::set_languageDesired(const Language& languageDesired_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(languageDesired_)) return false;
- languageDesired=languageDesired_;
- return true;
-}
-
-bool RegisterAppInterface_request::set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_)
-{
- if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguageDesired_)) return false;
- hmiDisplayLanguageDesired=hmiDisplayLanguageDesired_;
- return true;
-}
-
-bool RegisterAppInterface_request::set_appType(const std::vector<AppType>& appType_)
-{
- unsigned int i=appType_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!AppTypeMarshaller::checkIntegrityConst(appType_[i])) return false;
- }
- delete appType;
- appType=0;
-
- appType=new std::vector<AppType>(appType_);
- return true;
-}
-
-void RegisterAppInterface_request::reset_appType(void)
-{
- if(appType)
- delete appType;
- appType=0;
-}
-
-bool RegisterAppInterface_request::set_appID(const std::string& appID_)
-{
- if(appID_.length()>100) return false;
- appID=appID_;
- return true;
-}
-
-
-
-
-const SyncMsgVersion& RegisterAppInterface_request::get_syncMsgVersion(void) const
-{
- return syncMsgVersion;
-}
-
-const std::string& RegisterAppInterface_request::get_appName(void) const
-{
- return appName;
-}
-
-const std::vector<TTSChunk>* RegisterAppInterface_request::get_ttsName(void) const
-{
- return ttsName;
-}
-
-const std::string* RegisterAppInterface_request::get_ngnMediaScreenAppName(void) const
-{
- return ngnMediaScreenAppName;
-}
-
-const std::vector<std::string>* RegisterAppInterface_request::get_vrSynonyms(void) const
-{
- return vrSynonyms;
-}
-
-bool RegisterAppInterface_request::get_isMediaApplication(void) const
-{
- return isMediaApplication;
-}
-
-const Language& RegisterAppInterface_request::get_languageDesired(void) const
-{
- return languageDesired;
-}
-
-const Language& RegisterAppInterface_request::get_hmiDisplayLanguageDesired(void) const
-{
- return hmiDisplayLanguageDesired;
-}
-
-const std::vector<AppType>* RegisterAppInterface_request::get_appType(void) const
-{
- return appType;
-}
-
-const std::string& RegisterAppInterface_request::get_appID(void) const
-{
- return appID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp
deleted file mode 100644
index bbd481ebf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "RegisterAppInterface_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool RegisterAppInterface_requestMarshaller::checkIntegrity(RegisterAppInterface_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool RegisterAppInterface_requestMarshaller::fromString(const std::string& s,RegisterAppInterface_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string RegisterAppInterface_requestMarshaller::toString(const RegisterAppInterface_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool RegisterAppInterface_requestMarshaller::checkIntegrityConst(const RegisterAppInterface_request& s)
-{
- if(!SyncMsgVersionMarshaller::checkIntegrityConst(s.syncMsgVersion)) return false;
- if(s.appName.length()>100) return false;
- if(s.ttsName)
- {
- unsigned int i=s.ttsName[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsName[0][i])) return false;
- }
- }
- if(s.ngnMediaScreenAppName && s.ngnMediaScreenAppName->length()>100) return false;
- if(s.vrSynonyms)
- {
- unsigned int i=s.vrSynonyms[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(s.vrSynonyms[0][i].length()>40) return false;
- }
- }
- if(!LanguageMarshaller::checkIntegrityConst(s.languageDesired)) return false;
- if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguageDesired)) return false;
- if(s.appType)
- {
- unsigned int i=s.appType[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!AppTypeMarshaller::checkIntegrityConst(s.appType[0][i])) return false;
- }
- }
- if(s.appID.length()>100) return false;
- return true;
-}
-
-Json::Value RegisterAppInterface_requestMarshaller::toJSON(const RegisterAppInterface_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["syncMsgVersion"]=SyncMsgVersionMarshaller::toJSON(e.syncMsgVersion);
-
- json["appName"]=Json::Value(e.appName);
-
- if(e.ttsName)
- {
- unsigned int sz=e.ttsName->size();
- json["ttsName"]=Json::Value(Json::arrayValue);
- json["ttsName"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["ttsName"][i]=TTSChunkMarshaller::toJSON(e.ttsName[0][i]);
- }
-
- if(e.ngnMediaScreenAppName)
- json["ngnMediaScreenAppName"]=Json::Value(*e.ngnMediaScreenAppName);
-
- if(e.vrSynonyms)
- {
- unsigned int sz=e.vrSynonyms->size();
- json["vrSynonyms"]=Json::Value(Json::arrayValue);
- json["vrSynonyms"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["vrSynonyms"][i]=Json::Value(e.vrSynonyms[0][i]);
- }
-
- json["isMediaApplication"]=Json::Value(e.isMediaApplication);
-
- json["languageDesired"]=LanguageMarshaller::toJSON(e.languageDesired);
-
- json["hmiDisplayLanguageDesired"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguageDesired);
-
- if(e.appType)
- {
- unsigned int sz=e.appType->size();
- json["appType"]=Json::Value(Json::arrayValue);
- json["appType"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["appType"][i]=AppTypeMarshaller::toJSON(e.appType[0][i]);
- }
-
- json["appID"]=Json::Value(e.appID);
-
- return json;
-}
-
-
-bool RegisterAppInterface_requestMarshaller::fromJSON(const Json::Value& json,RegisterAppInterface_request& c)
-{
- if(c.ttsName) delete c.ttsName;
- c.ttsName=0;
-
- if(c.ngnMediaScreenAppName) delete c.ngnMediaScreenAppName;
- c.ngnMediaScreenAppName=0;
-
- if(c.vrSynonyms) delete c.vrSynonyms;
- c.vrSynonyms=0;
-
- if(c.appType) delete c.appType;
- c.appType=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("syncMsgVersion")) return false;
- {
- const Json::Value& j=json["syncMsgVersion"];
- if(!SyncMsgVersionMarshaller::fromJSON(j,c.syncMsgVersion))
- return false;
- }
- if(!json.isMember("appName")) return false;
- {
- const Json::Value& j=json["appName"];
- if(!j.isString()) return false;
- c.appName=j.asString();
- }
- if(json.isMember("ttsName"))
- {
- const Json::Value& j=json["ttsName"];
- if(!j.isArray()) return false;
- c.ttsName=new std::vector<TTSChunk>();
- c.ttsName->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.ttsName[0][i]=t;
- }
-
- }
- if(json.isMember("ngnMediaScreenAppName"))
- {
- const Json::Value& j=json["ngnMediaScreenAppName"];
- if(!j.isString()) return false;
- c.ngnMediaScreenAppName=new std::string(j.asString());
- }
- if(json.isMember("vrSynonyms"))
- {
- const Json::Value& j=json["vrSynonyms"];
- if(!j.isArray()) return false;
- c.vrSynonyms=new std::vector<std::string>();
- c.vrSynonyms->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.vrSynonyms[0][i]=j[i].asString();
- }
- if(!json.isMember("isMediaApplication")) return false;
- {
- const Json::Value& j=json["isMediaApplication"];
- if(!j.isBool()) return false;
- c.isMediaApplication=j.asBool();
- }
- if(!json.isMember("languageDesired")) return false;
- {
- const Json::Value& j=json["languageDesired"];
- if(!LanguageMarshaller::fromJSON(j,c.languageDesired))
- return false;
- }
- if(!json.isMember("hmiDisplayLanguageDesired")) return false;
- {
- const Json::Value& j=json["hmiDisplayLanguageDesired"];
- if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguageDesired))
- return false;
- }
- if(json.isMember("appType"))
- {
- const Json::Value& j=json["appType"];
- if(!j.isArray()) return false;
- c.appType=new std::vector<AppType>();
- c.appType->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- AppType t;
- if(!AppTypeMarshaller::fromJSON(j[i],t))
- return false;
- c.appType[0][i]=t;
- }
-
- }
- if(!json.isMember("appID")) return false;
- {
- const Json::Value& j=json["appID"];
- if(!j.isString()) return false;
- c.appID=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h
deleted file mode 100644
index 7dcd66db2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct RegisterAppInterface_requestMarshaller
- {
- static bool checkIntegrity(RegisterAppInterface_request& e);
- static bool checkIntegrityConst(const RegisterAppInterface_request& e);
-
- static bool fromString(const std::string& s,RegisterAppInterface_request& e);
- static const std::string toString(const RegisterAppInterface_request& e);
-
- static bool fromJSON(const Json::Value& s,RegisterAppInterface_request& e);
- static Json::Value toJSON(const RegisterAppInterface_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp
deleted file mode 100644
index ecd938a0f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-#include "RegisterAppInterface_responseMarshaller.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "PresetBankCapabilitiesMarshaller.h"
-#include "SoftButtonCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "VehicleTypeMarshaller.h"
-#include "VrCapabilitiesMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-RegisterAppInterface_response& RegisterAppInterface_response::operator =(const RegisterAppInterface_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- syncMsgVersion = c.syncMsgVersion ? new SyncMsgVersion(c.syncMsgVersion[0]) : 0;
- language = c.language ? new Language(c.language[0]) : 0;
- hmiDisplayLanguage = c.hmiDisplayLanguage ? new Language(c.hmiDisplayLanguage[0]) : 0;
- displayCapabilities = c.displayCapabilities ? new DisplayCapabilities(c.displayCapabilities[0]) : 0;
- buttonCapabilities = c.buttonCapabilities ? new std::vector<ButtonCapabilities>(c.buttonCapabilities[0]) : 0;
- softButtonCapabilities = c.softButtonCapabilities ? new std::vector<SoftButtonCapabilities>(c.softButtonCapabilities[0]) : 0;
- presetBankCapabilities = c.presetBankCapabilities ? new PresetBankCapabilities(c.presetBankCapabilities[0]) : 0;
- hmiZoneCapabilities = c.hmiZoneCapabilities ? new std::vector<HmiZoneCapabilities>(c.hmiZoneCapabilities[0]) : 0;
- speechCapabilities = c.speechCapabilities ? new std::vector<SpeechCapabilities>(c.speechCapabilities[0]) : 0;
- vrCapabilities = c.vrCapabilities ? new std::vector<VrCapabilities>(c.vrCapabilities[0]) : 0;
- vehicleType = c.vehicleType ? new VehicleType(c.vehicleType[0]) : 0;
-
- return *this;
-}
-
-RegisterAppInterface_response::~RegisterAppInterface_response(void)
-{
- if (syncMsgVersion)
- {
- delete syncMsgVersion;
- }
- if (language)
- {
- delete language;
- }
- if (hmiDisplayLanguage)
- {
- delete hmiDisplayLanguage;
- }
- if (displayCapabilities)
- {
- delete displayCapabilities;
- }
- if (buttonCapabilities)
- {
- delete buttonCapabilities;
- }
- if (softButtonCapabilities)
- {
- delete softButtonCapabilities;
- }
- if (presetBankCapabilities)
- {
- delete presetBankCapabilities;
- }
- if (hmiZoneCapabilities)
- {
- delete hmiZoneCapabilities;
- }
- if (speechCapabilities)
- {
- delete speechCapabilities;
- }
- if (vrCapabilities)
- {
- delete vrCapabilities;
- }
- if (vehicleType)
- {
- delete vehicleType;
- }
-}
-
-RegisterAppInterface_response::RegisterAppInterface_response(const RegisterAppInterface_response& c)
-{
- *this = c;
-}
-
-bool RegisterAppInterface_response::checkIntegrity(void)
-{
- return RegisterAppInterface_responseMarshaller::checkIntegrity(*this);
-}
-
-RegisterAppInterface_response::RegisterAppInterface_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , syncMsgVersion(0)
- , language(0)
- , hmiDisplayLanguage(0)
- , displayCapabilities(0)
- , buttonCapabilities(0)
- , softButtonCapabilities(0)
- , presetBankCapabilities(0)
- , hmiZoneCapabilities(0)
- , speechCapabilities(0)
- , vrCapabilities(0)
- , vehicleType(0)
-{
-}
-
-bool RegisterAppInterface_response::set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_)
-{
- if (!SyncMsgVersionMarshaller::checkIntegrityConst(syncMsgVersion_))
- {
- return false;
- }
- delete syncMsgVersion;
- syncMsgVersion = 0;
-
- syncMsgVersion = new SyncMsgVersion(syncMsgVersion_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_syncMsgVersion(void)
-{
- if (syncMsgVersion)
- {
- delete syncMsgVersion;
- }
- syncMsgVersion = 0;
-}
-
-bool RegisterAppInterface_response::set_language(const Language& language_)
-{
- if (!LanguageMarshaller::checkIntegrityConst(language_))
- {
- return false;
- }
- delete language;
- language = 0;
-
- language = new Language(language_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_language(void)
-{
- if (language)
- {
- delete language;
- }
- language = 0;
-}
-
-bool RegisterAppInterface_response::set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_)
-{
- if (!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguage_))
- {
- return false;
- }
- delete hmiDisplayLanguage;
- hmiDisplayLanguage = 0;
-
- hmiDisplayLanguage = new Language(hmiDisplayLanguage_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_hmiDisplayLanguage(void)
-{
- if (hmiDisplayLanguage)
- {
- delete hmiDisplayLanguage;
- }
- hmiDisplayLanguage = 0;
-}
-
-bool RegisterAppInterface_response::set_displayCapabilities(const DisplayCapabilities& displayCapabilities_)
-{
- if (!DisplayCapabilitiesMarshaller::checkIntegrityConst(displayCapabilities_))
- {
- return false;
- }
- delete displayCapabilities;
- displayCapabilities = 0;
-
- displayCapabilities = new DisplayCapabilities(displayCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_displayCapabilities(void)
-{
- if (displayCapabilities)
- {
- delete displayCapabilities;
- }
- displayCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_buttonCapabilities(const std::vector<ButtonCapabilities>& buttonCapabilities_)
-{
- unsigned int i = buttonCapabilities_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!ButtonCapabilitiesMarshaller::checkIntegrityConst(buttonCapabilities_[i]))
- {
- return false;
- }
- }
- delete buttonCapabilities;
- buttonCapabilities = 0;
-
- buttonCapabilities = new std::vector<ButtonCapabilities>(buttonCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_buttonCapabilities(void)
-{
- if (buttonCapabilities)
- {
- delete buttonCapabilities;
- }
- buttonCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_softButtonCapabilities(const std::vector<SoftButtonCapabilities>& softButtonCapabilities_)
-{
- unsigned int i = softButtonCapabilities_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!SoftButtonCapabilitiesMarshaller::checkIntegrityConst(softButtonCapabilities_[i]))
- {
- return false;
- }
- }
- delete softButtonCapabilities;
- softButtonCapabilities = 0;
-
- softButtonCapabilities = new std::vector<SoftButtonCapabilities>(softButtonCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_softButtonCapabilities(void)
-{
- if (softButtonCapabilities)
- {
- delete softButtonCapabilities;
- }
- softButtonCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_presetBankCapabilities(const PresetBankCapabilities& presetBankCapabilities_)
-{
- if (!PresetBankCapabilitiesMarshaller::checkIntegrityConst(presetBankCapabilities_))
- {
- return false;
- }
- delete presetBankCapabilities;
- presetBankCapabilities = 0;
-
- presetBankCapabilities = new PresetBankCapabilities(presetBankCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_presetBankCapabilities(void)
-{
- if (presetBankCapabilities)
- {
- delete presetBankCapabilities;
- }
- presetBankCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_hmiZoneCapabilities(const std::vector<HmiZoneCapabilities>& hmiZoneCapabilities_)
-{
- unsigned int i = hmiZoneCapabilities_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!HmiZoneCapabilitiesMarshaller::checkIntegrityConst(hmiZoneCapabilities_[i]))
- {
- return false;
- }
- }
- delete hmiZoneCapabilities;
- hmiZoneCapabilities = 0;
-
- hmiZoneCapabilities = new std::vector<HmiZoneCapabilities>(hmiZoneCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_hmiZoneCapabilities(void)
-{
- if (hmiZoneCapabilities)
- {
- delete hmiZoneCapabilities;
- }
- hmiZoneCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_speechCapabilities(const std::vector<SpeechCapabilities>& speechCapabilities_)
-{
- unsigned int i = speechCapabilities_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!SpeechCapabilitiesMarshaller::checkIntegrityConst(speechCapabilities_[i]))
- {
- return false;
- }
- }
- delete speechCapabilities;
- speechCapabilities = 0;
-
- speechCapabilities = new std::vector<SpeechCapabilities>(speechCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_speechCapabilities(void)
-{
- if (speechCapabilities)
- {
- delete speechCapabilities;
- }
- speechCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_vrCapabilities(const std::vector<VrCapabilities>& vrCapabilities_)
-{
- unsigned int i = vrCapabilities_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!VrCapabilitiesMarshaller::checkIntegrityConst(vrCapabilities_[i]))
- {
- return false;
- }
- }
- delete vrCapabilities;
- vrCapabilities = 0;
-
- vrCapabilities = new std::vector<VrCapabilities>(vrCapabilities_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_vrCapabilities(void)
-{
- if (vrCapabilities)
- {
- delete vrCapabilities;
- }
- vrCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_vehicleType(const VehicleType& vehicleType_)
-{
- if (!VehicleTypeMarshaller::checkIntegrityConst(vehicleType_))
- {
- return false;
- }
- delete vehicleType;
- vehicleType = 0;
-
- vehicleType = new VehicleType(vehicleType_);
- return true;
-}
-
-void RegisterAppInterface_response::reset_vehicleType(void)
-{
- if (vehicleType)
- {
- delete vehicleType;
- }
- vehicleType = 0;
-}
-
-const SyncMsgVersion* RegisterAppInterface_response::get_syncMsgVersion(void) const
-{
- return syncMsgVersion;
-}
-
-const Language* RegisterAppInterface_response::get_language(void) const
-{
- return language;
-}
-
-const Language* RegisterAppInterface_response::get_hmiDisplayLanguage(void) const
-{
- return hmiDisplayLanguage;
-}
-
-const DisplayCapabilities* RegisterAppInterface_response::get_displayCapabilities(void) const
-{
- return displayCapabilities;
-}
-
-const std::vector<ButtonCapabilities>* RegisterAppInterface_response::get_buttonCapabilities(void) const
-{
- return buttonCapabilities;
-}
-
-const std::vector<SoftButtonCapabilities>* RegisterAppInterface_response::get_softButtonCapabilities(void) const
-{
- return softButtonCapabilities;
-}
-
-const PresetBankCapabilities* RegisterAppInterface_response::get_presetBankCapabilities(void) const
-{
- return presetBankCapabilities;
-}
-
-const std::vector<HmiZoneCapabilities>* RegisterAppInterface_response::get_hmiZoneCapabilities(void) const
-{
- return hmiZoneCapabilities;
-}
-
-const std::vector<SpeechCapabilities>* RegisterAppInterface_response::get_speechCapabilities(void) const
-{
- return speechCapabilities;
-}
-
-const std::vector<VrCapabilities>* RegisterAppInterface_response::get_vrCapabilities(void) const
-{
- return vrCapabilities;
-}
-
-const VehicleType* RegisterAppInterface_response::get_vehicleType(void) const
-{
- return vehicleType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp
deleted file mode 100644
index 1cafea7c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "PresetBankCapabilitiesMarshaller.h"
-#include "ResultMarshaller.h"
-#include "SoftButtonCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "VehicleTypeMarshaller.h"
-#include "VrCapabilitiesMarshaller.h"
-
-#include "RegisterAppInterface_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool RegisterAppInterface_responseMarshaller::checkIntegrity(RegisterAppInterface_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool RegisterAppInterface_responseMarshaller::fromString(const std::string& s,RegisterAppInterface_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string RegisterAppInterface_responseMarshaller::toString(const RegisterAppInterface_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool RegisterAppInterface_responseMarshaller::checkIntegrityConst(const RegisterAppInterface_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.syncMsgVersion && !SyncMsgVersionMarshaller::checkIntegrityConst(*s.syncMsgVersion)) return false;
- if(s.language && !LanguageMarshaller::checkIntegrityConst(*s.language)) return false;
- if(s.hmiDisplayLanguage && !LanguageMarshaller::checkIntegrityConst(*s.hmiDisplayLanguage)) return false;
- if(s.displayCapabilities && !DisplayCapabilitiesMarshaller::checkIntegrityConst(*s.displayCapabilities)) return false;
- if(s.buttonCapabilities)
- {
- unsigned int i=s.buttonCapabilities[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!ButtonCapabilitiesMarshaller::checkIntegrityConst(s.buttonCapabilities[0][i])) return false;
- }
- }
- if(s.softButtonCapabilities)
- {
- unsigned int i=s.softButtonCapabilities[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!SoftButtonCapabilitiesMarshaller::checkIntegrityConst(s.softButtonCapabilities[0][i])) return false;
- }
- }
- if(s.presetBankCapabilities && !PresetBankCapabilitiesMarshaller::checkIntegrityConst(*s.presetBankCapabilities)) return false;
- if(s.hmiZoneCapabilities)
- {
- unsigned int i=s.hmiZoneCapabilities[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!HmiZoneCapabilitiesMarshaller::checkIntegrityConst(s.hmiZoneCapabilities[0][i])) return false;
- }
- }
- if(s.speechCapabilities)
- {
- unsigned int i=s.speechCapabilities[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(s.speechCapabilities[0][i])) return false;
- }
- }
- if(s.vrCapabilities)
- {
- unsigned int i=s.vrCapabilities[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VrCapabilitiesMarshaller::checkIntegrityConst(s.vrCapabilities[0][i])) return false;
- }
- }
- if(s.vehicleType && !VehicleTypeMarshaller::checkIntegrityConst(*s.vehicleType)) return false;
- return true;
-}
-
-Json::Value RegisterAppInterface_responseMarshaller::toJSON(const RegisterAppInterface_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.syncMsgVersion)
- json["syncMsgVersion"]=SyncMsgVersionMarshaller::toJSON(*e.syncMsgVersion);
-
- if(e.language)
- json["language"]=LanguageMarshaller::toJSON(*e.language);
-
- if(e.hmiDisplayLanguage)
- json["hmiDisplayLanguage"]=LanguageMarshaller::toJSON(*e.hmiDisplayLanguage);
-
- if(e.displayCapabilities)
- json["displayCapabilities"]=DisplayCapabilitiesMarshaller::toJSON(*e.displayCapabilities);
-
- if(e.buttonCapabilities)
- {
- unsigned int sz=e.buttonCapabilities->size();
- json["buttonCapabilities"]=Json::Value(Json::arrayValue);
- json["buttonCapabilities"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["buttonCapabilities"][i]=ButtonCapabilitiesMarshaller::toJSON(e.buttonCapabilities[0][i]);
- }
-
- if(e.softButtonCapabilities)
- {
- unsigned int sz=e.softButtonCapabilities->size();
- json["softButtonCapabilities"]=Json::Value(Json::arrayValue);
- json["softButtonCapabilities"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["softButtonCapabilities"][i]=SoftButtonCapabilitiesMarshaller::toJSON(e.softButtonCapabilities[0][i]);
- }
-
- if(e.presetBankCapabilities)
- json["presetBankCapabilities"]=PresetBankCapabilitiesMarshaller::toJSON(*e.presetBankCapabilities);
-
- if(e.hmiZoneCapabilities)
- {
- unsigned int sz=e.hmiZoneCapabilities->size();
- json["hmiZoneCapabilities"]=Json::Value(Json::arrayValue);
- json["hmiZoneCapabilities"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["hmiZoneCapabilities"][i]=HmiZoneCapabilitiesMarshaller::toJSON(e.hmiZoneCapabilities[0][i]);
- }
-
- if(e.speechCapabilities)
- {
- unsigned int sz=e.speechCapabilities->size();
- json["speechCapabilities"]=Json::Value(Json::arrayValue);
- json["speechCapabilities"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["speechCapabilities"][i]=SpeechCapabilitiesMarshaller::toJSON(e.speechCapabilities[0][i]);
- }
-
- if(e.vrCapabilities)
- {
- unsigned int sz=e.vrCapabilities->size();
- json["vrCapabilities"]=Json::Value(Json::arrayValue);
- json["vrCapabilities"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["vrCapabilities"][i]=VrCapabilitiesMarshaller::toJSON(e.vrCapabilities[0][i]);
- }
-
- if(e.vehicleType)
- json["vehicleType"]=VehicleTypeMarshaller::toJSON(*e.vehicleType);
-
- return json;
-}
-
-
-bool RegisterAppInterface_responseMarshaller::fromJSON(const Json::Value& json,RegisterAppInterface_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.syncMsgVersion) delete c.syncMsgVersion;
- c.syncMsgVersion=0;
-
- if(c.language) delete c.language;
- c.language=0;
-
- if(c.hmiDisplayLanguage) delete c.hmiDisplayLanguage;
- c.hmiDisplayLanguage=0;
-
- if(c.displayCapabilities) delete c.displayCapabilities;
- c.displayCapabilities=0;
-
- if(c.buttonCapabilities) delete c.buttonCapabilities;
- c.buttonCapabilities=0;
-
- if(c.softButtonCapabilities) delete c.softButtonCapabilities;
- c.softButtonCapabilities=0;
-
- if(c.presetBankCapabilities) delete c.presetBankCapabilities;
- c.presetBankCapabilities=0;
-
- if(c.hmiZoneCapabilities) delete c.hmiZoneCapabilities;
- c.hmiZoneCapabilities=0;
-
- if(c.speechCapabilities) delete c.speechCapabilities;
- c.speechCapabilities=0;
-
- if(c.vrCapabilities) delete c.vrCapabilities;
- c.vrCapabilities=0;
-
- if(c.vehicleType) delete c.vehicleType;
- c.vehicleType=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("syncMsgVersion"))
- {
- const Json::Value& j=json["syncMsgVersion"];
- c.syncMsgVersion=new SyncMsgVersion();
- if(!SyncMsgVersionMarshaller::fromJSON(j,c.syncMsgVersion[0]))
- return false;
- }
- if(json.isMember("language"))
- {
- const Json::Value& j=json["language"];
- c.language=new Language();
- if(!LanguageMarshaller::fromJSON(j,c.language[0]))
- return false;
- }
- if(json.isMember("hmiDisplayLanguage"))
- {
- const Json::Value& j=json["hmiDisplayLanguage"];
- c.hmiDisplayLanguage=new Language();
- if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguage[0]))
- return false;
- }
- if(json.isMember("displayCapabilities"))
- {
- const Json::Value& j=json["displayCapabilities"];
- c.displayCapabilities=new DisplayCapabilities();
- if(!DisplayCapabilitiesMarshaller::fromJSON(j,c.displayCapabilities[0]))
- return false;
- }
- if(json.isMember("buttonCapabilities"))
- {
- const Json::Value& j=json["buttonCapabilities"];
- if(!j.isArray()) return false;
- c.buttonCapabilities=new std::vector<ButtonCapabilities>();
- c.buttonCapabilities->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- ButtonCapabilities t;
- if(!ButtonCapabilitiesMarshaller::fromJSON(j[i],t))
- return false;
- c.buttonCapabilities[0][i]=t;
- }
-
- }
- if(json.isMember("softButtonCapabilities"))
- {
- const Json::Value& j=json["softButtonCapabilities"];
- if(!j.isArray()) return false;
- c.softButtonCapabilities=new std::vector<SoftButtonCapabilities>();
- c.softButtonCapabilities->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButtonCapabilities t;
- if(!SoftButtonCapabilitiesMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtonCapabilities[0][i]=t;
- }
-
- }
- if(json.isMember("presetBankCapabilities"))
- {
- const Json::Value& j=json["presetBankCapabilities"];
- c.presetBankCapabilities=new PresetBankCapabilities();
- if(!PresetBankCapabilitiesMarshaller::fromJSON(j,c.presetBankCapabilities[0]))
- return false;
- }
- if(json.isMember("hmiZoneCapabilities"))
- {
- const Json::Value& j=json["hmiZoneCapabilities"];
- if(!j.isArray()) return false;
- c.hmiZoneCapabilities=new std::vector<HmiZoneCapabilities>();
- c.hmiZoneCapabilities->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- HmiZoneCapabilities t;
- if(!HmiZoneCapabilitiesMarshaller::fromJSON(j[i],t))
- return false;
- c.hmiZoneCapabilities[0][i]=t;
- }
-
- }
- if(json.isMember("speechCapabilities"))
- {
- const Json::Value& j=json["speechCapabilities"];
- if(!j.isArray()) return false;
- c.speechCapabilities=new std::vector<SpeechCapabilities>();
- c.speechCapabilities->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SpeechCapabilities t;
- if(!SpeechCapabilitiesMarshaller::fromJSON(j[i],t))
- return false;
- c.speechCapabilities[0][i]=t;
- }
-
- }
- if(json.isMember("vrCapabilities"))
- {
- const Json::Value& j=json["vrCapabilities"];
- if(!j.isArray()) return false;
- c.vrCapabilities=new std::vector<VrCapabilities>();
- c.vrCapabilities->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VrCapabilities t;
- if(!VrCapabilitiesMarshaller::fromJSON(j[i],t))
- return false;
- c.vrCapabilities[0][i]=t;
- }
-
- }
- if(json.isMember("vehicleType"))
- {
- const Json::Value& j=json["vehicleType"];
- c.vehicleType=new VehicleType();
- if(!VehicleTypeMarshaller::fromJSON(j,c.vehicleType[0]))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h
deleted file mode 100644
index a50253191..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct RegisterAppInterface_responseMarshaller
- {
- static bool checkIntegrity(RegisterAppInterface_response& e);
- static bool checkIntegrityConst(const RegisterAppInterface_response& e);
-
- static bool fromString(const std::string& s,RegisterAppInterface_response& e);
- static const std::string toString(const RegisterAppInterface_response& e);
-
- static bool fromJSON(const Json::Value& s,RegisterAppInterface_response& e);
- static Json::Value toJSON(const RegisterAppInterface_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp
deleted file mode 100644
index 251160cca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-#include "ResetGlobalProperties_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "GlobalPropertyMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ResetGlobalProperties_request::~ResetGlobalProperties_request(void)
-{
-}
-
-
-ResetGlobalProperties_request::ResetGlobalProperties_request(const ResetGlobalProperties_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool ResetGlobalProperties_request::checkIntegrity(void)
-{
- return ResetGlobalProperties_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ResetGlobalProperties_request::ResetGlobalProperties_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool ResetGlobalProperties_request::set_properties(const std::vector<GlobalProperty>& properties_)
-{
- unsigned int i=properties_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!GlobalPropertyMarshaller::checkIntegrityConst(properties_[i])) return false;
- }
- properties=properties_;
- return true;
-}
-
-
-
-
-const std::vector<GlobalProperty>& ResetGlobalProperties_request::get_properties(void) const
-{
- return properties;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp
deleted file mode 100644
index fc8a853b9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-#include "GlobalPropertyMarshaller.h"
-
-#include "ResetGlobalProperties_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ResetGlobalProperties_requestMarshaller::checkIntegrity(ResetGlobalProperties_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::fromString(const std::string& s,ResetGlobalProperties_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ResetGlobalProperties_requestMarshaller::toString(const ResetGlobalProperties_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::checkIntegrityConst(const ResetGlobalProperties_request& s)
-{
- {
- unsigned int i=s.properties.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!GlobalPropertyMarshaller::checkIntegrityConst(s.properties[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value ResetGlobalProperties_requestMarshaller::toJSON(const ResetGlobalProperties_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["properties"]=Json::Value(Json::arrayValue);
- json["properties"].resize(e.properties.size());
- for(unsigned int i=0;i<e.properties.size();i++)
- json["properties"][i]=GlobalPropertyMarshaller::toJSON(e.properties[i]);
-
- return json;
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::fromJSON(const Json::Value& json,ResetGlobalProperties_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("properties")) return false;
- {
- const Json::Value& j=json["properties"];
- if(!j.isArray()) return false;
- for(unsigned int i=0; i<j.size(); i++)
- {
- GlobalProperty t;
- if(GlobalPropertyMarshaller::fromJSON(j[i],t))
- {
- c.properties.push_back(t);
- }
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h
deleted file mode 100644
index fb08f9713..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ResetGlobalProperties_requestMarshaller
- {
- static bool checkIntegrity(ResetGlobalProperties_request& e);
- static bool checkIntegrityConst(const ResetGlobalProperties_request& e);
-
- static bool fromString(const std::string& s,ResetGlobalProperties_request& e);
- static const std::string toString(const ResetGlobalProperties_request& e);
-
- static bool fromJSON(const Json::Value& s,ResetGlobalProperties_request& e);
- static Json::Value toJSON(const ResetGlobalProperties_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp
deleted file mode 100644
index c54df2c5b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ResetGlobalProperties_response& ResetGlobalProperties_response::operator =(const ResetGlobalProperties_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-ResetGlobalProperties_response::~ResetGlobalProperties_response(void)
-{}
-
-ResetGlobalProperties_response::ResetGlobalProperties_response(const ResetGlobalProperties_response& c)
-{
- *this = c;
-}
-
-bool ResetGlobalProperties_response::checkIntegrity(void)
-{
- return ResetGlobalProperties_responseMarshaller::checkIntegrity(*this);
-}
-
-ResetGlobalProperties_response::ResetGlobalProperties_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp
deleted file mode 100644
index ba19bd424..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-#include "ResultMarshaller.h"
-
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ResetGlobalProperties_responseMarshaller::checkIntegrity(ResetGlobalProperties_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::fromString(const std::string& s,ResetGlobalProperties_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ResetGlobalProperties_responseMarshaller::toString(const ResetGlobalProperties_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::checkIntegrityConst(const ResetGlobalProperties_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value ResetGlobalProperties_responseMarshaller::toJSON(const ResetGlobalProperties_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::fromJSON(const Json::Value& json,ResetGlobalProperties_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h
deleted file mode 100644
index 0f639fabb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ResetGlobalProperties_responseMarshaller
- {
- static bool checkIntegrity(ResetGlobalProperties_response& e);
- static bool checkIntegrityConst(const ResetGlobalProperties_response& e);
-
- static bool fromString(const std::string& s,ResetGlobalProperties_response& e);
- static const std::string toString(const ResetGlobalProperties_response& e);
-
- static bool fromJSON(const Json::Value& s,ResetGlobalProperties_response& e);
- static Json::Value toJSON(const ResetGlobalProperties_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp
deleted file mode 100644
index ae46b617c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-// TODO(AK): remove this after new code generation
-#include "../include/JSONHandler/SDLRPCObjects/V1/Result.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 1;
-}
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Result::Result() : mInternal(INVALID_ENUM)
-{}
-
-Result::Result(ResultInternal e) : mInternal(e)
-{}
-
-Result::Result(const Result& result)
-{
- mInternal = result.mInternal;
-}
-
-Result::ResultInternal Result::get(void) const
-{
- return mInternal;
-}
-void Result::set(ResultInternal e)
-{
- mInternal = e;
-}
-
-// TODO(AK): remove this after new code generation
-Result::operator NsSmartDeviceLinkRPC::Result()
-{
- return NsSmartDeviceLinkRPC::Result(
- static_cast<NsSmartDeviceLinkRPC::Result::ResultInternal>(mInternal));
-}
-
-// TODO(AK): remove this after new code generation
-Result& Result::operator= (const Result& result)
-{
- mInternal = result.mInternal;
- return *this;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp
deleted file mode 100644
index cd7d6d1db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-#include "ResultMarshaller.h"
-#include "ResultMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const Result::ResultInternal ResultMarshaller::getIndex(const char* s)
-{
- if(!s)
- return Result::INVALID_ENUM;
- const struct PerfectHashTable* p=Result_intHash::getPointer(s,strlen(s));
- return p ? static_cast<Result::ResultInternal>(p->idx) : Result::INVALID_ENUM;
-}
-
-
-bool ResultMarshaller::fromJSON(const Json::Value& s,Result& e)
-{
- e.mInternal=Result::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=Result::INVALID_ENUM);
-}
-
-
-Json::Value ResultMarshaller::toJSON(const Result& e)
-{
- if(e.mInternal==Result::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ResultMarshaller::fromString(const std::string& s,Result& e)
-{
- e.mInternal=Result::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string ResultMarshaller::toString(const Result& e)
-{
- Json::FastWriter writer;
- return e.mInternal==Result::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ResultMarshaller::mHashTable[30]=
-{
- {"SUCCESS",0},
- {"INVALID_DATA",1},
- {"UNSUPPORTED_REQUEST",2},
- {"OUT_OF_MEMORY",3},
- {"TOO_MANY_PENDING_REQUESTS",4},
- {"INVALID_ID",5},
- {"DUPLICATE_NAME",6},
- {"TOO_MANY_APPLICATIONS",7},
- {"APPLICATION_REGISTERED_ALREADY",8},
- {"UNSUPPORTED_VERSION",9},
- {"WRONG_LANGUAGE",10},
- {"APPLICATION_NOT_REGISTERED",11},
- {"IN_USE",12},
- {"SUBSCRIBED_ALREADY",13},
- {"REJECTED",14},
- {"ABORTED",15},
- {"IGNORED",16},
- {"UNSUPPORTED_BUTTON",17},
- {"FILE_NOT_FOUND",18},
- {"GENERIC_ERROR",19},
- {"VEHICLE_DATA_NOT_ALLOWED",20},
- {"VEHICLE_DATA_NOT_AVAILABLE",21},
- {"DISALLOWED",22},
- {"USER_DISALLOWED",23},
- {"TIMED_OUT",24},
- {"CANCEL_ROUTE",25},
- {"CLOSED",26},
- {"ENCRYPTED",27},
- {"WARNINGS",28},
- {"RETRY", 29}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp
deleted file mode 100644
index 16fa2d935..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp
+++ /dev/null
@@ -1,46 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Result_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-SUCCESS,0
-INVALID_DATA,1
-UNSUPPORTED_REQUEST,2
-OUT_OF_MEMORY,3
-TOO_MANY_PENDING_REQUESTS,4
-INVALID_ID,5
-DUPLICATE_NAME,6
-TOO_MANY_APPLICATIONS,7
-APPLICATION_REGISTERED_ALREADY,8
-UNSUPPORTED_VERSION,9
-WRONG_LANGUAGE,10
-APPLICATION_NOT_REGISTERED,11
-IN_USE,12
-SUBSCRIBED_ALREADY,13
-REJECTED,14
-ABORTED,15
-IGNORED,16
-UNSUPPORTED_BUTTON,17
-FILE_NOT_FOUND,18
-GENERIC_ERROR,19
-VEHICLE_DATA_NOT_ALLOWED,20
-VEHICLE_DATA_NOT_AVAILABLE,21
-DISALLOWED,22
-USER_DISALLOWED,23
-TIMED_OUT,24
-CANCEL_ROUTE,25
-CLOSED,26
-ENCRYPTED,27
-WARNINGS,28
-RETRY,29
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h
deleted file mode 100644
index 0e9212f80..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_RESULTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_RESULTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for Result
-
- class ResultMarshaller
- {
- public:
-
- static std::string toName(const Result& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(Result& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=Result::INVALID_ENUM;
- }
-
- static bool checkIntegrity(Result& e) { return e.mInternal!=Result::INVALID_ENUM; }
- static bool checkIntegrityConst(const Result& e) { return e.mInternal!=Result::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,Result& e);
- static const std::string toString(const Result& e);
-
- static bool fromJSON(const Json::Value& s,Result& e);
- static Json::Value toJSON(const Result& e);
-
- static const char* getName(Result::ResultInternal e)
- {
- return (e>=0 && e<30) ? mHashTable[e].name : NULL;
- }
-
- static const Result::ResultInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[30];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc
deleted file mode 100644
index 310215d55..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp */
-/* Computed positions: -k'1,13' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 30
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 50
-/* maximum key range = 46, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class Result_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Result_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 20, 5, 10, 5, 23,
- 0, 20, 51, 0, 51, 51, 0, 15, 0, 5,
- 51, 51, 0, 10, 0, 0, 5, 5, 51, 0,
- 51, 51, 51, 51, 51, 0, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[12]];
- /*FALLTHROUGH*/
- case 12:
- case 11:
- case 10:
- case 9:
- case 8:
- case 7:
- case 6:
- case 5:
- case 4:
- case 3:
- case 2:
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-Result_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, 0, 12, 8,
- 14, 10, 6, 7, 13, 19, 15, 21, 12, 18, 19, 0, 0, 7,
- 18, 24, 25, 26, 9, 13, 14, 0, 0, 0, 0, 14, 0, 0,
- 0, 0, 0, 0, 26, 0, 0, 0, 30
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""},
-#line 46 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"RETRY",29},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"IN_USE",12},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"IGNORED",16},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"REJECTED",14},
-#line 41 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"TIMED_OUT",24},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"INVALID_ID",5},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"INVALID_DATA",1},
-#line 45 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"WARNINGS",28},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"FILE_NOT_FOUND",18},
-#line 39 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"DISALLOWED",22},
-#line 43 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"CLOSED",26},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"SUCCESS",0},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"OUT_OF_MEMORY",3},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"UNSUPPORTED_REQUEST",2},
-#line 40 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"USER_DISALLOWED",23},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"TOO_MANY_APPLICATIONS",7},
-#line 42 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"CANCEL_ROUTE",25},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"UNSUPPORTED_BUTTON",17},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"UNSUPPORTED_VERSION",9},
- {""}, {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"ABORTED",15},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"SUBSCRIBED_ALREADY",13},
-#line 37 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"VEHICLE_DATA_NOT_ALLOWED",20},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"TOO_MANY_PENDING_REQUESTS",4},
-#line 38 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"VEHICLE_DATA_NOT_AVAILABLE",21},
-#line 44 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"ENCRYPTED",27},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"GENERIC_ERROR",19},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"DUPLICATE_NAME",6},
- {""}, {""}, {""}, {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"WRONG_LANGUAGE",10},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"APPLICATION_NOT_REGISTERED",11},
- {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
- {"APPLICATION_REGISTERED_ALREADY",8}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp
deleted file mode 100644
index 008bce3e5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h"
-#include "SamplingRateMarshaller.h"
-#include "SamplingRateMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SamplingRate::SamplingRateInternal SamplingRateMarshaller::getIndex(const char* s)
-{
- if(!s)
- return SamplingRate::INVALID_ENUM;
- const struct PerfectHashTable* p=SamplingRate_intHash::getPointer(s,strlen(s));
- return p ? static_cast<SamplingRate::SamplingRateInternal>(p->idx) : SamplingRate::INVALID_ENUM;
-}
-
-
-bool SamplingRateMarshaller::fromJSON(const Json::Value& s,SamplingRate& e)
-{
- e.mInternal=SamplingRate::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=SamplingRate::INVALID_ENUM);
-}
-
-
-Json::Value SamplingRateMarshaller::toJSON(const SamplingRate& e)
-{
- if(e.mInternal==SamplingRate::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SamplingRateMarshaller::fromString(const std::string& s,SamplingRate& e)
-{
- e.mInternal=SamplingRate::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string SamplingRateMarshaller::toString(const SamplingRate& e)
-{
- Json::FastWriter writer;
- return e.mInternal==SamplingRate::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SamplingRateMarshaller::mHashTable[4]=
-{
- {"8KHZ",0},
- {"16KHZ",1},
- {"22KHZ",2},
- {"44KHZ",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp
deleted file mode 100644
index 19c4cafd4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SamplingRate_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-8KHZ,0
-16KHZ,1
-22KHZ,2
-44KHZ,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h
deleted file mode 100644
index 36c17fcbc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SAMPLINGRATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SAMPLINGRATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SamplingRate
-
- class SamplingRateMarshaller
- {
- public:
-
- static std::string toName(const SamplingRate& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(SamplingRate& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=SamplingRate::INVALID_ENUM;
- }
-
- static bool checkIntegrity(SamplingRate& e) { return e.mInternal!=SamplingRate::INVALID_ENUM; }
- static bool checkIntegrityConst(const SamplingRate& e) { return e.mInternal!=SamplingRate::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,SamplingRate& e);
- static const std::string toString(const SamplingRate& e);
-
- static bool fromJSON(const Json::Value& s,SamplingRate& e);
- static Json::Value toJSON(const SamplingRate& e);
-
- static const char* getName(SamplingRate::SamplingRateInternal e)
- {
- return (e>=0 && e<4) ? mHashTable[e].name : NULL;
- }
-
- static const SamplingRate::SamplingRateInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[4];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc
deleted file mode 100644
index 8a74146ac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 10
-/* maximum key range = 7, duplicates = 0 */
-
-class SamplingRate_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SamplingRate_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 2,
- 5, 11, 0, 11, 11, 11, 0, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SamplingRate_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 5, 0, 5, 0, 0, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
- {"8KHZ",0},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
- {"44KHZ",3},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
- {"16KHZ",1},
- {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
- {"22KHZ",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp
deleted file mode 100644
index f0a5290e4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-#include "ScrollableMessage_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ScrollableMessage_request& ScrollableMessage_request::operator =(const ScrollableMessage_request& c)
-{
- scrollableMessageBody= c.scrollableMessageBody;
- timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
- softButtons= c.softButtons ? new std::vector<SoftButton>(c.softButtons[0]) : 0;
-
- return *this;
-}
-
-
-ScrollableMessage_request::~ScrollableMessage_request(void)
-{
- if(timeout)
- delete timeout;
- if(softButtons)
- delete softButtons;
-}
-
-
-ScrollableMessage_request::ScrollableMessage_request(const ScrollableMessage_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool ScrollableMessage_request::checkIntegrity(void)
-{
- return ScrollableMessage_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ScrollableMessage_request::ScrollableMessage_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- timeout(0),
- softButtons(0)
-{
-}
-
-
-
-bool ScrollableMessage_request::set_scrollableMessageBody(const std::string& scrollableMessageBody_)
-{
- if(scrollableMessageBody_.length()>500) return false;
- scrollableMessageBody=scrollableMessageBody_;
- return true;
-}
-
-bool ScrollableMessage_request::set_timeout(unsigned int timeout_)
-{
- if(timeout_>65535) return false;
- delete timeout;
- timeout=0;
-
- timeout=new unsigned int(timeout_);
- return true;
-}
-
-void ScrollableMessage_request::reset_timeout(void)
-{
- if(timeout)
- delete timeout;
- timeout=0;
-}
-
-bool ScrollableMessage_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
- unsigned int i=softButtons_.size();
- if(i>8 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i])) return false;
- }
- delete softButtons;
- softButtons=0;
-
- softButtons=new std::vector<SoftButton>(softButtons_);
- return true;
-}
-
-void ScrollableMessage_request::reset_softButtons(void)
-{
- if(softButtons)
- delete softButtons;
- softButtons=0;
-}
-
-
-
-
-const std::string& ScrollableMessage_request::get_scrollableMessageBody(void) const
-{
- return scrollableMessageBody;
-}
-
-const unsigned int* ScrollableMessage_request::get_timeout(void) const
-{
- return timeout;
-}
-
-const std::vector<SoftButton>* ScrollableMessage_request::get_softButtons(void) const
-{
- return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp
deleted file mode 100644
index b5e923742..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-#include "SoftButtonMarshaller.h"
-
-#include "ScrollableMessage_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ScrollableMessage_requestMarshaller::checkIntegrity(ScrollableMessage_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ScrollableMessage_requestMarshaller::fromString(const std::string& s,ScrollableMessage_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ScrollableMessage_requestMarshaller::toString(const ScrollableMessage_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ScrollableMessage_requestMarshaller::checkIntegrityConst(const ScrollableMessage_request& s)
-{
- if(s.scrollableMessageBody.length()>500) return false;
- if(s.timeout && *s.timeout>65535) return false;
- if(s.softButtons)
- {
- unsigned int i=s.softButtons[0].size();
- if(i>8 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value ScrollableMessage_requestMarshaller::toJSON(const ScrollableMessage_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["scrollableMessageBody"]=Json::Value(e.scrollableMessageBody);
-
- if(e.timeout)
- json["timeout"]=Json::Value(*e.timeout);
-
- if(e.softButtons)
- {
- unsigned int sz=e.softButtons->size();
- json["softButtons"]=Json::Value(Json::arrayValue);
- json["softButtons"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
- }
-
- return json;
-}
-
-
-bool ScrollableMessage_requestMarshaller::fromJSON(const Json::Value& json,ScrollableMessage_request& c)
-{
- if(c.timeout) delete c.timeout;
- c.timeout=0;
-
- if(c.softButtons) delete c.softButtons;
- c.softButtons=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("scrollableMessageBody")) return false;
- {
- const Json::Value& j=json["scrollableMessageBody"];
- if(!j.isString()) return false;
- c.scrollableMessageBody=j.asString();
- }
- if(json.isMember("timeout"))
- {
- const Json::Value& j=json["timeout"];
- if(!j.isInt()) return false;
- c.timeout=new unsigned int(j.asInt());
- }
- if(json.isMember("softButtons"))
- {
- const Json::Value& j=json["softButtons"];
- if(!j.isArray()) return false;
- c.softButtons=new std::vector<SoftButton>();
- c.softButtons->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButton t;
- if(!SoftButtonMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtons[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h
deleted file mode 100644
index 5039596ed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ScrollableMessage_requestMarshaller
- {
- static bool checkIntegrity(ScrollableMessage_request& e);
- static bool checkIntegrityConst(const ScrollableMessage_request& e);
-
- static bool fromString(const std::string& s,ScrollableMessage_request& e);
- static const std::string toString(const ScrollableMessage_request& e);
-
- static bool fromJSON(const Json::Value& s,ScrollableMessage_request& e);
- static Json::Value toJSON(const ScrollableMessage_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp
deleted file mode 100644
index e49b0fcdc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-#include "ScrollableMessage_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ScrollableMessage_response& ScrollableMessage_response::operator =(const ScrollableMessage_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-ScrollableMessage_response::~ScrollableMessage_response(void)
-{}
-
-ScrollableMessage_response::ScrollableMessage_response(const ScrollableMessage_response& c)
-{
- *this = c;
-}
-
-bool ScrollableMessage_response::checkIntegrity(void)
-{
- return ScrollableMessage_responseMarshaller::checkIntegrity(*this);
-}
-
-ScrollableMessage_response::ScrollableMessage_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp
deleted file mode 100644
index 05895caa8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-#include "ResultMarshaller.h"
-
-#include "ScrollableMessage_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ScrollableMessage_responseMarshaller::checkIntegrity(ScrollableMessage_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ScrollableMessage_responseMarshaller::fromString(const std::string& s,ScrollableMessage_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ScrollableMessage_responseMarshaller::toString(const ScrollableMessage_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ScrollableMessage_responseMarshaller::checkIntegrityConst(const ScrollableMessage_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- return true;
-}
-
-Json::Value ScrollableMessage_responseMarshaller::toJSON(const ScrollableMessage_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- return json;
-}
-
-
-bool ScrollableMessage_responseMarshaller::fromJSON(const Json::Value& json,ScrollableMessage_response& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h
deleted file mode 100644
index efab3e398..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ScrollableMessage_responseMarshaller
- {
- static bool checkIntegrity(ScrollableMessage_response& e);
- static bool checkIntegrityConst(const ScrollableMessage_response& e);
-
- static bool fromString(const std::string& s,ScrollableMessage_response& e);
- static const std::string toString(const ScrollableMessage_response& e);
-
- static bool fromJSON(const Json::Value& s,ScrollableMessage_response& e);
- static Json::Value toJSON(const ScrollableMessage_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp
deleted file mode 100644
index 4bce103d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-#include "SetAppIcon_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SetAppIcon_request::~SetAppIcon_request(void)
-{
-}
-
-
-SetAppIcon_request::SetAppIcon_request(const SetAppIcon_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool SetAppIcon_request::checkIntegrity(void)
-{
- return SetAppIcon_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetAppIcon_request::SetAppIcon_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SetAppIcon_request::set_syncFileName(const std::string& syncFileName_)
-{
- if(syncFileName_.length()>500) return false;
- syncFileName=syncFileName_;
- return true;
-}
-
-
-
-
-const std::string& SetAppIcon_request::get_syncFileName(void) const
-{
- return syncFileName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp
deleted file mode 100644
index 149d4c9d9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-
-
-#include "SetAppIcon_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetAppIcon_requestMarshaller::checkIntegrity(SetAppIcon_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetAppIcon_requestMarshaller::fromString(const std::string& s,SetAppIcon_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetAppIcon_requestMarshaller::toString(const SetAppIcon_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetAppIcon_requestMarshaller::checkIntegrityConst(const SetAppIcon_request& s)
-{
- if(s.syncFileName.length()>500) return false;
- return true;
-}
-
-Json::Value SetAppIcon_requestMarshaller::toJSON(const SetAppIcon_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["syncFileName"]=Json::Value(e.syncFileName);
-
- return json;
-}
-
-
-bool SetAppIcon_requestMarshaller::fromJSON(const Json::Value& json,SetAppIcon_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("syncFileName")) return false;
- {
- const Json::Value& j=json["syncFileName"];
- if(!j.isString()) return false;
- c.syncFileName=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h
deleted file mode 100644
index 7f1b7c65f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETAPPICON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETAPPICON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetAppIcon_requestMarshaller
- {
- static bool checkIntegrity(SetAppIcon_request& e);
- static bool checkIntegrityConst(const SetAppIcon_request& e);
-
- static bool fromString(const std::string& s,SetAppIcon_request& e);
- static const std::string toString(const SetAppIcon_request& e);
-
- static bool fromJSON(const Json::Value& s,SetAppIcon_request& e);
- static Json::Value toJSON(const SetAppIcon_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp
deleted file mode 100644
index 6186216b3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-#include "SetAppIcon_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetAppIcon_response& SetAppIcon_response::operator =(const SetAppIcon_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-SetAppIcon_response::~SetAppIcon_response(void)
-{}
-
-SetAppIcon_response::SetAppIcon_response(const SetAppIcon_response& c)
-{
- *this = c;
-}
-
-bool SetAppIcon_response::checkIntegrity(void)
-{
- return SetAppIcon_responseMarshaller::checkIntegrity(*this);
-}
-
-SetAppIcon_response::SetAppIcon_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp
deleted file mode 100644
index 40b944378..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetAppIcon_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetAppIcon_responseMarshaller::checkIntegrity(SetAppIcon_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetAppIcon_responseMarshaller::fromString(const std::string& s,SetAppIcon_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetAppIcon_responseMarshaller::toString(const SetAppIcon_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetAppIcon_responseMarshaller::checkIntegrityConst(const SetAppIcon_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value SetAppIcon_responseMarshaller::toJSON(const SetAppIcon_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool SetAppIcon_responseMarshaller::fromJSON(const Json::Value& json,SetAppIcon_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h
deleted file mode 100644
index 7af2b0adf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETAPPICON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETAPPICON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetAppIcon_responseMarshaller
- {
- static bool checkIntegrity(SetAppIcon_response& e);
- static bool checkIntegrityConst(const SetAppIcon_response& e);
-
- static bool fromString(const std::string& s,SetAppIcon_response& e);
- static const std::string toString(const SetAppIcon_response& e);
-
- static bool fromJSON(const Json::Value& s,SetAppIcon_response& e);
- static Json::Value toJSON(const SetAppIcon_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp
deleted file mode 100644
index dfa9d2190..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-#include "SetDisplayLayout_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SetDisplayLayout_request::~SetDisplayLayout_request(void)
-{
-}
-
-
-SetDisplayLayout_request::SetDisplayLayout_request(const SetDisplayLayout_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool SetDisplayLayout_request::checkIntegrity(void)
-{
- return SetDisplayLayout_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetDisplayLayout_request::SetDisplayLayout_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SetDisplayLayout_request::set_displayLayout(const std::string& displayLayout_)
-{
- displayLayout=displayLayout_;
- return true;
-}
-
-
-
-
-const std::string& SetDisplayLayout_request::get_displayLayout(void) const
-{
- return displayLayout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp
deleted file mode 100644
index 955f03cad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-
-
-#include "SetDisplayLayout_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetDisplayLayout_requestMarshaller::checkIntegrity(SetDisplayLayout_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetDisplayLayout_requestMarshaller::fromString(const std::string& s,SetDisplayLayout_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetDisplayLayout_requestMarshaller::toString(const SetDisplayLayout_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetDisplayLayout_requestMarshaller::checkIntegrityConst(const SetDisplayLayout_request& s)
-{
- return true;
-}
-
-Json::Value SetDisplayLayout_requestMarshaller::toJSON(const SetDisplayLayout_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["displayLayout"]=Json::Value(e.displayLayout);
-
- return json;
-}
-
-
-bool SetDisplayLayout_requestMarshaller::fromJSON(const Json::Value& json,SetDisplayLayout_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("displayLayout")) return false;
- {
- const Json::Value& j=json["displayLayout"];
- if(!j.isString()) return false;
- c.displayLayout=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h
deleted file mode 100644
index 1ac3cb412..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetDisplayLayout_requestMarshaller
- {
- static bool checkIntegrity(SetDisplayLayout_request& e);
- static bool checkIntegrityConst(const SetDisplayLayout_request& e);
-
- static bool fromString(const std::string& s,SetDisplayLayout_request& e);
- static const std::string toString(const SetDisplayLayout_request& e);
-
- static bool fromJSON(const Json::Value& s,SetDisplayLayout_request& e);
- static Json::Value toJSON(const SetDisplayLayout_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp
deleted file mode 100644
index 6c5dcc011..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-#include "SetDisplayLayout_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetDisplayLayout_response& SetDisplayLayout_response::operator =(const SetDisplayLayout_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-
-SetDisplayLayout_response::~SetDisplayLayout_response(void)
-{}
-
-
-SetDisplayLayout_response::SetDisplayLayout_response(const SetDisplayLayout_response& c)
-{
- *this = c;
-}
-
-bool SetDisplayLayout_response::checkIntegrity(void)
-{
- return SetDisplayLayout_responseMarshaller::checkIntegrity(*this);
-}
-
-SetDisplayLayout_response::SetDisplayLayout_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp
deleted file mode 100644
index 38e98195d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetDisplayLayout_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetDisplayLayout_responseMarshaller::checkIntegrity(SetDisplayLayout_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetDisplayLayout_responseMarshaller::fromString(const std::string& s,SetDisplayLayout_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetDisplayLayout_responseMarshaller::toString(const SetDisplayLayout_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetDisplayLayout_responseMarshaller::checkIntegrityConst(const SetDisplayLayout_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value SetDisplayLayout_responseMarshaller::toJSON(const SetDisplayLayout_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool SetDisplayLayout_responseMarshaller::fromJSON(const Json::Value& json,SetDisplayLayout_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h
deleted file mode 100644
index c3b423675..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetDisplayLayout_responseMarshaller
- {
- static bool checkIntegrity(SetDisplayLayout_response& e);
- static bool checkIntegrityConst(const SetDisplayLayout_response& e);
-
- static bool fromString(const std::string& s,SetDisplayLayout_response& e);
- static const std::string toString(const SetDisplayLayout_response& e);
-
- static bool fromJSON(const Json::Value& s,SetDisplayLayout_response& e);
- static Json::Value toJSON(const SetDisplayLayout_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp
deleted file mode 100644
index cc35f2511..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-#include "SetGlobalProperties_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetGlobalProperties_request& SetGlobalProperties_request::operator =(const SetGlobalProperties_request& c)
-{
- helpPrompt= c.helpPrompt ? new std::vector<TTSChunk>(c.helpPrompt[0]) : 0;
- timeoutPrompt= c.timeoutPrompt ? new std::vector<TTSChunk>(c.timeoutPrompt[0]) : 0;
- vrHelpTitle= c.vrHelpTitle ? new std::string(c.vrHelpTitle[0]) : 0;
- vrHelp= c.vrHelp ? new std::vector<VrHelpItem>(c.vrHelp[0]) : 0;
-
- return *this;
-}
-
-
-SetGlobalProperties_request::~SetGlobalProperties_request(void)
-{
- if(helpPrompt)
- delete helpPrompt;
- if(timeoutPrompt)
- delete timeoutPrompt;
- if(vrHelpTitle)
- delete vrHelpTitle;
- if(vrHelp)
- delete vrHelp;
-}
-
-
-SetGlobalProperties_request::SetGlobalProperties_request(const SetGlobalProperties_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool SetGlobalProperties_request::checkIntegrity(void)
-{
- return SetGlobalProperties_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetGlobalProperties_request::SetGlobalProperties_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- helpPrompt(0),
- timeoutPrompt(0),
- vrHelpTitle(0),
- vrHelp(0)
-{
-}
-
-
-
-bool SetGlobalProperties_request::set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_)
-{
- unsigned int i=helpPrompt_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(helpPrompt_[i])) return false;
- }
- delete helpPrompt;
- helpPrompt=0;
-
- helpPrompt=new std::vector<TTSChunk>(helpPrompt_);
- return true;
-}
-
-void SetGlobalProperties_request::reset_helpPrompt(void)
-{
- if(helpPrompt)
- delete helpPrompt;
- helpPrompt=0;
-}
-
-bool SetGlobalProperties_request::set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_)
-{
- unsigned int i=timeoutPrompt_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(timeoutPrompt_[i])) return false;
- }
- delete timeoutPrompt;
- timeoutPrompt=0;
-
- timeoutPrompt=new std::vector<TTSChunk>(timeoutPrompt_);
- return true;
-}
-
-void SetGlobalProperties_request::reset_timeoutPrompt(void)
-{
- if(timeoutPrompt)
- delete timeoutPrompt;
- timeoutPrompt=0;
-}
-
-bool SetGlobalProperties_request::set_vrHelpTitle(const std::string& vrHelpTitle_)
-{
- if(vrHelpTitle_.length()>500) return false;
- delete vrHelpTitle;
- vrHelpTitle=0;
-
- vrHelpTitle=new std::string(vrHelpTitle_);
- return true;
-}
-
-void SetGlobalProperties_request::reset_vrHelpTitle(void)
-{
- if(vrHelpTitle)
- delete vrHelpTitle;
- vrHelpTitle=0;
-}
-
-bool SetGlobalProperties_request::set_vrHelp(const std::vector<VrHelpItem>& vrHelp_)
-{
- unsigned int i=vrHelp_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VrHelpItemMarshaller::checkIntegrityConst(vrHelp_[i])) return false;
- }
- delete vrHelp;
- vrHelp=0;
-
- vrHelp=new std::vector<VrHelpItem>(vrHelp_);
- return true;
-}
-
-void SetGlobalProperties_request::reset_vrHelp(void)
-{
- if(vrHelp)
- delete vrHelp;
- vrHelp=0;
-}
-
-
-
-
-const std::vector<TTSChunk>* SetGlobalProperties_request::get_helpPrompt(void) const
-{
- return helpPrompt;
-}
-
-const std::vector<TTSChunk>* SetGlobalProperties_request::get_timeoutPrompt(void) const
-{
- return timeoutPrompt;
-}
-
-const std::string* SetGlobalProperties_request::get_vrHelpTitle(void) const
-{
- return vrHelpTitle;
-}
-
-const std::vector<VrHelpItem>* SetGlobalProperties_request::get_vrHelp(void) const
-{
- return vrHelp;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp
deleted file mode 100644
index 2d98fa3c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#include "SetGlobalProperties_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetGlobalProperties_requestMarshaller::checkIntegrity(SetGlobalProperties_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalProperties_requestMarshaller::fromString(const std::string& s,SetGlobalProperties_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetGlobalProperties_requestMarshaller::toString(const SetGlobalProperties_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalProperties_requestMarshaller::checkIntegrityConst(const SetGlobalProperties_request& s)
-{
- if(s.helpPrompt)
- {
- unsigned int i=s.helpPrompt[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.helpPrompt[0][i])) return false;
- }
- }
- if(s.timeoutPrompt)
- {
- unsigned int i=s.timeoutPrompt[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.timeoutPrompt[0][i])) return false;
- }
- }
- if(s.vrHelpTitle && s.vrHelpTitle->length()>500) return false;
- if(s.vrHelp)
- {
- unsigned int i=s.vrHelp[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VrHelpItemMarshaller::checkIntegrityConst(s.vrHelp[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value SetGlobalProperties_requestMarshaller::toJSON(const SetGlobalProperties_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.helpPrompt)
- {
- unsigned int sz=e.helpPrompt->size();
- json["helpPrompt"]=Json::Value(Json::arrayValue);
- json["helpPrompt"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["helpPrompt"][i]=TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
- }
-
- if(e.timeoutPrompt)
- {
- unsigned int sz=e.timeoutPrompt->size();
- json["timeoutPrompt"]=Json::Value(Json::arrayValue);
- json["timeoutPrompt"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["timeoutPrompt"][i]=TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
- }
-
- if(e.vrHelpTitle)
- json["vrHelpTitle"]=Json::Value(*e.vrHelpTitle);
-
- if(e.vrHelp)
- {
- unsigned int sz=e.vrHelp->size();
- json["vrHelp"]=Json::Value(Json::arrayValue);
- json["vrHelp"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["vrHelp"][i]=VrHelpItemMarshaller::toJSON(e.vrHelp[0][i]);
- }
-
- return json;
-}
-
-
-bool SetGlobalProperties_requestMarshaller::fromJSON(const Json::Value& json,SetGlobalProperties_request& c)
-{
- if(c.helpPrompt) delete c.helpPrompt;
- c.helpPrompt=0;
-
- if(c.timeoutPrompt) delete c.timeoutPrompt;
- c.timeoutPrompt=0;
-
- if(c.vrHelpTitle) delete c.vrHelpTitle;
- c.vrHelpTitle=0;
-
- if(c.vrHelp) delete c.vrHelp;
- c.vrHelp=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("helpPrompt"))
- {
- const Json::Value& j=json["helpPrompt"];
- if(!j.isArray()) return false;
- c.helpPrompt=new std::vector<TTSChunk>();
- c.helpPrompt->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.helpPrompt[0][i]=t;
- }
-
- }
- if(json.isMember("timeoutPrompt"))
- {
- const Json::Value& j=json["timeoutPrompt"];
- if(!j.isArray()) return false;
- c.timeoutPrompt=new std::vector<TTSChunk>();
- c.timeoutPrompt->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.timeoutPrompt[0][i]=t;
- }
-
- }
- if(json.isMember("vrHelpTitle"))
- {
- const Json::Value& j=json["vrHelpTitle"];
- if(!j.isString()) return false;
- c.vrHelpTitle=new std::string(j.asString());
- }
- if(json.isMember("vrHelp"))
- {
- const Json::Value& j=json["vrHelp"];
- if(!j.isArray()) return false;
- c.vrHelp=new std::vector<VrHelpItem>();
- c.vrHelp->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VrHelpItem t;
- if(!VrHelpItemMarshaller::fromJSON(j[i],t))
- return false;
- c.vrHelp[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h
deleted file mode 100644
index c5d884e2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetGlobalProperties_requestMarshaller
- {
- static bool checkIntegrity(SetGlobalProperties_request& e);
- static bool checkIntegrityConst(const SetGlobalProperties_request& e);
-
- static bool fromString(const std::string& s,SetGlobalProperties_request& e);
- static const std::string toString(const SetGlobalProperties_request& e);
-
- static bool fromJSON(const Json::Value& s,SetGlobalProperties_request& e);
- static Json::Value toJSON(const SetGlobalProperties_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp
deleted file mode 100644
index ec636a05f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-#include "SetGlobalProperties_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetGlobalProperties_response& SetGlobalProperties_response::operator =(const SetGlobalProperties_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-SetGlobalProperties_response::~SetGlobalProperties_response(void)
-{}
-
-SetGlobalProperties_response::SetGlobalProperties_response(const SetGlobalProperties_response& c)
-{
- *this = c;
-}
-
-bool SetGlobalProperties_response::checkIntegrity(void)
-{
- return SetGlobalProperties_responseMarshaller::checkIntegrity(*this);
-}
-
-SetGlobalProperties_response::SetGlobalProperties_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp
deleted file mode 100644
index 5f7d188d0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetGlobalProperties_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetGlobalProperties_responseMarshaller::checkIntegrity(SetGlobalProperties_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalProperties_responseMarshaller::fromString(const std::string& s,SetGlobalProperties_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetGlobalProperties_responseMarshaller::toString(const SetGlobalProperties_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalProperties_responseMarshaller::checkIntegrityConst(const SetGlobalProperties_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value SetGlobalProperties_responseMarshaller::toJSON(const SetGlobalProperties_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool SetGlobalProperties_responseMarshaller::fromJSON(const Json::Value& json,SetGlobalProperties_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h
deleted file mode 100644
index ace55e9f8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetGlobalProperties_responseMarshaller
- {
- static bool checkIntegrity(SetGlobalProperties_response& e);
- static bool checkIntegrityConst(const SetGlobalProperties_response& e);
-
- static bool fromString(const std::string& s,SetGlobalProperties_response& e);
- static const std::string toString(const SetGlobalProperties_response& e);
-
- static bool fromJSON(const Json::Value& s,SetGlobalProperties_response& e);
- static Json::Value toJSON(const SetGlobalProperties_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp
deleted file mode 100644
index c338a3134..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-#include "SetMediaClockTimer_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "StartTimeMarshaller.h"
-#include "UpdateModeMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetMediaClockTimer_request& SetMediaClockTimer_request::operator =(const SetMediaClockTimer_request& c)
-{
- startTime= c.startTime ? new StartTime(c.startTime[0]) : 0;
- updateMode= c.updateMode;
-
- return *this;
-}
-
-
-SetMediaClockTimer_request::~SetMediaClockTimer_request(void)
-{
- if(startTime)
- delete startTime;
-}
-
-
-SetMediaClockTimer_request::SetMediaClockTimer_request(const SetMediaClockTimer_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool SetMediaClockTimer_request::checkIntegrity(void)
-{
- return SetMediaClockTimer_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetMediaClockTimer_request::SetMediaClockTimer_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- startTime(0)
-{
-}
-
-
-
-bool SetMediaClockTimer_request::set_startTime(const StartTime& startTime_)
-{
- if(!StartTimeMarshaller::checkIntegrityConst(startTime_)) return false;
- delete startTime;
- startTime=0;
-
- startTime=new StartTime(startTime_);
- return true;
-}
-
-void SetMediaClockTimer_request::reset_startTime(void)
-{
- if(startTime)
- delete startTime;
- startTime=0;
-}
-
-bool SetMediaClockTimer_request::set_updateMode(const UpdateMode& updateMode_)
-{
- if(!UpdateModeMarshaller::checkIntegrityConst(updateMode_)) return false;
- updateMode=updateMode_;
- return true;
-}
-
-
-
-
-const StartTime* SetMediaClockTimer_request::get_startTime(void) const
-{
- return startTime;
-}
-
-const UpdateMode& SetMediaClockTimer_request::get_updateMode(void) const
-{
- return updateMode;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp
deleted file mode 100644
index 84acf6e4a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-#include "StartTimeMarshaller.h"
-#include "UpdateModeMarshaller.h"
-
-#include "SetMediaClockTimer_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetMediaClockTimer_requestMarshaller::checkIntegrity(SetMediaClockTimer_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::fromString(const std::string& s,SetMediaClockTimer_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetMediaClockTimer_requestMarshaller::toString(const SetMediaClockTimer_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::checkIntegrityConst(const SetMediaClockTimer_request& s)
-{
- if(s.startTime && !StartTimeMarshaller::checkIntegrityConst(*s.startTime)) return false;
- if(!UpdateModeMarshaller::checkIntegrityConst(s.updateMode)) return false;
- return true;
-}
-
-Json::Value SetMediaClockTimer_requestMarshaller::toJSON(const SetMediaClockTimer_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.startTime)
- json["startTime"]=StartTimeMarshaller::toJSON(*e.startTime);
-
- json["updateMode"]=UpdateModeMarshaller::toJSON(e.updateMode);
-
- return json;
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::fromJSON(const Json::Value& json,SetMediaClockTimer_request& c)
-{
- if(c.startTime) delete c.startTime;
- c.startTime=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("startTime"))
- {
- const Json::Value& j=json["startTime"];
- c.startTime=new StartTime();
- if(!StartTimeMarshaller::fromJSON(j,c.startTime[0]))
- return false;
- }
- if(!json.isMember("updateMode")) return false;
- {
- const Json::Value& j=json["updateMode"];
- if(!UpdateModeMarshaller::fromJSON(j,c.updateMode))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h
deleted file mode 100644
index 9512edfba..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetMediaClockTimer_requestMarshaller
- {
- static bool checkIntegrity(SetMediaClockTimer_request& e);
- static bool checkIntegrityConst(const SetMediaClockTimer_request& e);
-
- static bool fromString(const std::string& s,SetMediaClockTimer_request& e);
- static const std::string toString(const SetMediaClockTimer_request& e);
-
- static bool fromJSON(const Json::Value& s,SetMediaClockTimer_request& e);
- static Json::Value toJSON(const SetMediaClockTimer_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp
deleted file mode 100644
index 0367f6a24..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-#include "SetMediaClockTimer_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetMediaClockTimer_response& SetMediaClockTimer_response::operator =(const SetMediaClockTimer_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-SetMediaClockTimer_response::~SetMediaClockTimer_response(void)
-{}
-
-SetMediaClockTimer_response::SetMediaClockTimer_response(const SetMediaClockTimer_response& c)
-{
- *this = c;
-}
-
-bool SetMediaClockTimer_response::checkIntegrity(void)
-{
- return SetMediaClockTimer_responseMarshaller::checkIntegrity(*this);
-}
-
-SetMediaClockTimer_response::SetMediaClockTimer_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp
deleted file mode 100644
index d4309d168..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetMediaClockTimer_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetMediaClockTimer_responseMarshaller::checkIntegrity(SetMediaClockTimer_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::fromString(const std::string& s,SetMediaClockTimer_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SetMediaClockTimer_responseMarshaller::toString(const SetMediaClockTimer_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::checkIntegrityConst(const SetMediaClockTimer_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value SetMediaClockTimer_responseMarshaller::toJSON(const SetMediaClockTimer_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::fromJSON(const Json::Value& json,SetMediaClockTimer_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h
deleted file mode 100644
index c18001fbd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SetMediaClockTimer_responseMarshaller
- {
- static bool checkIntegrity(SetMediaClockTimer_response& e);
- static bool checkIntegrityConst(const SetMediaClockTimer_response& e);
-
- static bool fromString(const std::string& s,SetMediaClockTimer_response& e);
- static const std::string toString(const SetMediaClockTimer_response& e);
-
- static bool fromJSON(const Json::Value& s,SetMediaClockTimer_response& e);
- static Json::Value toJSON(const SetMediaClockTimer_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp
deleted file mode 100644
index 38896f853..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-#include "ShowConstantTBT_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ShowConstantTBT_request& ShowConstantTBT_request::operator =(const ShowConstantTBT_request& c)
-{
- navigationText1= c.navigationText1 ? new std::string(c.navigationText1[0]) : 0;
- navigationText2= c.navigationText2 ? new std::string(c.navigationText2[0]) : 0;
- eta= c.eta ? new std::string(c.eta[0]) : 0;
- totalDistance= c.totalDistance ? new std::string(c.totalDistance[0]) : 0;
- turnIcon= c.turnIcon;
- distanceToManeuver= c.distanceToManeuver;
- distanceToManeuverScale= c.distanceToManeuverScale;
- maneuverComplete= c.maneuverComplete ? new bool(c.maneuverComplete[0]) : 0;
- softButtons= c.softButtons;
-
- return *this;
-}
-
-
-ShowConstantTBT_request::~ShowConstantTBT_request(void)
-{
- if(navigationText1)
- delete navigationText1;
- if(navigationText2)
- delete navigationText2;
- if(eta)
- delete eta;
- if(totalDistance)
- delete totalDistance;
- if(maneuverComplete)
- delete maneuverComplete;
-}
-
-
-ShowConstantTBT_request::ShowConstantTBT_request(const ShowConstantTBT_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool ShowConstantTBT_request::checkIntegrity(void)
-{
- return ShowConstantTBT_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ShowConstantTBT_request::ShowConstantTBT_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- navigationText1(0),
- navigationText2(0),
- eta(0),
- totalDistance(0),
- maneuverComplete(0)
-{
-}
-
-
-
-bool ShowConstantTBT_request::set_navigationText1(const std::string& navigationText1_)
-{
- if(navigationText1_.length()>500) return false;
- delete navigationText1;
- navigationText1=0;
-
- navigationText1=new std::string(navigationText1_);
- return true;
-}
-
-void ShowConstantTBT_request::reset_navigationText1(void)
-{
- if(navigationText1)
- delete navigationText1;
- navigationText1=0;
-}
-
-bool ShowConstantTBT_request::set_navigationText2(const std::string& navigationText2_)
-{
- if(navigationText2_.length()>500) return false;
- delete navigationText2;
- navigationText2=0;
-
- navigationText2=new std::string(navigationText2_);
- return true;
-}
-
-void ShowConstantTBT_request::reset_navigationText2(void)
-{
- if(navigationText2)
- delete navigationText2;
- navigationText2=0;
-}
-
-bool ShowConstantTBT_request::set_eta(const std::string& eta_)
-{
- if(eta_.length()>500) return false;
- delete eta;
- eta=0;
-
- eta=new std::string(eta_);
- return true;
-}
-
-void ShowConstantTBT_request::reset_eta(void)
-{
- if(eta)
- delete eta;
- eta=0;
-}
-
-bool ShowConstantTBT_request::set_totalDistance(const std::string& totalDistance_)
-{
- if(totalDistance_.length()>500) return false;
- delete totalDistance;
- totalDistance=0;
-
- totalDistance=new std::string(totalDistance_);
- return true;
-}
-
-void ShowConstantTBT_request::reset_totalDistance(void)
-{
- if(totalDistance)
- delete totalDistance;
- totalDistance=0;
-}
-
-bool ShowConstantTBT_request::set_turnIcon(const Image& turnIcon_)
-{
- if(!ImageMarshaller::checkIntegrityConst(turnIcon_)) return false;
- turnIcon=turnIcon_;
- return true;
-}
-
-bool ShowConstantTBT_request::set_distanceToManeuver(float distanceToManeuver_)
-{
- if(distanceToManeuver_>1000000000) return false;
- if(distanceToManeuver_<0) return false;
- distanceToManeuver=distanceToManeuver_;
- return true;
-}
-
-bool ShowConstantTBT_request::set_distanceToManeuverScale(float distanceToManeuverScale_)
-{
- if(distanceToManeuverScale_>1000000000) return false;
- if(distanceToManeuverScale_<0) return false;
- distanceToManeuverScale=distanceToManeuverScale_;
- return true;
-}
-
-bool ShowConstantTBT_request::set_maneuverComplete(bool maneuverComplete_)
-{
- delete maneuverComplete;
- maneuverComplete=0;
-
- maneuverComplete=new bool(maneuverComplete_);
- return true;
-}
-
-void ShowConstantTBT_request::reset_maneuverComplete(void)
-{
- if(maneuverComplete)
- delete maneuverComplete;
- maneuverComplete=0;
-}
-
-bool ShowConstantTBT_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
- unsigned int i=softButtons_.size();
- if(i>3 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i])) return false;
- }
- softButtons=softButtons_;
- return true;
-}
-
-
-
-
-const std::string* ShowConstantTBT_request::get_navigationText1(void) const
-{
- return navigationText1;
-}
-
-const std::string* ShowConstantTBT_request::get_navigationText2(void) const
-{
- return navigationText2;
-}
-
-const std::string* ShowConstantTBT_request::get_eta(void) const
-{
- return eta;
-}
-
-const std::string* ShowConstantTBT_request::get_totalDistance(void) const
-{
- return totalDistance;
-}
-
-const Image& ShowConstantTBT_request::get_turnIcon(void) const
-{
- return turnIcon;
-}
-
-float ShowConstantTBT_request::get_distanceToManeuver(void) const
-{
- return distanceToManeuver;
-}
-
-float ShowConstantTBT_request::get_distanceToManeuverScale(void) const
-{
- return distanceToManeuverScale;
-}
-
-const bool* ShowConstantTBT_request::get_maneuverComplete(void) const
-{
- return maneuverComplete;
-}
-
-const std::vector<SoftButton>& ShowConstantTBT_request::get_softButtons(void) const
-{
- return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp
deleted file mode 100644
index 4ccb3959b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-
-#include "ShowConstantTBT_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ShowConstantTBT_requestMarshaller::checkIntegrity(ShowConstantTBT_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ShowConstantTBT_requestMarshaller::fromString(const std::string& s,ShowConstantTBT_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ShowConstantTBT_requestMarshaller::toString(const ShowConstantTBT_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowConstantTBT_requestMarshaller::checkIntegrityConst(const ShowConstantTBT_request& s)
-{
- if(s.navigationText1 && s.navigationText1->length()>500) return false;
- if(s.navigationText2 && s.navigationText2->length()>500) return false;
- if(s.eta && s.eta->length()>500) return false;
- if(s.totalDistance && s.totalDistance->length()>500) return false;
- if(!ImageMarshaller::checkIntegrityConst(s.turnIcon)) return false;
- if(s.distanceToManeuver>1000000000) return false;
- if(s.distanceToManeuver<0) return false;
- if(s.distanceToManeuverScale>1000000000) return false;
- if(s.distanceToManeuverScale<0) return false;
- {
- unsigned int i=s.softButtons.size();
- if(i>3 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value ShowConstantTBT_requestMarshaller::toJSON(const ShowConstantTBT_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.navigationText1)
- json["navigationText1"]=Json::Value(*e.navigationText1);
-
- if(e.navigationText2)
- json["navigationText2"]=Json::Value(*e.navigationText2);
-
- if(e.eta)
- json["eta"]=Json::Value(*e.eta);
-
- if(e.totalDistance)
- json["totalDistance"]=Json::Value(*e.totalDistance);
-
- json["turnIcon"]=ImageMarshaller::toJSON(e.turnIcon);
-
- json["distanceToManeuver"]=Json::Value(e.distanceToManeuver);
-
- json["distanceToManeuverScale"]=Json::Value(e.distanceToManeuverScale);
-
- if(e.maneuverComplete)
- json["maneuverComplete"]=Json::Value(*e.maneuverComplete);
-
- json["softButtons"]=Json::Value(Json::arrayValue);
- json["softButtons"].resize(e.softButtons.size());
- for(unsigned int i=0;i<e.softButtons.size();i++)
- json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
- return json;
-}
-
-
-bool ShowConstantTBT_requestMarshaller::fromJSON(const Json::Value& json,ShowConstantTBT_request& c)
-{
- if(c.navigationText1) delete c.navigationText1;
- c.navigationText1=0;
-
- if(c.navigationText2) delete c.navigationText2;
- c.navigationText2=0;
-
- if(c.eta) delete c.eta;
- c.eta=0;
-
- if(c.totalDistance) delete c.totalDistance;
- c.totalDistance=0;
-
- if(c.maneuverComplete) delete c.maneuverComplete;
- c.maneuverComplete=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("navigationText1"))
- {
- const Json::Value& j=json["navigationText1"];
- if(!j.isString()) return false;
- c.navigationText1=new std::string(j.asString());
- }
- if(json.isMember("navigationText2"))
- {
- const Json::Value& j=json["navigationText2"];
- if(!j.isString()) return false;
- c.navigationText2=new std::string(j.asString());
- }
- if(json.isMember("eta"))
- {
- const Json::Value& j=json["eta"];
- if(!j.isString()) return false;
- c.eta=new std::string(j.asString());
- }
- if(json.isMember("totalDistance"))
- {
- const Json::Value& j=json["totalDistance"];
- if(!j.isString()) return false;
- c.totalDistance=new std::string(j.asString());
- }
- if(!json.isMember("turnIcon")) return false;
- {
- const Json::Value& j=json["turnIcon"];
- if(!ImageMarshaller::fromJSON(j,c.turnIcon))
- return false;
- }
- if(!json.isMember("distanceToManeuver")) return false;
- {
- const Json::Value& j=json["distanceToManeuver"];
- if(!j.isNumeric()) return false;
- c.distanceToManeuver=j.asDouble();
- }
- if(!json.isMember("distanceToManeuverScale")) return false;
- {
- const Json::Value& j=json["distanceToManeuverScale"];
- if(!j.isNumeric()) return false;
- c.distanceToManeuverScale=j.asDouble();
- }
- if(json.isMember("maneuverComplete"))
- {
- const Json::Value& j=json["maneuverComplete"];
- if(!j.isBool()) return false;
- c.maneuverComplete=new bool(j.asBool());
- }
- if(!json.isMember("softButtons")) return false;
- {
- const Json::Value& j=json["softButtons"];
- if(!j.isArray()) return false;
- c.softButtons.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButton t;
- if(!SoftButtonMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtons[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h
deleted file mode 100644
index c5a1976a7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ShowConstantTBT_requestMarshaller
- {
- static bool checkIntegrity(ShowConstantTBT_request& e);
- static bool checkIntegrityConst(const ShowConstantTBT_request& e);
-
- static bool fromString(const std::string& s,ShowConstantTBT_request& e);
- static const std::string toString(const ShowConstantTBT_request& e);
-
- static bool fromJSON(const Json::Value& s,ShowConstantTBT_request& e);
- static Json::Value toJSON(const ShowConstantTBT_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp
deleted file mode 100644
index 02be0cf75..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-#include "ShowConstantTBT_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ShowConstantTBT_response& ShowConstantTBT_response::operator =(const ShowConstantTBT_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-ShowConstantTBT_response::~ShowConstantTBT_response(void)
-{}
-
-ShowConstantTBT_response::ShowConstantTBT_response(const ShowConstantTBT_response& c)
-{
- *this = c;
-}
-
-bool ShowConstantTBT_response::checkIntegrity(void)
-{
- return ShowConstantTBT_responseMarshaller::checkIntegrity(*this);
-}
-
-ShowConstantTBT_response::ShowConstantTBT_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp
deleted file mode 100644
index d0f8eb235..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-#include "ResultMarshaller.h"
-
-#include "ShowConstantTBT_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ShowConstantTBT_responseMarshaller::checkIntegrity(ShowConstantTBT_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool ShowConstantTBT_responseMarshaller::fromString(const std::string& s,ShowConstantTBT_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string ShowConstantTBT_responseMarshaller::toString(const ShowConstantTBT_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowConstantTBT_responseMarshaller::checkIntegrityConst(const ShowConstantTBT_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value ShowConstantTBT_responseMarshaller::toJSON(const ShowConstantTBT_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool ShowConstantTBT_responseMarshaller::fromJSON(const Json::Value& json,ShowConstantTBT_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h
deleted file mode 100644
index 0748d4fd7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct ShowConstantTBT_responseMarshaller
- {
- static bool checkIntegrity(ShowConstantTBT_response& e);
- static bool checkIntegrityConst(const ShowConstantTBT_response& e);
-
- static bool fromString(const std::string& s,ShowConstantTBT_response& e);
- static const std::string toString(const ShowConstantTBT_response& e);
-
- static bool fromJSON(const Json::Value& s,ShowConstantTBT_response& e);
- static Json::Value toJSON(const ShowConstantTBT_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp
deleted file mode 100644
index 4904e3fa8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-#include "Show_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TextAlignmentMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Show_request& Show_request::operator =(const Show_request& c)
-{
- mainField1= c.mainField1 ? new std::string(c.mainField1[0]) : 0;
- mainField2= c.mainField2 ? new std::string(c.mainField2[0]) : 0;
- mainField3= c.mainField3 ? new std::string(c.mainField3[0]) : 0;
- mainField4= c.mainField4 ? new std::string(c.mainField4[0]) : 0;
- alignment= c.alignment ? new TextAlignment(c.alignment[0]) : 0;
- statusBar= c.statusBar ? new std::string(c.statusBar[0]) : 0;
- mediaClock= c.mediaClock ? new std::string(c.mediaClock[0]) : 0;
- mediaTrack= c.mediaTrack ? new std::string(c.mediaTrack[0]) : 0;
- graphic= c.graphic ? new Image(c.graphic[0]) : 0;
- softButtons= c.softButtons ? new std::vector<SoftButton>(c.softButtons[0]) : 0;
- customPresets= c.customPresets ? new std::vector<std::string>(c.customPresets[0]) : 0;
-
- return *this;
-}
-
-
-Show_request::~Show_request(void)
-{
- if(mainField1)
- delete mainField1;
- if(mainField2)
- delete mainField2;
- if(mainField3)
- delete mainField3;
- if(mainField4)
- delete mainField4;
- if(alignment)
- delete alignment;
- if(statusBar)
- delete statusBar;
- if(mediaClock)
- delete mediaClock;
- if(mediaTrack)
- delete mediaTrack;
- if(graphic)
- delete graphic;
- if(softButtons)
- delete softButtons;
- if(customPresets)
- delete customPresets;
-}
-
-
-Show_request::Show_request(const Show_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool Show_request::checkIntegrity(void)
-{
- return Show_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Show_request::Show_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- mainField1(0),
- mainField2(0),
- mainField3(0),
- mainField4(0),
- alignment(0),
- statusBar(0),
- mediaClock(0),
- mediaTrack(0),
- graphic(0),
- softButtons(0),
- customPresets(0)
-{
-}
-
-
-
-bool Show_request::set_mainField1(const std::string& mainField1_)
-{
- if(mainField1_.length()>500) return false;
- delete mainField1;
- mainField1=0;
-
- mainField1=new std::string(mainField1_);
- return true;
-}
-
-void Show_request::reset_mainField1(void)
-{
- if(mainField1)
- delete mainField1;
- mainField1=0;
-}
-
-bool Show_request::set_mainField2(const std::string& mainField2_)
-{
- if(mainField2_.length()>500) return false;
- delete mainField2;
- mainField2=0;
-
- mainField2=new std::string(mainField2_);
- return true;
-}
-
-void Show_request::reset_mainField2(void)
-{
- if(mainField2)
- delete mainField2;
- mainField2=0;
-}
-
-bool Show_request::set_mainField3(const std::string& mainField3_)
-{
- if(mainField3_.length()>500) return false;
- delete mainField3;
- mainField3=0;
-
- mainField3=new std::string(mainField3_);
- return true;
-}
-
-void Show_request::reset_mainField3(void)
-{
- if(mainField3)
- delete mainField3;
- mainField3=0;
-}
-
-bool Show_request::set_mainField4(const std::string& mainField4_)
-{
- if(mainField4_.length()>500) return false;
- delete mainField4;
- mainField4=0;
-
- mainField4=new std::string(mainField4_);
- return true;
-}
-
-void Show_request::reset_mainField4(void)
-{
- if(mainField4)
- delete mainField4;
- mainField4=0;
-}
-
-bool Show_request::set_alignment(const TextAlignment& alignment_)
-{
- if(!TextAlignmentMarshaller::checkIntegrityConst(alignment_)) return false;
- delete alignment;
- alignment=0;
-
- alignment=new TextAlignment(alignment_);
- return true;
-}
-
-void Show_request::reset_alignment(void)
-{
- if(alignment)
- delete alignment;
- alignment=0;
-}
-
-bool Show_request::set_statusBar(const std::string& statusBar_)
-{
- if(statusBar_.length()>500) return false;
- delete statusBar;
- statusBar=0;
-
- statusBar=new std::string(statusBar_);
- return true;
-}
-
-void Show_request::reset_statusBar(void)
-{
- if(statusBar)
- delete statusBar;
- statusBar=0;
-}
-
-bool Show_request::set_mediaClock(const std::string& mediaClock_)
-{
- if(mediaClock_.length()>500) return false;
- delete mediaClock;
- mediaClock=0;
-
- mediaClock=new std::string(mediaClock_);
- return true;
-}
-
-void Show_request::reset_mediaClock(void)
-{
- if(mediaClock)
- delete mediaClock;
- mediaClock=0;
-}
-
-bool Show_request::set_mediaTrack(const std::string& mediaTrack_)
-{
- if(mediaTrack_.length()>500) return false;
- delete mediaTrack;
- mediaTrack=0;
-
- mediaTrack=new std::string(mediaTrack_);
- return true;
-}
-
-void Show_request::reset_mediaTrack(void)
-{
- if(mediaTrack)
- delete mediaTrack;
- mediaTrack=0;
-}
-
-bool Show_request::set_graphic(const Image& graphic_)
-{
- if(!ImageMarshaller::checkIntegrityConst(graphic_)) return false;
- delete graphic;
- graphic=0;
-
- graphic=new Image(graphic_);
- return true;
-}
-
-void Show_request::reset_graphic(void)
-{
- if(graphic)
- delete graphic;
- graphic=0;
-}
-
-bool Show_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
- unsigned int i=softButtons_.size();
- if(i>8 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i])) return false;
- }
- delete softButtons;
- softButtons=0;
-
- softButtons=new std::vector<SoftButton>(softButtons_);
- return true;
-}
-
-void Show_request::reset_softButtons(void)
-{
- if(softButtons)
- delete softButtons;
- softButtons=0;
-}
-
-bool Show_request::set_customPresets(const std::vector<std::string>& customPresets_)
-{
- unsigned int i=customPresets_.size();
- if(i>6 || i<0) return false;
- while(i--)
- {
- if(customPresets_[i].length()>500) return false;
- }
- delete customPresets;
- customPresets=0;
-
- customPresets=new std::vector<std::string>(customPresets_);
- return true;
-}
-
-void Show_request::reset_customPresets(void)
-{
- if(customPresets)
- delete customPresets;
- customPresets=0;
-}
-
-
-
-
-const std::string* Show_request::get_mainField1(void) const
-{
- return mainField1;
-}
-
-const std::string* Show_request::get_mainField2(void) const
-{
- return mainField2;
-}
-
-const std::string* Show_request::get_mainField3(void) const
-{
- return mainField3;
-}
-
-const std::string* Show_request::get_mainField4(void) const
-{
- return mainField4;
-}
-
-const TextAlignment* Show_request::get_alignment(void) const
-{
- return alignment;
-}
-
-const std::string* Show_request::get_statusBar(void) const
-{
- return statusBar;
-}
-
-const std::string* Show_request::get_mediaClock(void) const
-{
- return mediaClock;
-}
-
-const std::string* Show_request::get_mediaTrack(void) const
-{
- return mediaTrack;
-}
-
-const Image* Show_request::get_graphic(void) const
-{
- return graphic;
-}
-
-const std::vector<SoftButton>* Show_request::get_softButtons(void) const
-{
- return softButtons;
-}
-
-const std::vector<std::string>* Show_request::get_customPresets(void) const
-{
- return customPresets;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp
deleted file mode 100644
index 83eb71e38..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TextAlignmentMarshaller.h"
-
-#include "Show_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Show_requestMarshaller::checkIntegrity(Show_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Show_requestMarshaller::fromString(const std::string& s,Show_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Show_requestMarshaller::toString(const Show_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Show_requestMarshaller::checkIntegrityConst(const Show_request& s)
-{
- if(s.mainField1 && s.mainField1->length()>500) return false;
- if(s.mainField2 && s.mainField2->length()>500) return false;
- if(s.mainField3 && s.mainField3->length()>500) return false;
- if(s.mainField4 && s.mainField4->length()>500) return false;
- if(s.alignment && !TextAlignmentMarshaller::checkIntegrityConst(*s.alignment)) return false;
- if(s.statusBar && s.statusBar->length()>500) return false;
- if(s.mediaClock && s.mediaClock->length()>500) return false;
- if(s.mediaTrack && s.mediaTrack->length()>500) return false;
- if(s.graphic && !ImageMarshaller::checkIntegrityConst(*s.graphic)) return false;
- if(s.softButtons)
- {
- unsigned int i=s.softButtons[0].size();
- if(i>8 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[0][i])) return false;
- }
- }
- if(s.customPresets)
- {
- unsigned int i=s.customPresets[0].size();
- if(i>6 || i<0) return false;
- while(i--)
- {
- if(s.customPresets[0][i].length()>500) return false;
- }
- }
- return true;
-}
-
-Json::Value Show_requestMarshaller::toJSON(const Show_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.mainField1)
- json["mainField1"]=Json::Value(*e.mainField1);
-
- if(e.mainField2)
- json["mainField2"]=Json::Value(*e.mainField2);
-
- if(e.mainField3)
- json["mainField3"]=Json::Value(*e.mainField3);
-
- if(e.mainField4)
- json["mainField4"]=Json::Value(*e.mainField4);
-
- if(e.alignment)
- json["alignment"]=TextAlignmentMarshaller::toJSON(*e.alignment);
-
- if(e.statusBar)
- json["statusBar"]=Json::Value(*e.statusBar);
-
- if(e.mediaClock)
- json["mediaClock"]=Json::Value(*e.mediaClock);
-
- if(e.mediaTrack)
- json["mediaTrack"]=Json::Value(*e.mediaTrack);
-
- if(e.graphic)
- json["graphic"]=ImageMarshaller::toJSON(*e.graphic);
-
- if(e.softButtons)
- {
- unsigned int sz=e.softButtons->size();
- json["softButtons"]=Json::Value(Json::arrayValue);
- json["softButtons"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
- }
-
- if(e.customPresets)
- {
- unsigned int sz=e.customPresets->size();
- json["customPresets"]=Json::Value(Json::arrayValue);
- json["customPresets"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["customPresets"][i]=Json::Value(e.customPresets[0][i]);
- }
-
- return json;
-}
-
-
-bool Show_requestMarshaller::fromJSON(const Json::Value& json,Show_request& c)
-{
- if(c.mainField1) delete c.mainField1;
- c.mainField1=0;
-
- if(c.mainField2) delete c.mainField2;
- c.mainField2=0;
-
- if(c.mainField3) delete c.mainField3;
- c.mainField3=0;
-
- if(c.mainField4) delete c.mainField4;
- c.mainField4=0;
-
- if(c.alignment) delete c.alignment;
- c.alignment=0;
-
- if(c.statusBar) delete c.statusBar;
- c.statusBar=0;
-
- if(c.mediaClock) delete c.mediaClock;
- c.mediaClock=0;
-
- if(c.mediaTrack) delete c.mediaTrack;
- c.mediaTrack=0;
-
- if(c.graphic) delete c.graphic;
- c.graphic=0;
-
- if(c.softButtons) delete c.softButtons;
- c.softButtons=0;
-
- if(c.customPresets) delete c.customPresets;
- c.customPresets=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("mainField1"))
- {
- const Json::Value& j=json["mainField1"];
- if(!j.isString()) return false;
- c.mainField1=new std::string(j.asString());
- }
- if(json.isMember("mainField2"))
- {
- const Json::Value& j=json["mainField2"];
- if(!j.isString()) return false;
- c.mainField2=new std::string(j.asString());
- }
- if(json.isMember("mainField3"))
- {
- const Json::Value& j=json["mainField3"];
- if(!j.isString()) return false;
- c.mainField3=new std::string(j.asString());
- }
- if(json.isMember("mainField4"))
- {
- const Json::Value& j=json["mainField4"];
- if(!j.isString()) return false;
- c.mainField4=new std::string(j.asString());
- }
- if(json.isMember("alignment"))
- {
- const Json::Value& j=json["alignment"];
- c.alignment=new TextAlignment();
- if(!TextAlignmentMarshaller::fromJSON(j,c.alignment[0]))
- return false;
- }
- if(json.isMember("statusBar"))
- {
- const Json::Value& j=json["statusBar"];
- if(!j.isString()) return false;
- c.statusBar=new std::string(j.asString());
- }
- if(json.isMember("mediaClock"))
- {
- const Json::Value& j=json["mediaClock"];
- if(!j.isString()) return false;
- c.mediaClock=new std::string(j.asString());
- }
- if(json.isMember("mediaTrack"))
- {
- const Json::Value& j=json["mediaTrack"];
- if(!j.isString()) return false;
- c.mediaTrack=new std::string(j.asString());
- }
- if(json.isMember("graphic"))
- {
- const Json::Value& j=json["graphic"];
- c.graphic=new Image();
- if(!ImageMarshaller::fromJSON(j,c.graphic[0]))
- return false;
- }
- if(json.isMember("softButtons"))
- {
- const Json::Value& j=json["softButtons"];
- if(!j.isArray()) return false;
- c.softButtons=new std::vector<SoftButton>();
- c.softButtons->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButton t;
- if(!SoftButtonMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtons[0][i]=t;
- }
-
- }
- if(json.isMember("customPresets"))
- {
- const Json::Value& j=json["customPresets"];
- if(!j.isArray()) return false;
- c.customPresets=new std::vector<std::string>();
- c.customPresets->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.customPresets[0][i]=j[i].asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h
deleted file mode 100644
index 6907f79a0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOW_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOW_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Show_requestMarshaller
- {
- static bool checkIntegrity(Show_request& e);
- static bool checkIntegrityConst(const Show_request& e);
-
- static bool fromString(const std::string& s,Show_request& e);
- static const std::string toString(const Show_request& e);
-
- static bool fromJSON(const Json::Value& s,Show_request& e);
- static Json::Value toJSON(const Show_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp
deleted file mode 100644
index 420e8e3d8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-#include "Show_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Show_response& Show_response::operator =(const Show_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-Show_response::~Show_response(void)
-{}
-
-Show_response::Show_response(const Show_response& c)
-{
- *this = c;
-}
-
-bool Show_response::checkIntegrity(void)
-{
- return Show_responseMarshaller::checkIntegrity(*this);
-}
-
-Show_response::Show_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp
deleted file mode 100644
index bda81a476..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-#include "ResultMarshaller.h"
-
-#include "Show_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Show_responseMarshaller::checkIntegrity(Show_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Show_responseMarshaller::fromString(const std::string& s,Show_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Show_responseMarshaller::toString(const Show_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Show_responseMarshaller::checkIntegrityConst(const Show_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value Show_responseMarshaller::toJSON(const Show_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool Show_responseMarshaller::fromJSON(const Json::Value& json,Show_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h
deleted file mode 100644
index 5bd3e025d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOW_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOW_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Show_responseMarshaller
- {
- static bool checkIntegrity(Show_response& e);
- static bool checkIntegrityConst(const Show_response& e);
-
- static bool fromString(const std::string& s,Show_response& e);
- static const std::string toString(const Show_response& e);
-
- static bool fromJSON(const Json::Value& s,Show_response& e);
- static Json::Value toJSON(const Show_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp
deleted file mode 100644
index 12a3a6118..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h"
-#include "SingleTirePressureStatusMarshaller.h"
-#include "SingleTirePressureStatusMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SingleTirePressureStatus::SingleTirePressureStatusInternal SingleTirePressureStatusMarshaller::getIndex(const char* s)
-{
- if(!s)
- return SingleTirePressureStatus::INVALID_ENUM;
- const struct PerfectHashTable* p=SingleTirePressureStatus_intHash::getPointer(s,strlen(s));
- return p ? static_cast<SingleTirePressureStatus::SingleTirePressureStatusInternal>(p->idx) : SingleTirePressureStatus::INVALID_ENUM;
-}
-
-
-bool SingleTirePressureStatusMarshaller::fromJSON(const Json::Value& s,SingleTirePressureStatus& e)
-{
- e.mInternal=SingleTirePressureStatus::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=SingleTirePressureStatus::INVALID_ENUM);
-}
-
-
-Json::Value SingleTirePressureStatusMarshaller::toJSON(const SingleTirePressureStatus& e)
-{
- if(e.mInternal==SingleTirePressureStatus::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SingleTirePressureStatusMarshaller::fromString(const std::string& s,SingleTirePressureStatus& e)
-{
- e.mInternal=SingleTirePressureStatus::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string SingleTirePressureStatusMarshaller::toString(const SingleTirePressureStatus& e)
-{
- Json::FastWriter writer;
- return e.mInternal==SingleTirePressureStatus::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SingleTirePressureStatusMarshaller::mHashTable[5]=
-{
- {"UNKNOWN",0},
- {"NORMAL",1},
- {"LOW",2},
- {"FAULT",3},
- {"NOT_SUPPORTED",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp
deleted file mode 100644
index 568cc2b93..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SingleTirePressureStatus_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-UNKNOWN,0
-NORMAL,1
-LOW,2
-FAULT,3
-NOT_SUPPORTED,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h
deleted file mode 100644
index c84ebdba8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SINGLETIREPRESSURESTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SINGLETIREPRESSURESTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SingleTirePressureStatus
-
- class SingleTirePressureStatusMarshaller
- {
- public:
-
- static std::string toName(const SingleTirePressureStatus& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(SingleTirePressureStatus& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=SingleTirePressureStatus::INVALID_ENUM;
- }
-
- static bool checkIntegrity(SingleTirePressureStatus& e) { return e.mInternal!=SingleTirePressureStatus::INVALID_ENUM; }
- static bool checkIntegrityConst(const SingleTirePressureStatus& e) { return e.mInternal!=SingleTirePressureStatus::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,SingleTirePressureStatus& e);
- static const std::string toString(const SingleTirePressureStatus& e);
-
- static bool fromJSON(const Json::Value& s,SingleTirePressureStatus& e);
- static Json::Value toJSON(const SingleTirePressureStatus& e);
-
- static const char* getName(SingleTirePressureStatus::SingleTirePressureStatusInternal e)
- {
- return (e>=0 && e<5) ? mHashTable[e].name : NULL;
- }
-
- static const SingleTirePressureStatus::SingleTirePressureStatusInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[5];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc
deleted file mode 100644
index 1704e4a70..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 13
-/* maximum key range = 11, duplicates = 0 */
-
-class SingleTirePressureStatus_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SingleTirePressureStatus_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SingleTirePressureStatus_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 3, 0, 5, 6, 7, 0, 0, 0, 0, 0, 13
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
- {"LOW",2},
- {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
- {"FAULT",3},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
- {"NORMAL",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
- {"UNKNOWN",0},
- {""}, {""}, {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
- {"NOT_SUPPORTED",4}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp
deleted file mode 100644
index 997eb9dde..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h"
-#include "SingleTireStatusMarshaller.h"
-#include "SingleTirePressureStatusMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SingleTireStatus::SingleTireStatus(const SingleTireStatus& c)
-{
- *this=c;
-}
-
-
-bool SingleTireStatus::checkIntegrity(void)
-{
- return SingleTireStatusMarshaller::checkIntegrity(*this);
-}
-
-
-SingleTireStatus::SingleTireStatus(void)
-{
-}
-
-
-
-bool SingleTireStatus::set_pressure(unsigned int pressure_)
-{
- if(pressure_>255) return false;
- pressure=pressure_;
- return true;
-}
-
-bool SingleTireStatus::set_status(const SingleTirePressureStatus& status_)
-{
- if(!SingleTirePressureStatusMarshaller::checkIntegrityConst(status_)) return false;
- status=status_;
- return true;
-}
-
-
-
-
-unsigned int SingleTireStatus::get_pressure(void) const
-{
- return pressure;
-}
-
-
-const SingleTirePressureStatus& SingleTireStatus::get_status(void) const
-{
- return status;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp
deleted file mode 100644
index 445335d5d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h"
-#include "SingleTirePressureStatusMarshaller.h"
-
-#include "SingleTireStatusMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SingleTireStatusMarshaller::checkIntegrity(SingleTireStatus& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SingleTireStatusMarshaller::fromString(const std::string& s,SingleTireStatus& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SingleTireStatusMarshaller::toString(const SingleTireStatus& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SingleTireStatusMarshaller::checkIntegrityConst(const SingleTireStatus& s)
-{
- if(s.pressure>255) return false;
- if(!SingleTirePressureStatusMarshaller::checkIntegrityConst(s.status)) return false;
- return true;
-}
-
-Json::Value SingleTireStatusMarshaller::toJSON(const SingleTireStatus& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["pressure"]=Json::Value(e.pressure);
-
- json["status"]=SingleTirePressureStatusMarshaller::toJSON(e.status);
-
-
- return json;
-}
-
-
-bool SingleTireStatusMarshaller::fromJSON(const Json::Value& json,SingleTireStatus& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("pressure")) return false;
- {
- const Json::Value& j=json["pressure"];
- if(!j.isInt()) return false;
- c.pressure=j.asInt();
- }
- if(!json.isMember("status")) return false;
- {
- const Json::Value& j=json["status"];
- if(!SingleTirePressureStatusMarshaller::fromJSON(j,c.status))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h
deleted file mode 100644
index 86dc330a9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SINGLETIRESTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SINGLETIRESTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SingleTireStatusMarshaller
- {
- static bool checkIntegrity(SingleTireStatus& e);
- static bool checkIntegrityConst(const SingleTireStatus& e);
-
- static bool fromString(const std::string& s,SingleTireStatus& e);
- static const std::string toString(const SingleTireStatus& e);
-
- static bool fromJSON(const Json::Value& s,SingleTireStatus& e);
- static Json::Value toJSON(const SingleTireStatus& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp
deleted file mode 100644
index e44ee76c7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-#include "Slider_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Slider_request& Slider_request::operator =(const Slider_request& c)
-{
- numTicks= c.numTicks;
- position= c.position;
- sliderHeader= c.sliderHeader;
- sliderFooter= c.sliderFooter ? new std::vector<std::string>(c.sliderFooter[0]) : 0;
- timeout= c.timeout;
-
- return *this;
-}
-
-
-Slider_request::~Slider_request(void)
-{
- if(sliderFooter)
- delete sliderFooter;
-}
-
-
-Slider_request::Slider_request(const Slider_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool Slider_request::checkIntegrity(void)
-{
- return Slider_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Slider_request::Slider_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
- sliderFooter(0)
-{
-}
-
-
-
-bool Slider_request::set_numTicks(unsigned int numTicks_)
-{
- if(numTicks_>26) return false;
- if(numTicks_<2) return false;
- numTicks=numTicks_;
- return true;
-}
-
-bool Slider_request::set_position(unsigned int position_)
-{
- if(position_>26) return false;
- if(position_<1) return false;
- position=position_;
- return true;
-}
-
-bool Slider_request::set_sliderHeader(const std::string& sliderHeader_)
-{
- if(sliderHeader_.length()>500) return false;
- sliderHeader=sliderHeader_;
- return true;
-}
-
-bool Slider_request::set_sliderFooter(const std::vector<std::string>& sliderFooter_)
-{
- unsigned int i=sliderFooter_.size();
- if(i>26 || i<1) return false;
- while(i--)
- {
- if(sliderFooter_[i].length()>500) return false;
- }
- delete sliderFooter;
- sliderFooter=0;
-
- sliderFooter=new std::vector<std::string>(sliderFooter_);
- return true;
-}
-
-void Slider_request::reset_sliderFooter(void)
-{
- if(sliderFooter)
- delete sliderFooter;
- sliderFooter=0;
-}
-
-bool Slider_request::set_timeout(unsigned int timeout_)
-{
- if(timeout_>65535) return false;
- timeout=timeout_;
- return true;
-}
-
-
-
-
-unsigned int Slider_request::get_numTicks(void) const
-{
- return numTicks;
-}
-
-unsigned int Slider_request::get_position(void) const
-{
- return position;
-}
-
-const std::string& Slider_request::get_sliderHeader(void) const
-{
- return sliderHeader;
-}
-
-const std::vector<std::string>* Slider_request::get_sliderFooter(void) const
-{
- return sliderFooter;
-}
-
-unsigned int Slider_request::get_timeout(void) const
-{
- return timeout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp
deleted file mode 100644
index ee7808a65..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-
-
-#include "Slider_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Slider_requestMarshaller::checkIntegrity(Slider_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Slider_requestMarshaller::fromString(const std::string& s,Slider_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Slider_requestMarshaller::toString(const Slider_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Slider_requestMarshaller::checkIntegrityConst(const Slider_request& s)
-{
- if(s.numTicks>26) return false;
- if(s.numTicks<2) return false;
- if(s.position>26) return false;
- if(s.position<1) return false;
- if(s.sliderHeader.length()>500) return false;
- if(s.sliderFooter)
- {
- unsigned int i=s.sliderFooter[0].size();
- if(i>26 || i<1) return false;
- while(i--)
- {
- if(s.sliderFooter[0][i].length()>500) return false;
- }
- }
- if(s.timeout>65535) return false;
- return true;
-}
-
-Json::Value Slider_requestMarshaller::toJSON(const Slider_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["numTicks"]=Json::Value(e.numTicks);
-
- json["position"]=Json::Value(e.position);
-
- json["sliderHeader"]=Json::Value(e.sliderHeader);
-
- if(e.sliderFooter)
- {
- unsigned int sz=e.sliderFooter->size();
- json["sliderFooter"]=Json::Value(Json::arrayValue);
- json["sliderFooter"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["sliderFooter"][i]=Json::Value(e.sliderFooter[0][i]);
- }
-
- json["timeout"]=Json::Value(e.timeout);
-
- return json;
-}
-
-
-bool Slider_requestMarshaller::fromJSON(const Json::Value& json,Slider_request& c)
-{
- if(c.sliderFooter) delete c.sliderFooter;
- c.sliderFooter=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("numTicks")) return false;
- {
- const Json::Value& j=json["numTicks"];
- if(!j.isInt()) return false;
- c.numTicks=j.asInt();
- }
- if(!json.isMember("position")) return false;
- {
- const Json::Value& j=json["position"];
- if(!j.isInt()) return false;
- c.position=j.asInt();
- }
- if(!json.isMember("sliderHeader")) return false;
- {
- const Json::Value& j=json["sliderHeader"];
- if(!j.isString()) return false;
- c.sliderHeader=j.asString();
- }
- if(json.isMember("sliderFooter"))
- {
- const Json::Value& j=json["sliderFooter"];
- if(!j.isArray()) return false;
- c.sliderFooter=new std::vector<std::string>();
- c.sliderFooter->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- if(!j[i].isString())
- return false;
- else
- c.sliderFooter[0][i]=j[i].asString();
- }
- if(!json.isMember("timeout")) return false;
- {
- const Json::Value& j=json["timeout"];
- if(!j.isInt()) return false;
- c.timeout=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h
deleted file mode 100644
index 65baf68c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SLIDER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SLIDER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Slider_requestMarshaller
- {
- static bool checkIntegrity(Slider_request& e);
- static bool checkIntegrityConst(const Slider_request& e);
-
- static bool fromString(const std::string& s,Slider_request& e);
- static const std::string toString(const Slider_request& e);
-
- static bool fromJSON(const Json::Value& s,Slider_request& e);
- static Json::Value toJSON(const Slider_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp
deleted file mode 100644
index 6c9bc9a64..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-#include "Slider_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Slider_response& Slider_response::operator =(const Slider_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- sliderPosition = c.sliderPosition;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-Slider_response::~Slider_response(void)
-{}
-
-Slider_response::Slider_response(const Slider_response& c)
-{
- *this = c;
-}
-
-bool Slider_response::checkIntegrity(void)
-{
- return Slider_responseMarshaller::checkIntegrity(*this);
-}
-
-Slider_response::Slider_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , sliderPosition(1)
-{}
-
-bool Slider_response::set_sliderPosition(unsigned int sliderPosition_)
-{
- if (sliderPosition_ > 26)
- {
- return false;
- }
- if (sliderPosition_ < 1)
- {
- return false;
- }
- sliderPosition = sliderPosition_;
- return true;
-}
-
-unsigned int Slider_response::get_sliderPosition(void) const
-{
- return sliderPosition;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp
deleted file mode 100644
index 4632270b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-#include "ResultMarshaller.h"
-
-#include "Slider_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Slider_responseMarshaller::checkIntegrity(Slider_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Slider_responseMarshaller::fromString(const std::string& s,Slider_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Slider_responseMarshaller::toString(const Slider_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Slider_responseMarshaller::checkIntegrityConst(const Slider_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.sliderPosition>26) return false;
- if(s.sliderPosition<1) return false;
- return true;
-}
-
-Json::Value Slider_responseMarshaller::toJSON(const Slider_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- json["sliderPosition"]=Json::Value(e.sliderPosition);
-
- return json;
-}
-
-
-bool Slider_responseMarshaller::fromJSON(const Json::Value& json,Slider_response& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(!json.isMember("sliderPosition")) return false;
- {
- const Json::Value& j=json["sliderPosition"];
- if(!j.isInt()) return false;
- c.sliderPosition=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h
deleted file mode 100644
index 52da1caac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SLIDER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SLIDER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Slider_responseMarshaller
- {
- static bool checkIntegrity(Slider_response& e);
- static bool checkIntegrityConst(const Slider_response& e);
-
- static bool fromString(const std::string& s,Slider_response& e);
- static const std::string toString(const Slider_response& e);
-
- static bool fromJSON(const Json::Value& s,Slider_response& e);
- static Json::Value toJSON(const Slider_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp
deleted file mode 100644
index f10929c19..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-#include "SoftButtonMarshaller.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonTypeMarshaller.h"
-#include "SystemActionMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SoftButton& SoftButton::operator =(const SoftButton& c)
-{
- image=c.image ? new Image(c.image[0]) : 0;
- isHighlighted=c.isHighlighted;
- softButtonID=c.softButtonID;
- systemAction=c.systemAction;
- text=c.text ? new std::string(c.text[0]) : 0;
- type=c.type;
-
- return *this;
-}
-
-
-SoftButton::~SoftButton(void)
-{
- if(image)
- delete image;
- if(text)
- delete text;
-}
-
-
-SoftButton::SoftButton(const SoftButton& c)
-{
- *this=c;
-}
-
-
-bool SoftButton::checkIntegrity(void)
-{
- return SoftButtonMarshaller::checkIntegrity(*this);
-}
-
-
-SoftButton::SoftButton(void) :
- image(0),
- text(0)
-{
-}
-
-
-
-bool SoftButton::set_image(const Image& image_)
-{
- if(!ImageMarshaller::checkIntegrityConst(image_)) return false;
- delete image;
- image=0;
-
- image=new Image(image_);
- return true;
-}
-
-void SoftButton::reset_image(void)
-{
- if(image)
- delete image;
- image=0;
-}
-
-bool SoftButton::set_isHighlighted(bool isHighlighted_)
-{
- isHighlighted=isHighlighted_;
- return true;
-}
-
-bool SoftButton::set_softButtonID(unsigned int softButtonID_)
-{
- if(softButtonID_>65536) return false;
- softButtonID=softButtonID_;
- return true;
-}
-
-bool SoftButton::set_systemAction(const SystemAction& systemAction_)
-{
- if(!SystemActionMarshaller::checkIntegrityConst(systemAction_)) return false;
- systemAction=systemAction_;
- return true;
-}
-
-bool SoftButton::set_text(const std::string& text_)
-{
- if(text_.length()>500) return false;
- delete text;
- text=0;
-
- text=new std::string(text_);
- return true;
-}
-
-void SoftButton::reset_text(void)
-{
- if(text)
- delete text;
- text=0;
-}
-
-bool SoftButton::set_type(const SoftButtonType& type_)
-{
- if(!SoftButtonTypeMarshaller::checkIntegrityConst(type_)) return false;
- type=type_;
- return true;
-}
-
-
-
-
-const Image* SoftButton::get_image(void) const
-{
- return image;
-}
-
-
-bool SoftButton::get_isHighlighted(void) const
-{
- return isHighlighted;
-}
-
-
-unsigned int SoftButton::get_softButtonID(void) const
-{
- return softButtonID;
-}
-
-
-const SystemAction& SoftButton::get_systemAction(void) const
-{
- return systemAction;
-}
-
-
-const std::string* SoftButton::get_text(void) const
-{
- return text;
-}
-
-
-const SoftButtonType& SoftButton::get_type(void) const
-{
- return type;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp
deleted file mode 100644
index 283a6ba4e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-#include "SoftButtonCapabilitiesMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SoftButtonCapabilities::SoftButtonCapabilities(const SoftButtonCapabilities& c)
-{
- *this=c;
-}
-
-
-bool SoftButtonCapabilities::checkIntegrity(void)
-{
- return SoftButtonCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-SoftButtonCapabilities::SoftButtonCapabilities(void)
-{
-}
-
-
-
-bool SoftButtonCapabilities::set_imageSupported(bool imageSupported_)
-{
- imageSupported=imageSupported_;
- return true;
-}
-
-bool SoftButtonCapabilities::set_longPressAvailable(bool longPressAvailable_)
-{
- longPressAvailable=longPressAvailable_;
- return true;
-}
-
-bool SoftButtonCapabilities::set_shortPressAvailable(bool shortPressAvailable_)
-{
- shortPressAvailable=shortPressAvailable_;
- return true;
-}
-
-bool SoftButtonCapabilities::set_upDownAvailable(bool upDownAvailable_)
-{
- upDownAvailable=upDownAvailable_;
- return true;
-}
-
-
-
-
-bool SoftButtonCapabilities::get_imageSupported(void) const
-{
- return imageSupported;
-}
-
-
-bool SoftButtonCapabilities::get_longPressAvailable(void) const
-{
- return longPressAvailable;
-}
-
-
-bool SoftButtonCapabilities::get_shortPressAvailable(void) const
-{
- return shortPressAvailable;
-}
-
-
-bool SoftButtonCapabilities::get_upDownAvailable(void) const
-{
- return upDownAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp
deleted file mode 100644
index fe0b0ac68..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-
-
-#include "SoftButtonCapabilitiesMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SoftButtonCapabilitiesMarshaller::checkIntegrity(SoftButtonCapabilities& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SoftButtonCapabilitiesMarshaller::fromString(const std::string& s,SoftButtonCapabilities& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SoftButtonCapabilitiesMarshaller::toString(const SoftButtonCapabilities& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SoftButtonCapabilitiesMarshaller::checkIntegrityConst(const SoftButtonCapabilities& s)
-{
- return true;
-}
-
-Json::Value SoftButtonCapabilitiesMarshaller::toJSON(const SoftButtonCapabilities& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["imageSupported"]=Json::Value(e.imageSupported);
-
- json["longPressAvailable"]=Json::Value(e.longPressAvailable);
-
- json["shortPressAvailable"]=Json::Value(e.shortPressAvailable);
-
- json["upDownAvailable"]=Json::Value(e.upDownAvailable);
-
-
- return json;
-}
-
-
-bool SoftButtonCapabilitiesMarshaller::fromJSON(const Json::Value& json,SoftButtonCapabilities& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("imageSupported")) return false;
- {
- const Json::Value& j=json["imageSupported"];
- if(!j.isBool()) return false;
- c.imageSupported=j.asBool();
- }
- if(!json.isMember("longPressAvailable")) return false;
- {
- const Json::Value& j=json["longPressAvailable"];
- if(!j.isBool()) return false;
- c.longPressAvailable=j.asBool();
- }
- if(!json.isMember("shortPressAvailable")) return false;
- {
- const Json::Value& j=json["shortPressAvailable"];
- if(!j.isBool()) return false;
- c.shortPressAvailable=j.asBool();
- }
- if(!json.isMember("upDownAvailable")) return false;
- {
- const Json::Value& j=json["upDownAvailable"];
- if(!j.isBool()) return false;
- c.upDownAvailable=j.asBool();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h
deleted file mode 100644
index 1393dcedd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SOFTBUTTONCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SOFTBUTTONCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SoftButtonCapabilitiesMarshaller
- {
- static bool checkIntegrity(SoftButtonCapabilities& e);
- static bool checkIntegrityConst(const SoftButtonCapabilities& e);
-
- static bool fromString(const std::string& s,SoftButtonCapabilities& e);
- static const std::string toString(const SoftButtonCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,SoftButtonCapabilities& e);
- static Json::Value toJSON(const SoftButtonCapabilities& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp
deleted file mode 100644
index 7703cd5ba..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonTypeMarshaller.h"
-#include "SystemActionMarshaller.h"
-
-#include "SoftButtonMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SoftButtonMarshaller::checkIntegrity(SoftButton& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SoftButtonMarshaller::fromString(const std::string& s,SoftButton& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SoftButtonMarshaller::toString(const SoftButton& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SoftButtonMarshaller::checkIntegrityConst(const SoftButton& s)
-{
- if(s.image && !ImageMarshaller::checkIntegrityConst(*s.image)) return false;
- if(s.softButtonID>65536) return false;
- if(!SystemActionMarshaller::checkIntegrityConst(s.systemAction)) return false;
- if(s.text && s.text->length()>500) return false;
- if(!SoftButtonTypeMarshaller::checkIntegrityConst(s.type)) return false;
- return true;
-}
-
-Json::Value SoftButtonMarshaller::toJSON(const SoftButton& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.image)
- json["image"]=ImageMarshaller::toJSON(*e.image);
-
- json["isHighlighted"]=Json::Value(e.isHighlighted);
-
- json["softButtonID"]=Json::Value(e.softButtonID);
-
- json["systemAction"]=SystemActionMarshaller::toJSON(e.systemAction);
-
- if(e.text)
- json["text"]=Json::Value(*e.text);
-
- json["type"]=SoftButtonTypeMarshaller::toJSON(e.type);
-
-
- return json;
-}
-
-
-bool SoftButtonMarshaller::fromJSON(const Json::Value& json,SoftButton& c)
-{
- if(c.image) delete c.image;
- c.image=0;
-
- if(c.text) delete c.text;
- c.text=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("image"))
- {
- const Json::Value& j=json["image"];
- c.image=new Image();
- if(!ImageMarshaller::fromJSON(j,c.image[0]))
- return false;
- }
- if(!json.isMember("isHighlighted")) return false;
- {
- const Json::Value& j=json["isHighlighted"];
- if(!j.isBool()) return false;
- c.isHighlighted=j.asBool();
- }
- if(!json.isMember("softButtonID")) return false;
- {
- const Json::Value& j=json["softButtonID"];
- if(!j.isInt()) return false;
- c.softButtonID=j.asInt();
- }
- if(!json.isMember("systemAction")) return false;
- {
- const Json::Value& j=json["systemAction"];
- if(!SystemActionMarshaller::fromJSON(j,c.systemAction))
- return false;
- }
- if(json.isMember("text"))
- {
- const Json::Value& j=json["text"];
- if(!j.isString()) return false;
- c.text=new std::string(j.asString());
- }
- if(!json.isMember("type")) return false;
- {
- const Json::Value& j=json["type"];
- if(!SoftButtonTypeMarshaller::fromJSON(j,c.type))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h
deleted file mode 100644
index f764924e7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SOFTBUTTONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SOFTBUTTONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SoftButtonMarshaller
- {
- static bool checkIntegrity(SoftButton& e);
- static bool checkIntegrityConst(const SoftButton& e);
-
- static bool fromString(const std::string& s,SoftButton& e);
- static const std::string toString(const SoftButton& e);
-
- static bool fromJSON(const Json::Value& s,SoftButton& e);
- static Json::Value toJSON(const SoftButton& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp
deleted file mode 100644
index b619485ff..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h"
-#include "SoftButtonTypeMarshaller.h"
-#include "SoftButtonTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SoftButtonType::SoftButtonTypeInternal SoftButtonTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return SoftButtonType::INVALID_ENUM;
- const struct PerfectHashTable* p=SoftButtonType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<SoftButtonType::SoftButtonTypeInternal>(p->idx) : SoftButtonType::INVALID_ENUM;
-}
-
-
-bool SoftButtonTypeMarshaller::fromJSON(const Json::Value& s,SoftButtonType& e)
-{
- e.mInternal=SoftButtonType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=SoftButtonType::INVALID_ENUM);
-}
-
-
-Json::Value SoftButtonTypeMarshaller::toJSON(const SoftButtonType& e)
-{
- if(e.mInternal==SoftButtonType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SoftButtonTypeMarshaller::fromString(const std::string& s,SoftButtonType& e)
-{
- e.mInternal=SoftButtonType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string SoftButtonTypeMarshaller::toString(const SoftButtonType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==SoftButtonType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SoftButtonTypeMarshaller::mHashTable[3]=
-{
- {"TEXT",0},
- {"IMAGE",1},
- {"BOTH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp
deleted file mode 100644
index 82c64ce89..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SoftButtonType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-TEXT,0
-IMAGE,1
-BOTH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h
deleted file mode 100644
index 0ed4ea81e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SOFTBUTTONTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SOFTBUTTONTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SoftButtonType
-
- class SoftButtonTypeMarshaller
- {
- public:
-
- static std::string toName(const SoftButtonType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(SoftButtonType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=SoftButtonType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(SoftButtonType& e) { return e.mInternal!=SoftButtonType::INVALID_ENUM; }
- static bool checkIntegrityConst(const SoftButtonType& e) { return e.mInternal!=SoftButtonType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,SoftButtonType& e);
- static const std::string toString(const SoftButtonType& e);
-
- static bool fromJSON(const Json::Value& s,SoftButtonType& e);
- static Json::Value toJSON(const SoftButtonType& e);
-
- static const char* getName(SoftButtonType::SoftButtonTypeInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const SoftButtonType::SoftButtonTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc
deleted file mode 100644
index a731d73ae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 6
-/* maximum key range = 3, duplicates = 0 */
-
-class SoftButtonType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SoftButtonType_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 2, 7, 7, 7,
- 7, 7, 7, 0, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 0, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SoftButtonType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 5, 4
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp"
- {"TEXT",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp"
- {"IMAGE",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp"
- {"BOTH",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp
deleted file mode 100644
index 0ff3ce723..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-#include "Speak_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Speak_request::~Speak_request(void)
-{
-}
-
-
-Speak_request::Speak_request(const Speak_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool Speak_request::checkIntegrity(void)
-{
- return Speak_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Speak_request::Speak_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool Speak_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
- unsigned int i=ttsChunks_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i])) return false;
- }
- ttsChunks=ttsChunks_;
- return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& Speak_request::get_ttsChunks(void) const
-{
- return ttsChunks;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp
deleted file mode 100644
index 615d1419d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-#include "TTSChunkMarshaller.h"
-
-#include "Speak_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Speak_requestMarshaller::checkIntegrity(Speak_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Speak_requestMarshaller::fromString(const std::string& s,Speak_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Speak_requestMarshaller::toString(const Speak_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Speak_requestMarshaller::checkIntegrityConst(const Speak_request& s)
-{
- {
- unsigned int i=s.ttsChunks.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value Speak_requestMarshaller::toJSON(const Speak_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["ttsChunks"]=Json::Value(Json::arrayValue);
- json["ttsChunks"].resize(e.ttsChunks.size());
- for(unsigned int i=0;i<e.ttsChunks.size();i++)
- json["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
- return json;
-}
-
-
-bool Speak_requestMarshaller::fromJSON(const Json::Value& json,Speak_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("ttsChunks")) return false;
- {
- const Json::Value& j=json["ttsChunks"];
- if(!j.isArray()) return false;
- c.ttsChunks.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- TTSChunk t;
- if(!TTSChunkMarshaller::fromJSON(j[i],t))
- return false;
- c.ttsChunks[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h
deleted file mode 100644
index 004d2f48c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SPEAK_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SPEAK_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Speak_requestMarshaller
- {
- static bool checkIntegrity(Speak_request& e);
- static bool checkIntegrityConst(const Speak_request& e);
-
- static bool fromString(const std::string& s,Speak_request& e);
- static const std::string toString(const Speak_request& e);
-
- static bool fromJSON(const Json::Value& s,Speak_request& e);
- static Json::Value toJSON(const Speak_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp
deleted file mode 100644
index dc90020c2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-#include "Speak_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Speak_response& Speak_response::operator =(const Speak_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-Speak_response::~Speak_response(void)
-{}
-
-Speak_response::Speak_response(const Speak_response& c)
-{
- *this = c;
-}
-
-bool Speak_response::checkIntegrity(void)
-{
- return Speak_responseMarshaller::checkIntegrity(*this);
-}
-
-Speak_response::Speak_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp
deleted file mode 100644
index a7be924ad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-#include "ResultMarshaller.h"
-
-#include "Speak_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Speak_responseMarshaller::checkIntegrity(Speak_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool Speak_responseMarshaller::fromString(const std::string& s,Speak_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string Speak_responseMarshaller::toString(const Speak_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Speak_responseMarshaller::checkIntegrityConst(const Speak_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value Speak_responseMarshaller::toJSON(const Speak_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool Speak_responseMarshaller::fromJSON(const Json::Value& json,Speak_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h
deleted file mode 100644
index 26a3f94b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SPEAK_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SPEAK_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct Speak_responseMarshaller
- {
- static bool checkIntegrity(Speak_response& e);
- static bool checkIntegrityConst(const Speak_response& e);
-
- static bool fromString(const std::string& s,Speak_response& e);
- static const std::string toString(const Speak_response& e);
-
- static bool fromJSON(const Json::Value& s,Speak_response& e);
- static Json::Value toJSON(const Speak_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp
deleted file mode 100644
index 6cea815e1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SpeechCapabilities::SpeechCapabilitiesInternal SpeechCapabilitiesMarshaller::getIndex(const char* s)
-{
- if(!s)
- return SpeechCapabilities::INVALID_ENUM;
- const struct PerfectHashTable* p=SpeechCapabilities_intHash::getPointer(s,strlen(s));
- return p ? static_cast<SpeechCapabilities::SpeechCapabilitiesInternal>(p->idx) : SpeechCapabilities::INVALID_ENUM;
-}
-
-
-bool SpeechCapabilitiesMarshaller::fromJSON(const Json::Value& s,SpeechCapabilities& e)
-{
- e.mInternal=SpeechCapabilities::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=SpeechCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value SpeechCapabilitiesMarshaller::toJSON(const SpeechCapabilities& e)
-{
- if(e.mInternal==SpeechCapabilities::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SpeechCapabilitiesMarshaller::fromString(const std::string& s,SpeechCapabilities& e)
-{
- e.mInternal=SpeechCapabilities::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string SpeechCapabilitiesMarshaller::toString(const SpeechCapabilities& e)
-{
- Json::FastWriter writer;
- return e.mInternal==SpeechCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SpeechCapabilitiesMarshaller::mHashTable[5]=
-{
- {"TEXT",0},
- {"SAPI_PHONEMES",1},
- {"LHPLUS_PHONEMES",2},
- {"PRE_RECORDED",3},
- {"SILENCE",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp
deleted file mode 100644
index 02e38136f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SpeechCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-TEXT,0
-SAPI_PHONEMES,1
-LHPLUS_PHONEMES,2
-PRE_RECORDED,3
-SILENCE,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h
deleted file mode 100644
index ca4059b95..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SPEECHCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SPEECHCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SpeechCapabilities
-
- class SpeechCapabilitiesMarshaller
- {
- public:
-
- static std::string toName(const SpeechCapabilities& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(SpeechCapabilities& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=SpeechCapabilities::INVALID_ENUM;
- }
-
- static bool checkIntegrity(SpeechCapabilities& e) { return e.mInternal!=SpeechCapabilities::INVALID_ENUM; }
- static bool checkIntegrityConst(const SpeechCapabilities& e) { return e.mInternal!=SpeechCapabilities::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,SpeechCapabilities& e);
- static const std::string toString(const SpeechCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,SpeechCapabilities& e);
- static Json::Value toJSON(const SpeechCapabilities& e);
-
- static const char* getName(SpeechCapabilities::SpeechCapabilitiesInternal e)
- {
- return (e>=0 && e<5) ? mHashTable[e].name : NULL;
- }
-
- static const SpeechCapabilities::SpeechCapabilitiesInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[5];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc
deleted file mode 100644
index 9e89e0020..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 15
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 15
-/* maximum key range = 12, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class SpeechCapabilities_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SpeechCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SpeechCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 0, 0, 7, 0, 0, 0, 0, 12, 13,
- 0, 15
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
- {"TEXT",0},
- {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
- {"SILENCE",4},
- {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
- {"PRE_RECORDED",3},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
- {"SAPI_PHONEMES",1},
- {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
- {"LHPLUS_PHONEMES",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp
deleted file mode 100644
index b476a0c22..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-#include "StartTimeMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-StartTime::StartTime(const StartTime& c)
-{
- *this=c;
-}
-
-
-bool StartTime::checkIntegrity(void)
-{
- return StartTimeMarshaller::checkIntegrity(*this);
-}
-
-
-StartTime::StartTime(void)
-{
-}
-
-
-
-bool StartTime::set_hours(unsigned int hours_)
-{
- if(hours_>59) return false;
- hours=hours_;
- return true;
-}
-
-bool StartTime::set_minutes(unsigned int minutes_)
-{
- if(minutes_>59) return false;
- minutes=minutes_;
- return true;
-}
-
-bool StartTime::set_seconds(unsigned int seconds_)
-{
- if(seconds_>59) return false;
- seconds=seconds_;
- return true;
-}
-
-
-
-
-unsigned int StartTime::get_hours(void) const
-{
- return hours;
-}
-
-
-unsigned int StartTime::get_minutes(void) const
-{
- return minutes;
-}
-
-
-unsigned int StartTime::get_seconds(void) const
-{
- return seconds;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp
deleted file mode 100644
index 1e1cced84..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-
-
-#include "StartTimeMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool StartTimeMarshaller::checkIntegrity(StartTime& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool StartTimeMarshaller::fromString(const std::string& s,StartTime& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string StartTimeMarshaller::toString(const StartTime& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool StartTimeMarshaller::checkIntegrityConst(const StartTime& s)
-{
- if(s.hours>59) return false;
- if(s.minutes>59) return false;
- if(s.seconds>59) return false;
- return true;
-}
-
-Json::Value StartTimeMarshaller::toJSON(const StartTime& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["hours"]=Json::Value(e.hours);
-
- json["minutes"]=Json::Value(e.minutes);
-
- json["seconds"]=Json::Value(e.seconds);
-
-
- return json;
-}
-
-
-bool StartTimeMarshaller::fromJSON(const Json::Value& json,StartTime& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("hours")) return false;
- {
- const Json::Value& j=json["hours"];
- if(!j.isInt()) return false;
- c.hours=j.asInt();
- }
- if(!json.isMember("minutes")) return false;
- {
- const Json::Value& j=json["minutes"];
- if(!j.isInt()) return false;
- c.minutes=j.asInt();
- }
- if(!json.isMember("seconds")) return false;
- {
- const Json::Value& j=json["seconds"];
- if(!j.isInt()) return false;
- c.seconds=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h
deleted file mode 100644
index 59d8c09c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_STARTTIMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_STARTTIMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct StartTimeMarshaller
- {
- static bool checkIntegrity(StartTime& e);
- static bool checkIntegrityConst(const StartTime& e);
-
- static bool fromString(const std::string& s,StartTime& e);
- static const std::string toString(const StartTime& e);
-
- static bool fromJSON(const Json::Value& s,StartTime& e);
- static Json::Value toJSON(const StartTime& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp
deleted file mode 100644
index bf1d4eb0b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-#include "SubscribeButton_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SubscribeButton_request::~SubscribeButton_request(void)
-{
-}
-
-
-SubscribeButton_request::SubscribeButton_request(const SubscribeButton_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool SubscribeButton_request::checkIntegrity(void)
-{
- return SubscribeButton_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SubscribeButton_request::SubscribeButton_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SubscribeButton_request::set_buttonName(const ButtonName& buttonName_)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_)) return false;
- buttonName=buttonName_;
- return true;
-}
-
-
-
-
-const ButtonName& SubscribeButton_request::get_buttonName(void) const
-{
- return buttonName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp
deleted file mode 100644
index 516f5a081..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-#include "ButtonNameMarshaller.h"
-
-#include "SubscribeButton_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeButton_requestMarshaller::checkIntegrity(SubscribeButton_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SubscribeButton_requestMarshaller::fromString(const std::string& s,SubscribeButton_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SubscribeButton_requestMarshaller::toString(const SubscribeButton_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeButton_requestMarshaller::checkIntegrityConst(const SubscribeButton_request& s)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName)) return false;
- return true;
-}
-
-Json::Value SubscribeButton_requestMarshaller::toJSON(const SubscribeButton_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
- return json;
-}
-
-
-bool SubscribeButton_requestMarshaller::fromJSON(const Json::Value& json,SubscribeButton_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("buttonName")) return false;
- {
- const Json::Value& j=json["buttonName"];
- if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h
deleted file mode 100644
index b3359b42d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SubscribeButton_requestMarshaller
- {
- static bool checkIntegrity(SubscribeButton_request& e);
- static bool checkIntegrityConst(const SubscribeButton_request& e);
-
- static bool fromString(const std::string& s,SubscribeButton_request& e);
- static const std::string toString(const SubscribeButton_request& e);
-
- static bool fromJSON(const Json::Value& s,SubscribeButton_request& e);
- static Json::Value toJSON(const SubscribeButton_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp
deleted file mode 100644
index cc290cd3c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-#include "SubscribeButton_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SubscribeButton_response& SubscribeButton_response::operator =(const SubscribeButton_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-SubscribeButton_response::~SubscribeButton_response(void)
-{}
-
-SubscribeButton_response::SubscribeButton_response(const SubscribeButton_response& c)
-{
- *this = c;
-}
-
-bool SubscribeButton_response::checkIntegrity(void)
-{
- return SubscribeButton_responseMarshaller::checkIntegrity(*this);
-}
-
-SubscribeButton_response::SubscribeButton_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp
deleted file mode 100644
index 24e3ed158..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-#include "ResultMarshaller.h"
-
-#include "SubscribeButton_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeButton_responseMarshaller::checkIntegrity(SubscribeButton_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SubscribeButton_responseMarshaller::fromString(const std::string& s,SubscribeButton_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SubscribeButton_responseMarshaller::toString(const SubscribeButton_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeButton_responseMarshaller::checkIntegrityConst(const SubscribeButton_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value SubscribeButton_responseMarshaller::toJSON(const SubscribeButton_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool SubscribeButton_responseMarshaller::fromJSON(const Json::Value& json,SubscribeButton_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h
deleted file mode 100644
index 4f2fd202a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SubscribeButton_responseMarshaller
- {
- static bool checkIntegrity(SubscribeButton_response& e);
- static bool checkIntegrityConst(const SubscribeButton_response& e);
-
- static bool fromString(const std::string& s,SubscribeButton_response& e);
- static const std::string toString(const SubscribeButton_response& e);
-
- static bool fromJSON(const Json::Value& s,SubscribeButton_response& e);
- static Json::Value toJSON(const SubscribeButton_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp
deleted file mode 100644
index 40c7fbfb7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-#include "SubscribeVehicleData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SubscribeVehicleData_request::~SubscribeVehicleData_request(void)
-{
-}
-
-
-SubscribeVehicleData_request::SubscribeVehicleData_request(const SubscribeVehicleData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool SubscribeVehicleData_request::checkIntegrity(void)
-{
- return SubscribeVehicleData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SubscribeVehicleData_request::SubscribeVehicleData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SubscribeVehicleData_request::set_dataType(const std::vector<VehicleDataType>& dataType_)
-{
- unsigned int i=dataType_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_[i])) return false;
- }
- dataType=dataType_;
- return true;
-}
-
-
-
-
-const std::vector<VehicleDataType>& SubscribeVehicleData_request::get_dataType(void) const
-{
- return dataType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp
deleted file mode 100644
index a5d9e6d58..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "SubscribeVehicleData_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeVehicleData_requestMarshaller::checkIntegrity(SubscribeVehicleData_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SubscribeVehicleData_requestMarshaller::fromString(const std::string& s,SubscribeVehicleData_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SubscribeVehicleData_requestMarshaller::toString(const SubscribeVehicleData_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeVehicleData_requestMarshaller::checkIntegrityConst(const SubscribeVehicleData_request& s)
-{
- {
- unsigned int i=s.dataType.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value SubscribeVehicleData_requestMarshaller::toJSON(const SubscribeVehicleData_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["dataType"]=Json::Value(Json::arrayValue);
- json["dataType"].resize(e.dataType.size());
- for(unsigned int i=0;i<e.dataType.size();i++)
- json["dataType"][i]=VehicleDataTypeMarshaller::toJSON(e.dataType[i]);
-
- return json;
-}
-
-
-bool SubscribeVehicleData_requestMarshaller::fromJSON(const Json::Value& json,SubscribeVehicleData_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("dataType")) return false;
- {
- const Json::Value& j=json["dataType"];
- if(!j.isArray()) return false;
- c.dataType.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VehicleDataType t;
- if(!VehicleDataTypeMarshaller::fromJSON(j[i],t))
- return false;
- c.dataType[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h
deleted file mode 100644
index e4a88fd8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SubscribeVehicleData_requestMarshaller
- {
- static bool checkIntegrity(SubscribeVehicleData_request& e);
- static bool checkIntegrityConst(const SubscribeVehicleData_request& e);
-
- static bool fromString(const std::string& s,SubscribeVehicleData_request& e);
- static const std::string toString(const SubscribeVehicleData_request& e);
-
- static bool fromJSON(const Json::Value& s,SubscribeVehicleData_request& e);
- static Json::Value toJSON(const SubscribeVehicleData_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp
deleted file mode 100644
index d16fda7c2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-#include "SubscribeVehicleData_responseMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SubscribeVehicleData_response& SubscribeVehicleData_response::operator =(const SubscribeVehicleData_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- dataResult = c.dataResult ? new std::vector<VehicleDataResult>(c.dataResult[0]) : 0;
-
- return *this;
-}
-
-SubscribeVehicleData_response::~SubscribeVehicleData_response(void)
-{
- if (dataResult)
- {
- delete dataResult;
- }
-}
-
-SubscribeVehicleData_response::SubscribeVehicleData_response(const SubscribeVehicleData_response& c)
-{
- *this = c;
-}
-
-bool SubscribeVehicleData_response::checkIntegrity(void)
-{
- return SubscribeVehicleData_responseMarshaller::checkIntegrity(*this);
-}
-
-SubscribeVehicleData_response::SubscribeVehicleData_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , dataResult(0)
-{
-}
-
-bool SubscribeVehicleData_response::set_dataResult(const std::vector<VehicleDataResult>& dataResult_)
-{
- unsigned int i = dataResult_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!VehicleDataResultMarshaller::checkIntegrityConst(dataResult_[i]))
- {
- return false;
- }
- }
- delete dataResult;
- dataResult = 0;
-
- dataResult = new std::vector<VehicleDataResult>(dataResult_);
- return true;
-}
-
-void SubscribeVehicleData_response::reset_dataResult(void)
-{
- if (dataResult)
- {
- delete dataResult;
- }
- dataResult = 0;
-}
-
-const std::vector<VehicleDataResult>* SubscribeVehicleData_response::get_dataResult(void) const
-{
- return dataResult;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp
deleted file mode 100644
index eca716aca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-#include "ResultMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-#include "SubscribeVehicleData_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeVehicleData_responseMarshaller::checkIntegrity(SubscribeVehicleData_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SubscribeVehicleData_responseMarshaller::fromString(const std::string& s,SubscribeVehicleData_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SubscribeVehicleData_responseMarshaller::toString(const SubscribeVehicleData_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeVehicleData_responseMarshaller::checkIntegrityConst(const SubscribeVehicleData_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.dataResult)
- {
- unsigned int i=s.dataResult[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VehicleDataResultMarshaller::checkIntegrityConst(s.dataResult[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value SubscribeVehicleData_responseMarshaller::toJSON(const SubscribeVehicleData_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.dataResult)
- {
- unsigned int sz=e.dataResult->size();
- json["dataResult"]=Json::Value(Json::arrayValue);
- json["dataResult"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["dataResult"][i]=VehicleDataResultMarshaller::toJSON(e.dataResult[0][i]);
- }
-
- return json;
-}
-
-
-bool SubscribeVehicleData_responseMarshaller::fromJSON(const Json::Value& json,SubscribeVehicleData_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.dataResult) delete c.dataResult;
- c.dataResult=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("dataResult"))
- {
- const Json::Value& j=json["dataResult"];
- if(!j.isArray()) return false;
- c.dataResult=new std::vector<VehicleDataResult>();
- c.dataResult->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VehicleDataResult t;
- if(!VehicleDataResultMarshaller::fromJSON(j[i],t))
- return false;
- c.dataResult[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h
deleted file mode 100644
index cb2b101c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SubscribeVehicleData_responseMarshaller
- {
- static bool checkIntegrity(SubscribeVehicleData_response& e);
- static bool checkIntegrityConst(const SubscribeVehicleData_response& e);
-
- static bool fromString(const std::string& s,SubscribeVehicleData_response& e);
- static const std::string toString(const SubscribeVehicleData_response& e);
-
- static bool fromJSON(const Json::Value& s,SubscribeVehicleData_response& e);
- static Json::Value toJSON(const SubscribeVehicleData_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp
deleted file mode 100644
index 50e3d7a1b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h"
-#include "SyncMsgVersionMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SyncMsgVersion::SyncMsgVersion(const SyncMsgVersion& c)
-{
- *this=c;
-}
-
-
-bool SyncMsgVersion::checkIntegrity(void)
-{
- return SyncMsgVersionMarshaller::checkIntegrity(*this);
-}
-
-
-SyncMsgVersion::SyncMsgVersion(void)
-{
-}
-
-
-
-bool SyncMsgVersion::set_majorVersion(unsigned int majorVersion_)
-{
- if(majorVersion_>10) return false;
- if(majorVersion_<1) return false;
- majorVersion=majorVersion_;
- return true;
-}
-
-bool SyncMsgVersion::set_minorVersion(unsigned int minorVersion_)
-{
- if(minorVersion_>1000) return false;
- minorVersion=minorVersion_;
- return true;
-}
-
-
-
-
-unsigned int SyncMsgVersion::get_majorVersion(void) const
-{
- return majorVersion;
-}
-
-
-unsigned int SyncMsgVersion::get_minorVersion(void) const
-{
- return minorVersion;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp
deleted file mode 100644
index d81d8e471..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h"
-
-
-#include "SyncMsgVersionMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SyncMsgVersionMarshaller::checkIntegrity(SyncMsgVersion& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool SyncMsgVersionMarshaller::fromString(const std::string& s,SyncMsgVersion& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string SyncMsgVersionMarshaller::toString(const SyncMsgVersion& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SyncMsgVersionMarshaller::checkIntegrityConst(const SyncMsgVersion& s)
-{
- if(s.majorVersion>10) return false;
- if(s.majorVersion<1) return false;
- if(s.minorVersion>1000) return false;
- return true;
-}
-
-Json::Value SyncMsgVersionMarshaller::toJSON(const SyncMsgVersion& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["majorVersion"]=Json::Value(e.majorVersion);
-
- json["minorVersion"]=Json::Value(e.minorVersion);
-
-
- return json;
-}
-
-
-bool SyncMsgVersionMarshaller::fromJSON(const Json::Value& json,SyncMsgVersion& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("majorVersion")) return false;
- {
- const Json::Value& j=json["majorVersion"];
- if(!j.isInt()) return false;
- c.majorVersion=j.asInt();
- }
- if(!json.isMember("minorVersion")) return false;
- {
- const Json::Value& j=json["minorVersion"];
- if(!j.isInt()) return false;
- c.minorVersion=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h
deleted file mode 100644
index 01bdb174c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SYNCMSGVERSIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SYNCMSGVERSIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct SyncMsgVersionMarshaller
- {
- static bool checkIntegrity(SyncMsgVersion& e);
- static bool checkIntegrityConst(const SyncMsgVersion& e);
-
- static bool fromString(const std::string& s,SyncMsgVersion& e);
- static const std::string toString(const SyncMsgVersion& e);
-
- static bool fromJSON(const Json::Value& s,SyncMsgVersion& e);
- static Json::Value toJSON(const SyncMsgVersion& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp
deleted file mode 100644
index 854024666..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemAction.h"
-#include "SystemActionMarshaller.h"
-#include "SystemActionMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SystemAction::SystemActionInternal SystemActionMarshaller::getIndex(const char* s)
-{
- if(!s)
- return SystemAction::INVALID_ENUM;
- const struct PerfectHashTable* p=SystemAction_intHash::getPointer(s,strlen(s));
- return p ? static_cast<SystemAction::SystemActionInternal>(p->idx) : SystemAction::INVALID_ENUM;
-}
-
-
-bool SystemActionMarshaller::fromJSON(const Json::Value& s,SystemAction& e)
-{
- e.mInternal=SystemAction::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=SystemAction::INVALID_ENUM);
-}
-
-
-Json::Value SystemActionMarshaller::toJSON(const SystemAction& e)
-{
- if(e.mInternal==SystemAction::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SystemActionMarshaller::fromString(const std::string& s,SystemAction& e)
-{
- e.mInternal=SystemAction::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string SystemActionMarshaller::toString(const SystemAction& e)
-{
- Json::FastWriter writer;
- return e.mInternal==SystemAction::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SystemActionMarshaller::mHashTable[3]=
-{
- {"DEFAULT_ACTION",0},
- {"STEAL_FOCUS",1},
- {"KEEP_CONTEXT",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp
deleted file mode 100644
index d9189498b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SystemAction_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-DEFAULT_ACTION,0
-STEAL_FOCUS,1
-KEEP_CONTEXT,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h
deleted file mode 100644
index 7ec9eaa3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SYSTEMACTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SYSTEMACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemAction.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SystemAction
-
- class SystemActionMarshaller
- {
- public:
-
- static std::string toName(const SystemAction& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(SystemAction& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=SystemAction::INVALID_ENUM;
- }
-
- static bool checkIntegrity(SystemAction& e) { return e.mInternal!=SystemAction::INVALID_ENUM; }
- static bool checkIntegrityConst(const SystemAction& e) { return e.mInternal!=SystemAction::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,SystemAction& e);
- static const std::string toString(const SystemAction& e);
-
- static bool fromJSON(const Json::Value& s,SystemAction& e);
- static Json::Value toJSON(const SystemAction& e);
-
- static const char* getName(SystemAction::SystemActionInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const SystemAction::SystemActionInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc
deleted file mode 100644
index eac357b27..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (c) 2013 Ford Motor Company */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 11
-#define MAX_WORD_LENGTH 14
-#define MIN_HASH_VALUE 11
-#define MAX_HASH_VALUE 14
-/* maximum key range = 4, duplicates = 0 */
-
-class SystemAction_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SystemAction_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SystemAction_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 12, 0,
- 14
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp"
- {"STEAL_FOCUS",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp"
- {"KEEP_CONTEXT",2},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp"
- {"DEFAULT_ACTION",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp
deleted file mode 100644
index 7205c8a2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemContext.h"
-#include "SystemContextMarshaller.h"
-#include "SystemContextMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SystemContext::SystemContextInternal SystemContextMarshaller::getIndex(const char* s)
-{
- if(!s)
- return SystemContext::INVALID_ENUM;
- const struct PerfectHashTable* p=SystemContext_intHash::getPointer(s,strlen(s));
- return p ? static_cast<SystemContext::SystemContextInternal>(p->idx) : SystemContext::INVALID_ENUM;
-}
-
-
-bool SystemContextMarshaller::fromJSON(const Json::Value& s,SystemContext& e)
-{
- e.mInternal=SystemContext::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=SystemContext::INVALID_ENUM);
-}
-
-
-Json::Value SystemContextMarshaller::toJSON(const SystemContext& e)
-{
- if(e.mInternal==SystemContext::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SystemContextMarshaller::fromString(const std::string& s,SystemContext& e)
-{
- e.mInternal=SystemContext::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string SystemContextMarshaller::toString(const SystemContext& e)
-{
- Json::FastWriter writer;
- return e.mInternal==SystemContext::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SystemContextMarshaller::mHashTable[7]=
-{
- {"MAIN",0},
- {"VRSESSION",1},
- {"MENU",2},
- {"HMI_OBSCURED",3},
- {"ALERT",4},
- {"NOT_AUDIBLE",5},
- {"AUDIBLE",6}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp
deleted file mode 100644
index 86239917d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp
+++ /dev/null
@@ -1,23 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SystemContext_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-MAIN,0
-VRSESSION,1
-MENU,2
-HMI_OBSCURED,3
-ALERT,4
-NOT_AUDIBLE,5
-AUDIBLE,6
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h
deleted file mode 100644
index aa12901b1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SYSTEMCONTEXTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SYSTEMCONTEXTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemContext.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SystemContext
-
- class SystemContextMarshaller
- {
- public:
-
- static std::string toName(const SystemContext& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(SystemContext& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=SystemContext::INVALID_ENUM;
- }
-
- static bool checkIntegrity(SystemContext& e) { return e.mInternal!=SystemContext::INVALID_ENUM; }
- static bool checkIntegrityConst(const SystemContext& e) { return e.mInternal!=SystemContext::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,SystemContext& e);
- static const std::string toString(const SystemContext& e);
-
- static bool fromJSON(const Json::Value& s,SystemContext& e);
- static Json::Value toJSON(const SystemContext& e);
-
- static const char* getName(SystemContext::SystemContextInternal e)
- {
- return (e>=0 && e<7) ? mHashTable[e].name : NULL;
- }
-
- static const SystemContext::SystemContextInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[7];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc
deleted file mode 100644
index f5df67c2b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp */
-/* Computed positions: -k'2' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 7
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 12
-/* maximum key range = 9, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class SystemContext_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SystemContext_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 2, 13, 13, 13, 0,
- 13, 13, 13, 13, 13, 13, 0, 0, 13, 0,
- 13, 13, 0, 13, 13, 0, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13
- };
- return len + asso_values[(unsigned char)str[1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SystemContext_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4, 5, 4, 7, 0, 9, 0, 11, 12
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"MENU",2},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"ALERT",4},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"MAIN",0},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"AUDIBLE",6},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"VRSESSION",1},
- {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"NOT_AUDIBLE",5},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
- {"HMI_OBSCURED",3}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp
deleted file mode 100644
index 7d72a5929..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TBTState.h"
-#include "TBTStateMarshaller.h"
-#include "TBTStateMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TBTState::TBTStateInternal TBTStateMarshaller::getIndex(const char* s)
-{
- if(!s)
- return TBTState::INVALID_ENUM;
- const struct PerfectHashTable* p=TBTState_intHash::getPointer(s,strlen(s));
- return p ? static_cast<TBTState::TBTStateInternal>(p->idx) : TBTState::INVALID_ENUM;
-}
-
-
-bool TBTStateMarshaller::fromJSON(const Json::Value& s,TBTState& e)
-{
- e.mInternal=TBTState::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=TBTState::INVALID_ENUM);
-}
-
-
-Json::Value TBTStateMarshaller::toJSON(const TBTState& e)
-{
- if(e.mInternal==TBTState::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TBTStateMarshaller::fromString(const std::string& s,TBTState& e)
-{
- e.mInternal=TBTState::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string TBTStateMarshaller::toString(const TBTState& e)
-{
- Json::FastWriter writer;
- return e.mInternal==TBTState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TBTStateMarshaller::mHashTable[10]=
-{
- {"ROUTE_UPDATE_REQUEST",0},
- {"ROUTE_ACCEPTED",1},
- {"ROUTE_REFUSED",2},
- {"ROUTE_CANCELLED",3},
- {"ETA_REQUEST",4},
- {"NEXT_TURN_REQUEST",5},
- {"ROUTE_STATUS_REQUEST",6},
- {"ROUTE_SUMMARY_REQUEST",7},
- {"TRIP_STATUS_REQUEST",8},
- {"ROUTE_UPDATE_REQUEST_TIMEOUT",9}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp
deleted file mode 100644
index e4a0f1876..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp
+++ /dev/null
@@ -1,26 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TBTState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-ROUTE_UPDATE_REQUEST,0
-ROUTE_ACCEPTED,1
-ROUTE_REFUSED,2
-ROUTE_CANCELLED,3
-ETA_REQUEST,4
-NEXT_TURN_REQUEST,5
-ROUTE_STATUS_REQUEST,6
-ROUTE_SUMMARY_REQUEST,7
-TRIP_STATUS_REQUEST,8
-ROUTE_UPDATE_REQUEST_TIMEOUT,9
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h
deleted file mode 100644
index 746d65291..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TBTSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TBTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TBTState.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TBTState
-
- class TBTStateMarshaller
- {
- public:
-
- static std::string toName(const TBTState& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(TBTState& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=TBTState::INVALID_ENUM;
- }
-
- static bool checkIntegrity(TBTState& e) { return e.mInternal!=TBTState::INVALID_ENUM; }
- static bool checkIntegrityConst(const TBTState& e) { return e.mInternal!=TBTState::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,TBTState& e);
- static const std::string toString(const TBTState& e);
-
- static bool fromJSON(const Json::Value& s,TBTState& e);
- static Json::Value toJSON(const TBTState& e);
-
- static const char* getName(TBTState::TBTStateInternal e)
- {
- return (e>=0 && e<10) ? mHashTable[e].name : NULL;
- }
-
- static const TBTState::TBTStateInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[10];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc
deleted file mode 100644
index 6749bae70..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp */
-/* Computed positions: -k'7' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 10
-#define MIN_WORD_LENGTH 11
-#define MAX_WORD_LENGTH 28
-#define MIN_HASH_VALUE 11
-#define MAX_HASH_VALUE 28
-/* maximum key range = 18, duplicates = 0 */
-
-class TBTState_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TBTState_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 0, 29, 0, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 0, 0, 5, 0, 0, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29
- };
- return len + asso_values[(unsigned char)str[6]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TBTState_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 13,
- 14, 15, 0, 17, 0, 19, 20, 0, 0, 0, 0, 20, 21, 0,
- 28
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ETA_REQUEST",4},
- {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_REFUSED",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_ACCEPTED",1},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_CANCELLED",3},
- {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"NEXT_TURN_REQUEST",5},
- {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"TRIP_STATUS_REQUEST",8},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_UPDATE_REQUEST",0},
- {""}, {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_STATUS_REQUEST",6},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_SUMMARY_REQUEST",7},
- {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
- {"ROUTE_UPDATE_REQUEST_TIMEOUT",9}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp
deleted file mode 100644
index 5b5ae21d2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "TTSChunkMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-TTSChunk::TTSChunk(const TTSChunk& c)
-{
- *this=c;
-}
-
-
-bool TTSChunk::checkIntegrity(void)
-{
- return TTSChunkMarshaller::checkIntegrity(*this);
-}
-
-
-TTSChunk::TTSChunk(void)
-{
-}
-
-
-
-bool TTSChunk::set_text(const std::string& text_)
-{
- if(text_.length()>500) return false;
- text=text_;
- return true;
-}
-
-bool TTSChunk::set_type(const SpeechCapabilities& type_)
-{
- if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(type_)) return false;
- type=type_;
- return true;
-}
-
-
-
-
-const std::string& TTSChunk::get_text(void) const
-{
- return text;
-}
-
-
-const SpeechCapabilities& TTSChunk::get_type(void) const
-{
- return type;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp
deleted file mode 100644
index e3c832f8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "SpeechCapabilitiesMarshaller.h"
-
-#include "TTSChunkMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TTSChunkMarshaller::checkIntegrity(TTSChunk& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool TTSChunkMarshaller::fromString(const std::string& s,TTSChunk& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string TTSChunkMarshaller::toString(const TTSChunk& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TTSChunkMarshaller::checkIntegrityConst(const TTSChunk& s)
-{
- if(s.text.length()>500) return false;
- if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(s.type)) return false;
- return true;
-}
-
-Json::Value TTSChunkMarshaller::toJSON(const TTSChunk& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["text"]=Json::Value(e.text);
-
- json["type"]=SpeechCapabilitiesMarshaller::toJSON(e.type);
-
-
- return json;
-}
-
-
-bool TTSChunkMarshaller::fromJSON(const Json::Value& json,TTSChunk& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("text")) return false;
- {
- const Json::Value& j=json["text"];
- if(!j.isString()) return false;
- c.text=j.asString();
- }
- if(!json.isMember("type")) return false;
- {
- const Json::Value& j=json["type"];
- if(!SpeechCapabilitiesMarshaller::fromJSON(j,c.type))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h
deleted file mode 100644
index b13fa1e57..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TTSCHUNKMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TTSCHUNKMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct TTSChunkMarshaller
- {
- static bool checkIntegrity(TTSChunk& e);
- static bool checkIntegrityConst(const TTSChunk& e);
-
- static bool fromString(const std::string& s,TTSChunk& e);
- static const std::string toString(const TTSChunk& e);
-
- static bool fromJSON(const Json::Value& s,TTSChunk& e);
- static Json::Value toJSON(const TTSChunk& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp
deleted file mode 100644
index 400de0528..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h"
-#include "TextAlignmentMarshaller.h"
-#include "TextAlignmentMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TextAlignment::TextAlignmentInternal TextAlignmentMarshaller::getIndex(const char* s)
-{
- if(!s)
- return TextAlignment::INVALID_ENUM;
- const struct PerfectHashTable* p=TextAlignment_intHash::getPointer(s,strlen(s));
- return p ? static_cast<TextAlignment::TextAlignmentInternal>(p->idx) : TextAlignment::INVALID_ENUM;
-}
-
-
-bool TextAlignmentMarshaller::fromJSON(const Json::Value& s,TextAlignment& e)
-{
- e.mInternal=TextAlignment::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=TextAlignment::INVALID_ENUM);
-}
-
-
-Json::Value TextAlignmentMarshaller::toJSON(const TextAlignment& e)
-{
- if(e.mInternal==TextAlignment::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TextAlignmentMarshaller::fromString(const std::string& s,TextAlignment& e)
-{
- e.mInternal=TextAlignment::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string TextAlignmentMarshaller::toString(const TextAlignment& e)
-{
- Json::FastWriter writer;
- return e.mInternal==TextAlignment::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TextAlignmentMarshaller::mHashTable[3]=
-{
- {"LEFT_ALIGNED",0},
- {"RIGHT_ALIGNED",1},
- {"CENTERED",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp
deleted file mode 100644
index d36329373..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TextAlignment_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-LEFT_ALIGNED,0
-RIGHT_ALIGNED,1
-CENTERED,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h
deleted file mode 100644
index ec30427ae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TEXTALIGNMENTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TEXTALIGNMENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TextAlignment
-
- class TextAlignmentMarshaller
- {
- public:
-
- static std::string toName(const TextAlignment& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(TextAlignment& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=TextAlignment::INVALID_ENUM;
- }
-
- static bool checkIntegrity(TextAlignment& e) { return e.mInternal!=TextAlignment::INVALID_ENUM; }
- static bool checkIntegrityConst(const TextAlignment& e) { return e.mInternal!=TextAlignment::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,TextAlignment& e);
- static const std::string toString(const TextAlignment& e);
-
- static bool fromJSON(const Json::Value& s,TextAlignment& e);
- static Json::Value toJSON(const TextAlignment& e);
-
- static const char* getName(TextAlignment::TextAlignmentInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const TextAlignment::TextAlignmentInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc
deleted file mode 100644
index a7e942a84..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 8
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 13
-/* maximum key range = 6, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class TextAlignment_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TextAlignment_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TextAlignment_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 12, 13
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp"
- {"CENTERED",2},
- {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp"
- {"LEFT_ALIGNED",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp"
- {"RIGHT_ALIGNED",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp
deleted file mode 100644
index f212e03f2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextField.h"
-#include "TextFieldMarshaller.h"
-#include "CharacterSetMarshaller.h"
-#include "TextFieldNameMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-TextField::TextField(const TextField& c)
-{
- *this=c;
-}
-
-
-bool TextField::checkIntegrity(void)
-{
- return TextFieldMarshaller::checkIntegrity(*this);
-}
-
-
-TextField::TextField(void)
-{
-}
-
-
-
-bool TextField::set_characterSet(const CharacterSet& characterSet_)
-{
- if(!CharacterSetMarshaller::checkIntegrityConst(characterSet_)) return false;
- characterSet=characterSet_;
- return true;
-}
-
-bool TextField::set_name(const TextFieldName& name_)
-{
- if(!TextFieldNameMarshaller::checkIntegrityConst(name_)) return false;
- name=name_;
- return true;
-}
-
-bool TextField::set_rows(unsigned int rows_)
-{
- if(rows_>3) return false;
- if(rows_<1) return false;
- rows=rows_;
- return true;
-}
-
-bool TextField::set_width(unsigned int width_)
-{
- if(width_>500) return false;
- if(width_<1) return false;
- width=width_;
- return true;
-}
-
-
-
-
-const CharacterSet& TextField::get_characterSet(void) const
-{
- return characterSet;
-}
-
-
-const TextFieldName& TextField::get_name(void) const
-{
- return name;
-}
-
-
-unsigned int TextField::get_rows(void) const
-{
- return rows;
-}
-
-
-unsigned int TextField::get_width(void) const
-{
- return width;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp
deleted file mode 100644
index 704fb99e2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextField.h"
-#include "CharacterSetMarshaller.h"
-#include "TextFieldNameMarshaller.h"
-
-#include "TextFieldMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TextFieldMarshaller::checkIntegrity(TextField& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool TextFieldMarshaller::fromString(const std::string& s,TextField& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string TextFieldMarshaller::toString(const TextField& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TextFieldMarshaller::checkIntegrityConst(const TextField& s)
-{
- if(!CharacterSetMarshaller::checkIntegrityConst(s.characterSet)) return false;
- if(!TextFieldNameMarshaller::checkIntegrityConst(s.name)) return false;
- if(s.rows>3) return false;
- if(s.rows<1) return false;
- if(s.width>500) return false;
- if(s.width<1) return false;
- return true;
-}
-
-Json::Value TextFieldMarshaller::toJSON(const TextField& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["characterSet"]=CharacterSetMarshaller::toJSON(e.characterSet);
-
- json["name"]=TextFieldNameMarshaller::toJSON(e.name);
-
- json["rows"]=Json::Value(e.rows);
-
- json["width"]=Json::Value(e.width);
-
-
- return json;
-}
-
-
-bool TextFieldMarshaller::fromJSON(const Json::Value& json,TextField& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("characterSet")) return false;
- {
- const Json::Value& j=json["characterSet"];
- if(!CharacterSetMarshaller::fromJSON(j,c.characterSet))
- return false;
- }
- if(!json.isMember("name")) return false;
- {
- const Json::Value& j=json["name"];
- if(!TextFieldNameMarshaller::fromJSON(j,c.name))
- return false;
- }
- if(!json.isMember("rows")) return false;
- {
- const Json::Value& j=json["rows"];
- if(!j.isInt()) return false;
- c.rows=j.asInt();
- }
- if(!json.isMember("width")) return false;
- {
- const Json::Value& j=json["width"];
- if(!j.isInt()) return false;
- c.width=j.asInt();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h
deleted file mode 100644
index 150f8dd42..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TEXTFIELDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TEXTFIELDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextField.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct TextFieldMarshaller
- {
- static bool checkIntegrity(TextField& e);
- static bool checkIntegrityConst(const TextField& e);
-
- static bool fromString(const std::string& s,TextField& e);
- static const std::string toString(const TextField& e);
-
- static bool fromJSON(const Json::Value& s,TextField& e);
- static Json::Value toJSON(const TextField& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp
deleted file mode 100644
index f2e6b429b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h"
-#include "TextFieldNameMarshaller.h"
-#include "TextFieldNameMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TextFieldName::TextFieldNameInternal TextFieldNameMarshaller::getIndex(const char* s)
-{
- if(!s)
- return TextFieldName::INVALID_ENUM;
- const struct PerfectHashTable* p=TextFieldName_intHash::getPointer(s,strlen(s));
- return p ? static_cast<TextFieldName::TextFieldNameInternal>(p->idx) : TextFieldName::INVALID_ENUM;
-}
-
-
-bool TextFieldNameMarshaller::fromJSON(const Json::Value& s,TextFieldName& e)
-{
- e.mInternal=TextFieldName::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=TextFieldName::INVALID_ENUM);
-}
-
-
-Json::Value TextFieldNameMarshaller::toJSON(const TextFieldName& e)
-{
- if(e.mInternal==TextFieldName::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TextFieldNameMarshaller::fromString(const std::string& s,TextFieldName& e)
-{
- e.mInternal=TextFieldName::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string TextFieldNameMarshaller::toString(const TextFieldName& e)
-{
- Json::FastWriter writer;
- return e.mInternal==TextFieldName::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TextFieldNameMarshaller::mHashTable[20]=
-{
- {"mainField1",0},
- {"mainField2",1},
- {"mainField3",2},
- {"mainField4",3},
- {"statusBar",4},
- {"mediaClock",5},
- {"mediaTrack",6},
- {"alertText1",7},
- {"alertText2",8},
- {"alertText3",9},
- {"scrollableMessageBody",10},
- {"initialInteractionText",11},
- {"navigationText1",12},
- {"navigationText2",13},
- {"ETA",14},
- {"totalDistance",15},
- {"audioPassThruDisplayText1",16},
- {"audioPassThruDisplayText2",17},
- {"sliderHeader",18},
- {"sliderFooter",19}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp
deleted file mode 100644
index bf4ffae31..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp
+++ /dev/null
@@ -1,36 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TextFieldName_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-mainField1,0
-mainField2,1
-mainField3,2
-mainField4,3
-statusBar,4
-mediaClock,5
-mediaTrack,6
-alertText1,7
-alertText2,8
-alertText3,9
-scrollableMessageBody,10
-initialInteractionText,11
-navigationText1,12
-navigationText2,13
-ETA,14
-totalDistance,15
-audioPassThruDisplayText1,16
-audioPassThruDisplayText2,17
-sliderHeader,18
-sliderFooter,19
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h
deleted file mode 100644
index c824a9419..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TEXTFIELDNAMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TEXTFIELDNAMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TextFieldName
-
- class TextFieldNameMarshaller
- {
- public:
-
- static std::string toName(const TextFieldName& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(TextFieldName& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=TextFieldName::INVALID_ENUM;
- }
-
- static bool checkIntegrity(TextFieldName& e) { return e.mInternal!=TextFieldName::INVALID_ENUM; }
- static bool checkIntegrityConst(const TextFieldName& e) { return e.mInternal!=TextFieldName::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,TextFieldName& e);
- static const std::string toString(const TextFieldName& e);
-
- static bool fromJSON(const Json::Value& s,TextFieldName& e);
- static Json::Value toJSON(const TextFieldName& e);
-
- static const char* getName(TextFieldName::TextFieldNameInternal e)
- {
- return (e>=0 && e<20) ? mHashTable[e].name : NULL;
- }
-
- static const TextFieldName::TextFieldNameInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[20];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc
deleted file mode 100644
index 6351c04a8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp */
-/* Computed positions: -k'8,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 20
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 25
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 50
-/* maximum key range = 48, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class TextFieldName_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TextFieldName_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 5,
- 0, 23, 30, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 0, 51, 51, 51, 51,
- 51, 51, 51, 0, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 10, 0, 51,
- 51, 0, 51, 51, 51, 25, 51, 8, 10, 51,
- 51, 5, 51, 51, 0, 5, 0, 51, 51, 51,
- 0, 0, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[7]];
- /*FALLTHROUGH*/
- case 7:
- case 6:
- case 5:
- case 4:
- case 3:
- break;
- }
- return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TextFieldName_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 10, 0, 12, 0,
- 0, 10, 0, 12, 13, 9, 10, 21, 22, 10, 0, 10, 0, 0,
- 10, 0, 25, 0, 0, 10, 0, 25, 0, 0, 0, 0, 15, 0,
- 0, 10, 0, 15, 0, 0, 0, 0, 10
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"ETA",14},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"alertText2",8},
- {""},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"sliderHeader",18},
- {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"alertText1",7},
- {""},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"sliderFooter",19},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"totalDistance",15},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"statusBar",4},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"mainField2",1},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"scrollableMessageBody",10},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"initialInteractionText",11},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"mediaClock",5},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"mainField1",0},
- {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"mediaTrack",6},
- {""},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"audioPassThruDisplayText2",17},
- {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"alertText3",9},
- {""},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"audioPassThruDisplayText1",16},
- {""}, {""}, {""}, {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"navigationText2",13},
- {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"mainField3",2},
- {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"navigationText1",12},
- {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
- {"mainField4",3}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp
deleted file mode 100644
index 03cca50ab..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TimerMode.h"
-#include "TimerModeMarshaller.h"
-#include "TimerModeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TimerMode::TimerModeInternal TimerModeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return TimerMode::INVALID_ENUM;
- const struct PerfectHashTable* p=TimerMode_intHash::getPointer(s,strlen(s));
- return p ? static_cast<TimerMode::TimerModeInternal>(p->idx) : TimerMode::INVALID_ENUM;
-}
-
-
-bool TimerModeMarshaller::fromJSON(const Json::Value& s,TimerMode& e)
-{
- e.mInternal=TimerMode::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=TimerMode::INVALID_ENUM);
-}
-
-
-Json::Value TimerModeMarshaller::toJSON(const TimerMode& e)
-{
- if(e.mInternal==TimerMode::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TimerModeMarshaller::fromString(const std::string& s,TimerMode& e)
-{
- e.mInternal=TimerMode::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string TimerModeMarshaller::toString(const TimerMode& e)
-{
- Json::FastWriter writer;
- return e.mInternal==TimerMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TimerModeMarshaller::mHashTable[3]=
-{
- {"UP",0},
- {"DOWN",1},
- {"NONE",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp
deleted file mode 100644
index 68d794858..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TimerMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-UP,0
-DOWN,1
-NONE,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h
deleted file mode 100644
index 96f814636..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TIMERMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TIMERMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TimerMode.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TimerMode
-
- class TimerModeMarshaller
- {
- public:
-
- static std::string toName(const TimerMode& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(TimerMode& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=TimerMode::INVALID_ENUM;
- }
-
- static bool checkIntegrity(TimerMode& e) { return e.mInternal!=TimerMode::INVALID_ENUM; }
- static bool checkIntegrityConst(const TimerMode& e) { return e.mInternal!=TimerMode::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,TimerMode& e);
- static const std::string toString(const TimerMode& e);
-
- static bool fromJSON(const Json::Value& s,TimerMode& e);
- static Json::Value toJSON(const TimerMode& e);
-
- static const char* getName(TimerMode::TimerModeInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const TimerMode::TimerModeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc
deleted file mode 100644
index 4c5cf2c46..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 5
-/* maximum key range = 4, duplicates = 0 */
-
-class TimerMode_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TimerMode_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 1, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 0, 6,
- 6, 6, 6, 6, 6, 0, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TimerMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 2, 0, 4, 4
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp"
- {"UP",0},
- {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp"
- {"NONE",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp"
- {"DOWN",1}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp
deleted file mode 100644
index 19e909b36..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h"
-#include "TirePressureTellTaleMarshaller.h"
-#include "TirePressureTellTaleMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TirePressureTellTale::TirePressureTellTaleInternal TirePressureTellTaleMarshaller::getIndex(const char* s)
-{
- if(!s)
- return TirePressureTellTale::INVALID_ENUM;
- const struct PerfectHashTable* p=TirePressureTellTale_intHash::getPointer(s,strlen(s));
- return p ? static_cast<TirePressureTellTale::TirePressureTellTaleInternal>(p->idx) : TirePressureTellTale::INVALID_ENUM;
-}
-
-
-bool TirePressureTellTaleMarshaller::fromJSON(const Json::Value& s,TirePressureTellTale& e)
-{
- e.mInternal=TirePressureTellTale::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=TirePressureTellTale::INVALID_ENUM);
-}
-
-
-Json::Value TirePressureTellTaleMarshaller::toJSON(const TirePressureTellTale& e)
-{
- if(e.mInternal==TirePressureTellTale::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TirePressureTellTaleMarshaller::fromString(const std::string& s,TirePressureTellTale& e)
-{
- e.mInternal=TirePressureTellTale::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string TirePressureTellTaleMarshaller::toString(const TirePressureTellTale& e)
-{
- Json::FastWriter writer;
- return e.mInternal==TirePressureTellTale::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TirePressureTellTaleMarshaller::mHashTable[3]=
-{
- {"OFF",0},
- {"ON",1},
- {"FLASH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp
deleted file mode 100644
index 090ca82af..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TirePressureTellTale_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-OFF,0
-ON,1
-FLASH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h
deleted file mode 100644
index 86dee3ab8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TIREPRESSURETELLTALEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TIREPRESSURETELLTALEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TirePressureTellTale
-
- class TirePressureTellTaleMarshaller
- {
- public:
-
- static std::string toName(const TirePressureTellTale& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(TirePressureTellTale& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=TirePressureTellTale::INVALID_ENUM;
- }
-
- static bool checkIntegrity(TirePressureTellTale& e) { return e.mInternal!=TirePressureTellTale::INVALID_ENUM; }
- static bool checkIntegrityConst(const TirePressureTellTale& e) { return e.mInternal!=TirePressureTellTale::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,TirePressureTellTale& e);
- static const std::string toString(const TirePressureTellTale& e);
-
- static bool fromJSON(const Json::Value& s,TirePressureTellTale& e);
- static Json::Value toJSON(const TirePressureTellTale& e);
-
- static const char* getName(TirePressureTellTale::TirePressureTellTaleInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const TirePressureTellTale::TirePressureTellTaleInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc
deleted file mode 100644
index 880dad58b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 5
-/* maximum key range = 4, duplicates = 0 */
-
-class TirePressureTellTale_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TirePressureTellTale_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TirePressureTellTale_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 2, 3, 0, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp"
- {"ON",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp"
- {"OFF",0},
- {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp"
- {"FLASH",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp
deleted file mode 100644
index 9944a27fd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-#include "TireStatusMarshaller.h"
-#include "SingleTireStatusMarshaller.h"
-#include "TirePressureTellTaleMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-TireStatus::TireStatus(const TireStatus& c)
-{
- *this=c;
-}
-
-
-bool TireStatus::checkIntegrity(void)
-{
- return TireStatusMarshaller::checkIntegrity(*this);
-}
-
-
-TireStatus::TireStatus(void)
-{
-}
-
-
-
-bool TireStatus::set_innerLeftRear(const SingleTireStatus& innerLeftRear_)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(innerLeftRear_)) return false;
- innerLeftRear=innerLeftRear_;
- return true;
-}
-
-bool TireStatus::set_innerRightRear(const SingleTireStatus& innerRightRear_)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(innerRightRear_)) return false;
- innerRightRear=innerRightRear_;
- return true;
-}
-
-bool TireStatus::set_leftFront(const SingleTireStatus& leftFront_)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(leftFront_)) return false;
- leftFront=leftFront_;
- return true;
-}
-
-bool TireStatus::set_leftRear(const SingleTireStatus& leftRear_)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(leftRear_)) return false;
- leftRear=leftRear_;
- return true;
-}
-
-bool TireStatus::set_pressureTellTale(const TirePressureTellTale& pressureTellTale_)
-{
- if(!TirePressureTellTaleMarshaller::checkIntegrityConst(pressureTellTale_)) return false;
- pressureTellTale=pressureTellTale_;
- return true;
-}
-
-bool TireStatus::set_rightFront(const SingleTireStatus& rightFront_)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(rightFront_)) return false;
- rightFront=rightFront_;
- return true;
-}
-
-bool TireStatus::set_rightRear(const SingleTireStatus& rightRear_)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(rightRear_)) return false;
- rightRear=rightRear_;
- return true;
-}
-
-
-
-
-const SingleTireStatus& TireStatus::get_innerLeftRear(void) const
-{
- return innerLeftRear;
-}
-
-
-const SingleTireStatus& TireStatus::get_innerRightRear(void) const
-{
- return innerRightRear;
-}
-
-
-const SingleTireStatus& TireStatus::get_leftFront(void) const
-{
- return leftFront;
-}
-
-
-const SingleTireStatus& TireStatus::get_leftRear(void) const
-{
- return leftRear;
-}
-
-
-const TirePressureTellTale& TireStatus::get_pressureTellTale(void) const
-{
- return pressureTellTale;
-}
-
-
-const SingleTireStatus& TireStatus::get_rightFront(void) const
-{
- return rightFront;
-}
-
-
-const SingleTireStatus& TireStatus::get_rightRear(void) const
-{
- return rightRear;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp
deleted file mode 100644
index ec7d6a97b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-#include "SingleTireStatusMarshaller.h"
-#include "TirePressureTellTaleMarshaller.h"
-
-#include "TireStatusMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TireStatusMarshaller::checkIntegrity(TireStatus& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool TireStatusMarshaller::fromString(const std::string& s,TireStatus& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string TireStatusMarshaller::toString(const TireStatus& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TireStatusMarshaller::checkIntegrityConst(const TireStatus& s)
-{
- if(!SingleTireStatusMarshaller::checkIntegrityConst(s.innerLeftRear)) return false;
- if(!SingleTireStatusMarshaller::checkIntegrityConst(s.innerRightRear)) return false;
- if(!SingleTireStatusMarshaller::checkIntegrityConst(s.leftFront)) return false;
- if(!SingleTireStatusMarshaller::checkIntegrityConst(s.leftRear)) return false;
- if(!TirePressureTellTaleMarshaller::checkIntegrityConst(s.pressureTellTale)) return false;
- if(!SingleTireStatusMarshaller::checkIntegrityConst(s.rightFront)) return false;
- if(!SingleTireStatusMarshaller::checkIntegrityConst(s.rightRear)) return false;
- return true;
-}
-
-Json::Value TireStatusMarshaller::toJSON(const TireStatus& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["innerLeftRear"]=SingleTireStatusMarshaller::toJSON(e.innerLeftRear);
-
- json["innerRightRear"]=SingleTireStatusMarshaller::toJSON(e.innerRightRear);
-
- json["leftFront"]=SingleTireStatusMarshaller::toJSON(e.leftFront);
-
- json["leftRear"]=SingleTireStatusMarshaller::toJSON(e.leftRear);
-
- json["pressureTellTale"]=TirePressureTellTaleMarshaller::toJSON(e.pressureTellTale);
-
- json["rightFront"]=SingleTireStatusMarshaller::toJSON(e.rightFront);
-
- json["rightRear"]=SingleTireStatusMarshaller::toJSON(e.rightRear);
-
-
- return json;
-}
-
-
-bool TireStatusMarshaller::fromJSON(const Json::Value& json,TireStatus& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("innerLeftRear")) return false;
- {
- const Json::Value& j=json["innerLeftRear"];
- if(!SingleTireStatusMarshaller::fromJSON(j,c.innerLeftRear))
- return false;
- }
- if(!json.isMember("innerRightRear")) return false;
- {
- const Json::Value& j=json["innerRightRear"];
- if(!SingleTireStatusMarshaller::fromJSON(j,c.innerRightRear))
- return false;
- }
- if(!json.isMember("leftFront")) return false;
- {
- const Json::Value& j=json["leftFront"];
- if(!SingleTireStatusMarshaller::fromJSON(j,c.leftFront))
- return false;
- }
- if(!json.isMember("leftRear")) return false;
- {
- const Json::Value& j=json["leftRear"];
- if(!SingleTireStatusMarshaller::fromJSON(j,c.leftRear))
- return false;
- }
- if(!json.isMember("pressureTellTale")) return false;
- {
- const Json::Value& j=json["pressureTellTale"];
- if(!TirePressureTellTaleMarshaller::fromJSON(j,c.pressureTellTale))
- return false;
- }
- if(!json.isMember("rightFront")) return false;
- {
- const Json::Value& j=json["rightFront"];
- if(!SingleTireStatusMarshaller::fromJSON(j,c.rightFront))
- return false;
- }
- if(!json.isMember("rightRear")) return false;
- {
- const Json::Value& j=json["rightRear"];
- if(!SingleTireStatusMarshaller::fromJSON(j,c.rightRear))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h
deleted file mode 100644
index 6167af186..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TIRESTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TIRESTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct TireStatusMarshaller
- {
- static bool checkIntegrity(TireStatus& e);
- static bool checkIntegrityConst(const TireStatus& e);
-
- static bool fromString(const std::string& s,TireStatus& e);
- static const std::string toString(const TireStatus& e);
-
- static bool fromJSON(const Json::Value& s,TireStatus& e);
- static Json::Value toJSON(const TireStatus& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp
deleted file mode 100644
index d2062150f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h"
-#include "TriggerSourceMarshaller.h"
-#include "TriggerSourceMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TriggerSource::TriggerSourceInternal TriggerSourceMarshaller::getIndex(const char* s)
-{
- if(!s)
- return TriggerSource::INVALID_ENUM;
- const struct PerfectHashTable* p=TriggerSource_intHash::getPointer(s,strlen(s));
- return p ? static_cast<TriggerSource::TriggerSourceInternal>(p->idx) : TriggerSource::INVALID_ENUM;
-}
-
-
-bool TriggerSourceMarshaller::fromJSON(const Json::Value& s,TriggerSource& e)
-{
- e.mInternal=TriggerSource::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=TriggerSource::INVALID_ENUM);
-}
-
-
-Json::Value TriggerSourceMarshaller::toJSON(const TriggerSource& e)
-{
- if(e.mInternal==TriggerSource::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TriggerSourceMarshaller::fromString(const std::string& s,TriggerSource& e)
-{
- e.mInternal=TriggerSource::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string TriggerSourceMarshaller::toString(const TriggerSource& e)
-{
- Json::FastWriter writer;
- return e.mInternal==TriggerSource::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TriggerSourceMarshaller::mHashTable[2]=
-{
- {"MENU",0},
- {"VR",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp
deleted file mode 100644
index d1812ad91..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TriggerSource_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-MENU,0
-VR,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h
deleted file mode 100644
index 9c6b8674b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TRIGGERSOURCEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TRIGGERSOURCEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TriggerSource
-
- class TriggerSourceMarshaller
- {
- public:
-
- static std::string toName(const TriggerSource& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(TriggerSource& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=TriggerSource::INVALID_ENUM;
- }
-
- static bool checkIntegrity(TriggerSource& e) { return e.mInternal!=TriggerSource::INVALID_ENUM; }
- static bool checkIntegrityConst(const TriggerSource& e) { return e.mInternal!=TriggerSource::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,TriggerSource& e);
- static const std::string toString(const TriggerSource& e);
-
- static bool fromJSON(const Json::Value& s,TriggerSource& e);
- static Json::Value toJSON(const TriggerSource& e);
-
- static const char* getName(TriggerSource::TriggerSourceInternal e)
- {
- return (e>=0 && e<2) ? mHashTable[e].name : NULL;
- }
-
- static const TriggerSource::TriggerSourceInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[2];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc
deleted file mode 100644
index 3f533f14b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 4
-/* maximum key range = 3, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class TriggerSource_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TriggerSource_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TriggerSource_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 2, 0, 4
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp"
- {"VR",1},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp"
- {"MENU",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp
deleted file mode 100644
index c9cc8e5e9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-#include "TurnMarshaller.h"
-#include "ImageMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Turn& Turn::operator =(const Turn& c)
-{
- navigationText=c.navigationText ? new std::string(c.navigationText[0]) : 0;
- turnIcon=c.turnIcon;
-
- return *this;
-}
-
-
-Turn::~Turn(void)
-{
- if(navigationText)
- delete navigationText;
-}
-
-
-Turn::Turn(const Turn& c)
-{
- *this=c;
-}
-
-
-bool Turn::checkIntegrity(void)
-{
- return TurnMarshaller::checkIntegrity(*this);
-}
-
-
-Turn::Turn(void) :
- navigationText(0)
-{
-}
-
-
-
-bool Turn::set_navigationText(const std::string& navigationText_)
-{
- if(navigationText_.length()>500) return false;
- delete navigationText;
- navigationText=0;
-
- navigationText=new std::string(navigationText_);
- return true;
-}
-
-void Turn::reset_navigationText(void)
-{
- if(navigationText)
- delete navigationText;
- navigationText=0;
-}
-
-bool Turn::set_turnIcon(const Image& turnIcon_)
-{
- if(!ImageMarshaller::checkIntegrityConst(turnIcon_)) return false;
- turnIcon=turnIcon_;
- return true;
-}
-
-
-
-
-const std::string* Turn::get_navigationText(void) const
-{
- return navigationText;
-}
-
-
-const Image& Turn::get_turnIcon(void) const
-{
- return turnIcon;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp
deleted file mode 100644
index d6dcf3869..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-#include "ImageMarshaller.h"
-
-#include "TurnMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TurnMarshaller::checkIntegrity(Turn& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool TurnMarshaller::fromString(const std::string& s,Turn& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string TurnMarshaller::toString(const Turn& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TurnMarshaller::checkIntegrityConst(const Turn& s)
-{
- if(s.navigationText && s.navigationText->length()>500) return false;
- if(!ImageMarshaller::checkIntegrityConst(s.turnIcon)) return false;
- return true;
-}
-
-Json::Value TurnMarshaller::toJSON(const Turn& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.navigationText)
- json["navigationText"]=Json::Value(*e.navigationText);
-
- json["turnIcon"]=ImageMarshaller::toJSON(e.turnIcon);
-
-
- return json;
-}
-
-
-bool TurnMarshaller::fromJSON(const Json::Value& json,Turn& c)
-{
- if(c.navigationText) delete c.navigationText;
- c.navigationText=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("navigationText"))
- {
- const Json::Value& j=json["navigationText"];
- if(!j.isString()) return false;
- c.navigationText=new std::string(j.asString());
- }
- if(!json.isMember("turnIcon")) return false;
- {
- const Json::Value& j=json["turnIcon"];
- if(!ImageMarshaller::fromJSON(j,c.turnIcon))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h
deleted file mode 100644
index 0cb22d62c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TURNMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TURNMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct TurnMarshaller
- {
- static bool checkIntegrity(Turn& e);
- static bool checkIntegrityConst(const Turn& e);
-
- static bool fromString(const std::string& s,Turn& e);
- static const std::string toString(const Turn& e);
-
- static bool fromJSON(const Json::Value& s,Turn& e);
- static Json::Value toJSON(const Turn& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp
deleted file mode 100644
index 83484c3c7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-#include "UnregisterAppInterface_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UnregisterAppInterface_request::~UnregisterAppInterface_request(void)
-{
-}
-
-
-UnregisterAppInterface_request::UnregisterAppInterface_request(const UnregisterAppInterface_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool UnregisterAppInterface_request::checkIntegrity(void)
-{
- return UnregisterAppInterface_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnregisterAppInterface_request::UnregisterAppInterface_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp
deleted file mode 100644
index 6858d1c13..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-
-
-#include "UnregisterAppInterface_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnregisterAppInterface_requestMarshaller::checkIntegrity(UnregisterAppInterface_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::fromString(const std::string& s,UnregisterAppInterface_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UnregisterAppInterface_requestMarshaller::toString(const UnregisterAppInterface_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::checkIntegrityConst(const UnregisterAppInterface_request& s)
-{
- return true;
-}
-
-Json::Value UnregisterAppInterface_requestMarshaller::toJSON(const UnregisterAppInterface_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- return json;
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::fromJSON(const Json::Value& json,UnregisterAppInterface_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h
deleted file mode 100644
index 00f0d5b66..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UnregisterAppInterface_requestMarshaller
- {
- static bool checkIntegrity(UnregisterAppInterface_request& e);
- static bool checkIntegrityConst(const UnregisterAppInterface_request& e);
-
- static bool fromString(const std::string& s,UnregisterAppInterface_request& e);
- static const std::string toString(const UnregisterAppInterface_request& e);
-
- static bool fromJSON(const Json::Value& s,UnregisterAppInterface_request& e);
- static Json::Value toJSON(const UnregisterAppInterface_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp
deleted file mode 100644
index 900f7b53e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-#include "UnregisterAppInterface_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UnregisterAppInterface_response& UnregisterAppInterface_response::operator =(const UnregisterAppInterface_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-UnregisterAppInterface_response::~UnregisterAppInterface_response(void)
-{}
-
-UnregisterAppInterface_response::UnregisterAppInterface_response(const UnregisterAppInterface_response& c)
-{
- *this = c;
-}
-
-bool UnregisterAppInterface_response::checkIntegrity(void)
-{
- return UnregisterAppInterface_responseMarshaller::checkIntegrity(*this);
-}
-
-UnregisterAppInterface_response::UnregisterAppInterface_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp
deleted file mode 100644
index f66d73454..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-#include "ResultMarshaller.h"
-
-#include "UnregisterAppInterface_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnregisterAppInterface_responseMarshaller::checkIntegrity(UnregisterAppInterface_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::fromString(const std::string& s,UnregisterAppInterface_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UnregisterAppInterface_responseMarshaller::toString(const UnregisterAppInterface_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::checkIntegrityConst(const UnregisterAppInterface_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value UnregisterAppInterface_responseMarshaller::toJSON(const UnregisterAppInterface_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::fromJSON(const Json::Value& json,UnregisterAppInterface_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h
deleted file mode 100644
index 87c8e8cca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UnregisterAppInterface_responseMarshaller
- {
- static bool checkIntegrity(UnregisterAppInterface_response& e);
- static bool checkIntegrityConst(const UnregisterAppInterface_response& e);
-
- static bool fromString(const std::string& s,UnregisterAppInterface_response& e);
- static const std::string toString(const UnregisterAppInterface_response& e);
-
- static bool fromJSON(const Json::Value& s,UnregisterAppInterface_response& e);
- static Json::Value toJSON(const UnregisterAppInterface_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp
deleted file mode 100644
index e6d978ba5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-#include "UnsubscribeButton_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UnsubscribeButton_request::~UnsubscribeButton_request(void)
-{
-}
-
-
-UnsubscribeButton_request::UnsubscribeButton_request(const UnsubscribeButton_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool UnsubscribeButton_request::checkIntegrity(void)
-{
- return UnsubscribeButton_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnsubscribeButton_request::UnsubscribeButton_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool UnsubscribeButton_request::set_buttonName(const ButtonName& buttonName_)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_)) return false;
- buttonName=buttonName_;
- return true;
-}
-
-
-
-
-const ButtonName& UnsubscribeButton_request::get_buttonName(void) const
-{
- return buttonName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp
deleted file mode 100644
index a2ed23d06..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-#include "ButtonNameMarshaller.h"
-
-#include "UnsubscribeButton_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeButton_requestMarshaller::checkIntegrity(UnsubscribeButton_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeButton_requestMarshaller::fromString(const std::string& s,UnsubscribeButton_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UnsubscribeButton_requestMarshaller::toString(const UnsubscribeButton_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeButton_requestMarshaller::checkIntegrityConst(const UnsubscribeButton_request& s)
-{
- if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName)) return false;
- return true;
-}
-
-Json::Value UnsubscribeButton_requestMarshaller::toJSON(const UnsubscribeButton_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
- return json;
-}
-
-
-bool UnsubscribeButton_requestMarshaller::fromJSON(const Json::Value& json,UnsubscribeButton_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("buttonName")) return false;
- {
- const Json::Value& j=json["buttonName"];
- if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h
deleted file mode 100644
index 8b4d106ea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UnsubscribeButton_requestMarshaller
- {
- static bool checkIntegrity(UnsubscribeButton_request& e);
- static bool checkIntegrityConst(const UnsubscribeButton_request& e);
-
- static bool fromString(const std::string& s,UnsubscribeButton_request& e);
- static const std::string toString(const UnsubscribeButton_request& e);
-
- static bool fromJSON(const Json::Value& s,UnsubscribeButton_request& e);
- static Json::Value toJSON(const UnsubscribeButton_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp
deleted file mode 100644
index 7bf2518b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-#include "UnsubscribeButton_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UnsubscribeButton_response& UnsubscribeButton_response::operator =(const UnsubscribeButton_response& c)
-{
- success= c.success;
- resultCode= c.resultCode;
- info= c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-UnsubscribeButton_response::~UnsubscribeButton_response(void)
-{}
-
-
-UnsubscribeButton_response::UnsubscribeButton_response(const UnsubscribeButton_response& c)
-{
- *this=c;
-}
-
-bool UnsubscribeButton_response::checkIntegrity(void)
-{
- return UnsubscribeButton_responseMarshaller::checkIntegrity(*this);
-}
-
-UnsubscribeButton_response::UnsubscribeButton_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp
deleted file mode 100644
index 7b55748ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-#include "ResultMarshaller.h"
-
-#include "UnsubscribeButton_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeButton_responseMarshaller::checkIntegrity(UnsubscribeButton_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeButton_responseMarshaller::fromString(const std::string& s,UnsubscribeButton_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UnsubscribeButton_responseMarshaller::toString(const UnsubscribeButton_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeButton_responseMarshaller::checkIntegrityConst(const UnsubscribeButton_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value UnsubscribeButton_responseMarshaller::toJSON(const UnsubscribeButton_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool UnsubscribeButton_responseMarshaller::fromJSON(const Json::Value& json,UnsubscribeButton_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h
deleted file mode 100644
index 4f54f4414..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UnsubscribeButton_responseMarshaller
- {
- static bool checkIntegrity(UnsubscribeButton_response& e);
- static bool checkIntegrityConst(const UnsubscribeButton_response& e);
-
- static bool fromString(const std::string& s,UnsubscribeButton_response& e);
- static const std::string toString(const UnsubscribeButton_response& e);
-
- static bool fromJSON(const Json::Value& s,UnsubscribeButton_response& e);
- static Json::Value toJSON(const UnsubscribeButton_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp
deleted file mode 100644
index bd0e313e0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-#include "UnsubscribeVehicleData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UnsubscribeVehicleData_request::~UnsubscribeVehicleData_request(void)
-{
-}
-
-
-UnsubscribeVehicleData_request::UnsubscribeVehicleData_request(const UnsubscribeVehicleData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool UnsubscribeVehicleData_request::checkIntegrity(void)
-{
- return UnsubscribeVehicleData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnsubscribeVehicleData_request::UnsubscribeVehicleData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool UnsubscribeVehicleData_request::set_dataType(const std::vector<VehicleDataType>& dataType_)
-{
- unsigned int i=dataType_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_[i])) return false;
- }
- dataType=dataType_;
- return true;
-}
-
-
-
-
-const std::vector<VehicleDataType>& UnsubscribeVehicleData_request::get_dataType(void) const
-{
- return dataType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp
deleted file mode 100644
index 2fa27cb02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "UnsubscribeVehicleData_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeVehicleData_requestMarshaller::checkIntegrity(UnsubscribeVehicleData_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeVehicleData_requestMarshaller::fromString(const std::string& s,UnsubscribeVehicleData_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UnsubscribeVehicleData_requestMarshaller::toString(const UnsubscribeVehicleData_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeVehicleData_requestMarshaller::checkIntegrityConst(const UnsubscribeVehicleData_request& s)
-{
- {
- unsigned int i=s.dataType.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value UnsubscribeVehicleData_requestMarshaller::toJSON(const UnsubscribeVehicleData_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["dataType"]=Json::Value(Json::arrayValue);
- json["dataType"].resize(e.dataType.size());
- for(unsigned int i=0;i<e.dataType.size();i++)
- json["dataType"][i]=VehicleDataTypeMarshaller::toJSON(e.dataType[i]);
-
- return json;
-}
-
-
-bool UnsubscribeVehicleData_requestMarshaller::fromJSON(const Json::Value& json,UnsubscribeVehicleData_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("dataType")) return false;
- {
- const Json::Value& j=json["dataType"];
- if(!j.isArray()) return false;
- c.dataType.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VehicleDataType t;
- if(!VehicleDataTypeMarshaller::fromJSON(j[i],t))
- return false;
- c.dataType[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h
deleted file mode 100644
index ab17438db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UnsubscribeVehicleData_requestMarshaller
- {
- static bool checkIntegrity(UnsubscribeVehicleData_request& e);
- static bool checkIntegrityConst(const UnsubscribeVehicleData_request& e);
-
- static bool fromString(const std::string& s,UnsubscribeVehicleData_request& e);
- static const std::string toString(const UnsubscribeVehicleData_request& e);
-
- static bool fromJSON(const Json::Value& s,UnsubscribeVehicleData_request& e);
- static Json::Value toJSON(const UnsubscribeVehicleData_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp
deleted file mode 100644
index 50526f2cb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-#include "UnsubscribeVehicleData_responseMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UnsubscribeVehicleData_response& UnsubscribeVehicleData_response::operator =(const UnsubscribeVehicleData_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
- dataResult = c.dataResult ? new std::vector<VehicleDataResult>(c.dataResult[0]) : 0;
-
- return *this;
-}
-
-UnsubscribeVehicleData_response::~UnsubscribeVehicleData_response(void)
-{
- if (dataResult)
- {
- delete dataResult;
- }
-}
-
-UnsubscribeVehicleData_response::UnsubscribeVehicleData_response(const UnsubscribeVehicleData_response& c)
-{
- *this = c;
-}
-
-bool UnsubscribeVehicleData_response::checkIntegrity(void)
-{
- return UnsubscribeVehicleData_responseMarshaller::checkIntegrity(*this);
-}
-
-UnsubscribeVehicleData_response::UnsubscribeVehicleData_response(void)
- : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
- , dataResult(0)
-{}
-
-bool UnsubscribeVehicleData_response::set_dataResult(const std::vector<VehicleDataResult>& dataResult_)
-{
- unsigned int i = dataResult_.size();
- if (i > 100 || i < 1)
- {
- return false;
- }
- while (i--)
- {
- if (!VehicleDataResultMarshaller::checkIntegrityConst(dataResult_[i]))
- {
- return false;
- }
- }
- delete dataResult;
- dataResult = 0;
-
- dataResult = new std::vector<VehicleDataResult>(dataResult_);
- return true;
-}
-
-void UnsubscribeVehicleData_response::reset_dataResult(void)
-{
- if (dataResult)
- {
- delete dataResult;
- }
- dataResult = 0;
-}
-
-const std::vector<VehicleDataResult>* UnsubscribeVehicleData_response::get_dataResult(void) const
-{
- return dataResult;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp
deleted file mode 100644
index f69a1acab..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-#include "ResultMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-#include "UnsubscribeVehicleData_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeVehicleData_responseMarshaller::checkIntegrity(UnsubscribeVehicleData_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeVehicleData_responseMarshaller::fromString(const std::string& s,UnsubscribeVehicleData_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UnsubscribeVehicleData_responseMarshaller::toString(const UnsubscribeVehicleData_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeVehicleData_responseMarshaller::checkIntegrityConst(const UnsubscribeVehicleData_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- if(s.dataResult)
- {
- unsigned int i=s.dataResult[0].size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!VehicleDataResultMarshaller::checkIntegrityConst(s.dataResult[0][i])) return false;
- }
- }
- return true;
-}
-
-Json::Value UnsubscribeVehicleData_responseMarshaller::toJSON(const UnsubscribeVehicleData_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- if(e.dataResult)
- {
- unsigned int sz=e.dataResult->size();
- json["dataResult"]=Json::Value(Json::arrayValue);
- json["dataResult"].resize(sz);
- for(unsigned int i=0;i<sz;i++)
- json["dataResult"][i]=VehicleDataResultMarshaller::toJSON(e.dataResult[0][i]);
- }
-
- return json;
-}
-
-
-bool UnsubscribeVehicleData_responseMarshaller::fromJSON(const Json::Value& json,UnsubscribeVehicleData_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- if(c.dataResult) delete c.dataResult;
- c.dataResult=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
- if(json.isMember("dataResult"))
- {
- const Json::Value& j=json["dataResult"];
- if(!j.isArray()) return false;
- c.dataResult=new std::vector<VehicleDataResult>();
- c.dataResult->resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- VehicleDataResult t;
- if(!VehicleDataResultMarshaller::fromJSON(j[i],t))
- return false;
- c.dataResult[0][i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h
deleted file mode 100644
index 656fb0a3d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UnsubscribeVehicleData_responseMarshaller
- {
- static bool checkIntegrity(UnsubscribeVehicleData_response& e);
- static bool checkIntegrityConst(const UnsubscribeVehicleData_response& e);
-
- static bool fromString(const std::string& s,UnsubscribeVehicleData_response& e);
- static const std::string toString(const UnsubscribeVehicleData_response& e);
-
- static bool fromJSON(const Json::Value& s,UnsubscribeVehicleData_response& e);
- static Json::Value toJSON(const UnsubscribeVehicleData_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp
deleted file mode 100644
index edd5a3906..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h"
-#include "UpdateModeMarshaller.h"
-#include "UpdateModeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const UpdateMode::UpdateModeInternal UpdateModeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return UpdateMode::INVALID_ENUM;
- const struct PerfectHashTable* p=UpdateMode_intHash::getPointer(s,strlen(s));
- return p ? static_cast<UpdateMode::UpdateModeInternal>(p->idx) : UpdateMode::INVALID_ENUM;
-}
-
-
-bool UpdateModeMarshaller::fromJSON(const Json::Value& s,UpdateMode& e)
-{
- e.mInternal=UpdateMode::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=UpdateMode::INVALID_ENUM);
-}
-
-
-Json::Value UpdateModeMarshaller::toJSON(const UpdateMode& e)
-{
- if(e.mInternal==UpdateMode::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool UpdateModeMarshaller::fromString(const std::string& s,UpdateMode& e)
-{
- e.mInternal=UpdateMode::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string UpdateModeMarshaller::toString(const UpdateMode& e)
-{
- Json::FastWriter writer;
- return e.mInternal==UpdateMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable UpdateModeMarshaller::mHashTable[5]=
-{
- {"COUNTUP",0},
- {"COUNTDOWN",1},
- {"PAUSE",2},
- {"RESUME",3},
- {"CLEAR",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp
deleted file mode 100644
index 7ff0eb4d3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name UpdateMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-COUNTUP,0
-COUNTDOWN,1
-PAUSE,2
-RESUME,3
-CLEAR,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h
deleted file mode 100644
index 2dd1ad76d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UPDATEMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UPDATEMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for UpdateMode
-
- class UpdateModeMarshaller
- {
- public:
-
- static std::string toName(const UpdateMode& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(UpdateMode& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=UpdateMode::INVALID_ENUM;
- }
-
- static bool checkIntegrity(UpdateMode& e) { return e.mInternal!=UpdateMode::INVALID_ENUM; }
- static bool checkIntegrityConst(const UpdateMode& e) { return e.mInternal!=UpdateMode::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,UpdateMode& e);
- static const std::string toString(const UpdateMode& e);
-
- static bool fromJSON(const Json::Value& s,UpdateMode& e);
- static Json::Value toJSON(const UpdateMode& e);
-
- static const char* getName(UpdateMode::UpdateModeInternal e)
- {
- return (e>=0 && e<5) ? mHashTable[e].name : NULL;
- }
-
- static const UpdateMode::UpdateModeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[5];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc
deleted file mode 100644
index cba43560c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 10
-/* maximum key range = 6, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class UpdateMode_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-UpdateMode_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 0, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 5, 11, 0, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-UpdateMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 5, 6, 7, 0, 9, 5
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
- {"CLEAR",4},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
- {"RESUME",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
- {"COUNTUP",0},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
- {"COUNTDOWN",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
- {"PAUSE",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp
deleted file mode 100644
index 9b40f4cbc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-#include "UpdateTurnList_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TurnMarshaller.h"
-
-#define PROTOCOL_VERSION 2
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UpdateTurnList_request::~UpdateTurnList_request(void)
-{
-}
-
-
-UpdateTurnList_request::UpdateTurnList_request(const UpdateTurnList_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
- *this=c;
-}
-
-
-bool UpdateTurnList_request::checkIntegrity(void)
-{
- return UpdateTurnList_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UpdateTurnList_request::UpdateTurnList_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool UpdateTurnList_request::set_turnList(const std::vector<Turn>& turnList_)
-{
- unsigned int i=turnList_.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TurnMarshaller::checkIntegrityConst(turnList_[i])) return false;
- }
- turnList=turnList_;
- return true;
-}
-
-bool UpdateTurnList_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
- unsigned int i=softButtons_.size();
- if(i>1 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i])) return false;
- }
- softButtons=softButtons_;
- return true;
-}
-
-
-
-
-const std::vector<Turn>& UpdateTurnList_request::get_turnList(void) const
-{
- return turnList;
-}
-
-const std::vector<SoftButton>& UpdateTurnList_request::get_softButtons(void) const
-{
- return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp
deleted file mode 100644
index f04e0abb8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-#include "SoftButtonMarshaller.h"
-#include "TurnMarshaller.h"
-
-#include "UpdateTurnList_requestMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UpdateTurnList_requestMarshaller::checkIntegrity(UpdateTurnList_request& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UpdateTurnList_requestMarshaller::fromString(const std::string& s,UpdateTurnList_request& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UpdateTurnList_requestMarshaller::toString(const UpdateTurnList_request& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UpdateTurnList_requestMarshaller::checkIntegrityConst(const UpdateTurnList_request& s)
-{
- {
- unsigned int i=s.turnList.size();
- if(i>100 || i<1) return false;
- while(i--)
- {
- if(!TurnMarshaller::checkIntegrityConst(s.turnList[i])) return false;
- }
- }
- {
- unsigned int i=s.softButtons.size();
- if(i>1 || i<0) return false;
- while(i--)
- {
- if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[i])) return false;
- }
- }
- return true;
-}
-
-Json::Value UpdateTurnList_requestMarshaller::toJSON(const UpdateTurnList_request& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["turnList"]=Json::Value(Json::arrayValue);
- json["turnList"].resize(e.turnList.size());
- for(unsigned int i=0;i<e.turnList.size();i++)
- json["turnList"][i]=TurnMarshaller::toJSON(e.turnList[i]);
-
- json["softButtons"]=Json::Value(Json::arrayValue);
- json["softButtons"].resize(e.softButtons.size());
- for(unsigned int i=0;i<e.softButtons.size();i++)
- json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
- return json;
-}
-
-
-bool UpdateTurnList_requestMarshaller::fromJSON(const Json::Value& json,UpdateTurnList_request& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("turnList")) return false;
- {
- const Json::Value& j=json["turnList"];
- if(!j.isArray()) return false;
- c.turnList.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- Turn t;
- if(!TurnMarshaller::fromJSON(j[i],t))
- return false;
- c.turnList[i]=t;
- }
-
- }
- if(!json.isMember("softButtons")) return false;
- {
- const Json::Value& j=json["softButtons"];
- if(!j.isArray()) return false;
- c.softButtons.resize(j.size());
- for(unsigned int i=0;i<j.size();i++)
- {
- SoftButton t;
- if(!SoftButtonMarshaller::fromJSON(j[i],t))
- return false;
- c.softButtons[i]=t;
- }
-
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h
deleted file mode 100644
index c829abc5c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UpdateTurnList_requestMarshaller
- {
- static bool checkIntegrity(UpdateTurnList_request& e);
- static bool checkIntegrityConst(const UpdateTurnList_request& e);
-
- static bool fromString(const std::string& s,UpdateTurnList_request& e);
- static const std::string toString(const UpdateTurnList_request& e);
-
- static bool fromJSON(const Json::Value& s,UpdateTurnList_request& e);
- static Json::Value toJSON(const UpdateTurnList_request& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp
deleted file mode 100644
index 80f10fe40..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-#include "UpdateTurnList_responseMarshaller.h"
-
-namespace
-{
- const int PROTOCOL_VERSION = 2;
-}
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UpdateTurnList_response& UpdateTurnList_response::operator =(const UpdateTurnList_response& c)
-{
- success = c.success;
- resultCode = c.resultCode;
- info = c.info ? new std::string(c.info[0]) : 0;
-
- return *this;
-}
-
-UpdateTurnList_response::~UpdateTurnList_response(void)
-{}
-
-
-UpdateTurnList_response::UpdateTurnList_response(const UpdateTurnList_response& c)
-{
- *this = c;
-}
-
-bool UpdateTurnList_response::checkIntegrity(void)
-{
- return UpdateTurnList_responseMarshaller::checkIntegrity(*this);
-}
-
-UpdateTurnList_response::UpdateTurnList_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp
deleted file mode 100644
index d2c9ca376..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-#include "ResultMarshaller.h"
-
-#include "UpdateTurnList_responseMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UpdateTurnList_responseMarshaller::checkIntegrity(UpdateTurnList_response& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool UpdateTurnList_responseMarshaller::fromString(const std::string& s,UpdateTurnList_response& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string UpdateTurnList_responseMarshaller::toString(const UpdateTurnList_response& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UpdateTurnList_responseMarshaller::checkIntegrityConst(const UpdateTurnList_response& s)
-{
- if(!ResultMarshaller::checkIntegrityConst(s.resultCode)) return false;
- if(s.info && s.info->length()>1000) return false;
- return true;
-}
-
-Json::Value UpdateTurnList_responseMarshaller::toJSON(const UpdateTurnList_response& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["success"]=Json::Value(e.success);
-
- json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
- if(e.info)
- json["info"]=Json::Value(*e.info);
-
- return json;
-}
-
-
-bool UpdateTurnList_responseMarshaller::fromJSON(const Json::Value& json,UpdateTurnList_response& c)
-{
- if(c.info) delete c.info;
- c.info=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("success")) return false;
- {
- const Json::Value& j=json["success"];
- if(!j.isBool()) return false;
- c.success=j.asBool();
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!ResultMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
- if(json.isMember("info"))
- {
- const Json::Value& j=json["info"];
- if(!j.isString()) return false;
- c.info=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h
deleted file mode 100644
index 10dc40c8c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct UpdateTurnList_responseMarshaller
- {
- static bool checkIntegrity(UpdateTurnList_response& e);
- static bool checkIntegrityConst(const UpdateTurnList_response& e);
-
- static bool fromString(const std::string& s,UpdateTurnList_response& e);
- static const std::string toString(const UpdateTurnList_response& e);
-
- static bool fromJSON(const Json::Value& s,UpdateTurnList_response& e);
- static Json::Value toJSON(const UpdateTurnList_response& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp
deleted file mode 100644
index 15293e54b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h"
-#include "VehicleDataResultMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-VehicleDataResult::VehicleDataResult(const VehicleDataResult& c)
-{
- *this=c;
-}
-
-
-bool VehicleDataResult::checkIntegrity(void)
-{
- return VehicleDataResultMarshaller::checkIntegrity(*this);
-}
-
-
-VehicleDataResult::VehicleDataResult(void)
-{
-}
-
-
-
-bool VehicleDataResult::set_dataType(const VehicleDataType& dataType_)
-{
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_)) return false;
- dataType=dataType_;
- return true;
-}
-
-bool VehicleDataResult::set_resultCode(const VehicleDataResultCode& resultCode_)
-{
- if(!VehicleDataResultCodeMarshaller::checkIntegrityConst(resultCode_)) return false;
- resultCode=resultCode_;
- return true;
-}
-
-
-
-
-const VehicleDataType& VehicleDataResult::get_dataType(void) const
-{
- return dataType;
-}
-
-
-const VehicleDataResultCode& VehicleDataResult::get_resultCode(void) const
-{
- return resultCode;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp
deleted file mode 100644
index 99aa6b954..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h"
-#include "VehicleDataResultCodeMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const VehicleDataResultCode::VehicleDataResultCodeInternal VehicleDataResultCodeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return VehicleDataResultCode::INVALID_ENUM;
- const struct PerfectHashTable* p=VehicleDataResultCode_intHash::getPointer(s,strlen(s));
- return p ? static_cast<VehicleDataResultCode::VehicleDataResultCodeInternal>(p->idx) : VehicleDataResultCode::INVALID_ENUM;
-}
-
-
-bool VehicleDataResultCodeMarshaller::fromJSON(const Json::Value& s,VehicleDataResultCode& e)
-{
- e.mInternal=VehicleDataResultCode::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=VehicleDataResultCode::INVALID_ENUM);
-}
-
-
-Json::Value VehicleDataResultCodeMarshaller::toJSON(const VehicleDataResultCode& e)
-{
- if(e.mInternal==VehicleDataResultCode::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VehicleDataResultCodeMarshaller::fromString(const std::string& s,VehicleDataResultCode& e)
-{
- e.mInternal=VehicleDataResultCode::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string VehicleDataResultCodeMarshaller::toString(const VehicleDataResultCode& e)
-{
- Json::FastWriter writer;
- return e.mInternal==VehicleDataResultCode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VehicleDataResultCodeMarshaller::mHashTable[8]=
-{
- {"SUCCESS",0},
- {"DISALLOWED",1},
- {"USER_DISALLOWED",2},
- {"INVALID_ID",3},
- {"VEHICLE_DATA_NOT_AVAILABLE",4},
- {"DATA_ALREADY_SUBSCRIBED",5},
- {"DATA_NOT_SUBSCRIBED",6},
- {"IGNORED",7}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp
deleted file mode 100644
index 73000e0c7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp
+++ /dev/null
@@ -1,24 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VehicleDataResultCode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-SUCCESS,0
-DISALLOWED,1
-USER_DISALLOWED,2
-INVALID_ID,3
-VEHICLE_DATA_NOT_AVAILABLE,4
-DATA_ALREADY_SUBSCRIBED,5
-DATA_NOT_SUBSCRIBED,6
-IGNORED,7
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h
deleted file mode 100644
index 656f68e89..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTCODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTCODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for VehicleDataResultCode
-
- class VehicleDataResultCodeMarshaller
- {
- public:
-
- static std::string toName(const VehicleDataResultCode& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(VehicleDataResultCode& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=VehicleDataResultCode::INVALID_ENUM;
- }
-
- static bool checkIntegrity(VehicleDataResultCode& e) { return e.mInternal!=VehicleDataResultCode::INVALID_ENUM; }
- static bool checkIntegrityConst(const VehicleDataResultCode& e) { return e.mInternal!=VehicleDataResultCode::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,VehicleDataResultCode& e);
- static const std::string toString(const VehicleDataResultCode& e);
-
- static bool fromJSON(const Json::Value& s,VehicleDataResultCode& e);
- static Json::Value toJSON(const VehicleDataResultCode& e);
-
- static const char* getName(VehicleDataResultCode::VehicleDataResultCodeInternal e)
- {
- return (e>=0 && e<8) ? mHashTable[e].name : NULL;
- }
-
- static const VehicleDataResultCode::VehicleDataResultCodeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[8];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc
deleted file mode 100644
index 3b9ab618b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 8
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 26
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 28
-/* maximum key range = 22, duplicates = 0 */
-
-class VehicleDataResultCode_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-VehicleDataResultCode_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 5, 29,
- 29, 29, 29, 0, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 5, 29, 5, 0, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
- 29, 29, 29, 29, 29, 29
- };
- return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-VehicleDataResultCode_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 0, 7, 0,
- 0, 10, 0, 0, 0, 0, 15, 0, 0, 0, 19, 0, 26, 0,
- 23
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"IGNORED",7},
- {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"INVALID_ID",3},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"SUCCESS",0},
- {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"DISALLOWED",1},
- {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"USER_DISALLOWED",2},
- {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"DATA_NOT_SUBSCRIBED",6},
- {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"VEHICLE_DATA_NOT_AVAILABLE",4},
- {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
- {"DATA_ALREADY_SUBSCRIBED",5}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp
deleted file mode 100644
index 97b29e28f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h"
-#include "VehicleDataResultCodeMarshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "VehicleDataResultMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool VehicleDataResultMarshaller::checkIntegrity(VehicleDataResult& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool VehicleDataResultMarshaller::fromString(const std::string& s,VehicleDataResult& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string VehicleDataResultMarshaller::toString(const VehicleDataResult& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool VehicleDataResultMarshaller::checkIntegrityConst(const VehicleDataResult& s)
-{
- if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType)) return false;
- if(!VehicleDataResultCodeMarshaller::checkIntegrityConst(s.resultCode)) return false;
- return true;
-}
-
-Json::Value VehicleDataResultMarshaller::toJSON(const VehicleDataResult& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["dataType"]=VehicleDataTypeMarshaller::toJSON(e.dataType);
-
- json["resultCode"]=VehicleDataResultCodeMarshaller::toJSON(e.resultCode);
-
-
- return json;
-}
-
-
-bool VehicleDataResultMarshaller::fromJSON(const Json::Value& json,VehicleDataResult& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("dataType")) return false;
- {
- const Json::Value& j=json["dataType"];
- if(!VehicleDataTypeMarshaller::fromJSON(j,c.dataType))
- return false;
- }
- if(!json.isMember("resultCode")) return false;
- {
- const Json::Value& j=json["resultCode"];
- if(!VehicleDataResultCodeMarshaller::fromJSON(j,c.resultCode))
- return false;
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h
deleted file mode 100644
index 237f38dda..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct VehicleDataResultMarshaller
- {
- static bool checkIntegrity(VehicleDataResult& e);
- static bool checkIntegrityConst(const VehicleDataResult& e);
-
- static bool fromString(const std::string& s,VehicleDataResult& e);
- static const std::string toString(const VehicleDataResult& e);
-
- static bool fromJSON(const Json::Value& s,VehicleDataResult& e);
- static Json::Value toJSON(const VehicleDataResult& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp
deleted file mode 100644
index 71312a476..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h"
-#include "VehicleDataTypeMarshaller.h"
-#include "VehicleDataTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const VehicleDataType::VehicleDataTypeInternal VehicleDataTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return VehicleDataType::INVALID_ENUM;
- const struct PerfectHashTable* p=VehicleDataType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<VehicleDataType::VehicleDataTypeInternal>(p->idx) : VehicleDataType::INVALID_ENUM;
-}
-
-
-bool VehicleDataTypeMarshaller::fromJSON(const Json::Value& s,VehicleDataType& e)
-{
- e.mInternal=VehicleDataType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=VehicleDataType::INVALID_ENUM);
-}
-
-
-Json::Value VehicleDataTypeMarshaller::toJSON(const VehicleDataType& e)
-{
- if(e.mInternal==VehicleDataType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VehicleDataTypeMarshaller::fromString(const std::string& s,VehicleDataType& e)
-{
- e.mInternal=VehicleDataType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string VehicleDataTypeMarshaller::toString(const VehicleDataType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==VehicleDataType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VehicleDataTypeMarshaller::mHashTable[16]=
-{
- {"VEHICLEDATA_GPS",0},
- {"VEHICLEDATA_SPEED",1},
- {"VEHICLEDATA_FUELLEVEL",2},
- {"VEHICLEDATA_FUELECONOMY",3},
- {"VEHICLEDATA_ENGINERPM",4},
- {"VEHICLEDATA_BATTVOLTS",5},
- {"VEHICLEDATA_RAINSENSOR",6},
- {"VEHICLEDATA_ODOMETER",7},
- {"VEHICLEDATA_VIN",8},
- {"VEHICLEDATA_EXTERNTEMP",9},
- {"VEHICLEDATA_PRNDLSTATUS",10},
- {"VEHICLEDATA_TIREPRESSURE",11},
- {"VEHICLEDATA_BATTERYPACKVOLTAGE",12},
- {"VEHICLEDATA_BATTERYCURRENT",13},
- {"VEHICLEDATA_BATTERYTEMPERATURE",14},
- {"VEHICLEDATA_SATESN",15}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp
deleted file mode 100644
index 0cf47f536..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp
+++ /dev/null
@@ -1,32 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VehicleDataType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-VEHICLEDATA_GPS,0
-VEHICLEDATA_SPEED,1
-VEHICLEDATA_FUELLEVEL,2
-VEHICLEDATA_FUELECONOMY,3
-VEHICLEDATA_ENGINERPM,4
-VEHICLEDATA_BATTVOLTS,5
-VEHICLEDATA_RAINSENSOR,6
-VEHICLEDATA_ODOMETER,7
-VEHICLEDATA_VIN,8
-VEHICLEDATA_EXTERNTEMP,9
-VEHICLEDATA_PRNDLSTATUS,10
-VEHICLEDATA_TIREPRESSURE,11
-VEHICLEDATA_BATTERYPACKVOLTAGE,12
-VEHICLEDATA_BATTERYCURRENT,13
-VEHICLEDATA_BATTERYTEMPERATURE,14
-VEHICLEDATA_SATESN,15
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h
deleted file mode 100644
index 440a77f8a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLEDATATYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLEDATATYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for VehicleDataType
-
- class VehicleDataTypeMarshaller
- {
- public:
-
- static std::string toName(const VehicleDataType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(VehicleDataType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=VehicleDataType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(VehicleDataType& e) { return e.mInternal!=VehicleDataType::INVALID_ENUM; }
- static bool checkIntegrityConst(const VehicleDataType& e) { return e.mInternal!=VehicleDataType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,VehicleDataType& e);
- static const std::string toString(const VehicleDataType& e);
-
- static bool fromJSON(const Json::Value& s,VehicleDataType& e);
- static Json::Value toJSON(const VehicleDataType& e);
-
- static const char* getName(VehicleDataType::VehicleDataTypeInternal e)
- {
- return (e>=0 && e<16) ? mHashTable[e].name : NULL;
- }
-
- static const VehicleDataType::VehicleDataTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[16];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc
deleted file mode 100644
index 57d12c7f2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp */
-/* Computed positions: -k'13,20' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 16
-#define MIN_WORD_LENGTH 15
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 15
-#define MAX_HASH_VALUE 36
-/* maximum key range = 22, duplicates = 0 */
-
-class VehicleDataType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-VehicleDataType_intHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 0, 0, 10, 37, 0,
- 10, 5, 37, 37, 37, 37, 37, 37, 0, 0,
- 5, 37, 5, 0, 0, 37, 0, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[19]];
- /*FALLTHROUGH*/
- case 19:
- case 18:
- case 17:
- case 16:
- case 15:
- case 14:
- case 13:
- hval += asso_values[(unsigned char)str[12]];
- break;
- }
- return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-VehicleDataType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 15, 0, 17, 18, 0, 15, 21, 22, 0, 24, 20, 21, 22,
- 23, 0, 30, 21, 0, 23, 0, 30, 26
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_VIN",8},
- {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_SPEED",1},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_SATESN",15},
- {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_GPS",0},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_BATTVOLTS",5},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_EXTERNTEMP",9},
- {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_TIREPRESSURE",11},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_ODOMETER",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_ENGINERPM",4},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_RAINSENSOR",6},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_PRNDLSTATUS",10},
- {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_BATTERYTEMPERATURE",14},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_FUELLEVEL",2},
- {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_FUELECONOMY",3},
- {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_BATTERYPACKVOLTAGE",12},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
- {"VEHICLEDATA_BATTERYCURRENT",13}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp
deleted file mode 100644
index b647881c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-#include "VehicleTypeMarshaller.h"
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-VehicleType& VehicleType::operator =(const VehicleType& c)
-{
- make=c.make ? new std::string(c.make[0]) : 0;
- model=c.model ? new std::string(c.model[0]) : 0;
- modelYear=c.modelYear ? new std::string(c.modelYear[0]) : 0;
- trim=c.trim ? new std::string(c.trim[0]) : 0;
-
- return *this;
-}
-
-
-VehicleType::~VehicleType(void)
-{
- if(make)
- delete make;
- if(model)
- delete model;
- if(modelYear)
- delete modelYear;
- if(trim)
- delete trim;
-}
-
-
-VehicleType::VehicleType(const VehicleType& c)
-{
- *this=c;
-}
-
-
-bool VehicleType::checkIntegrity(void)
-{
- return VehicleTypeMarshaller::checkIntegrity(*this);
-}
-
-
-VehicleType::VehicleType(void) :
- make(0),
- model(0),
- modelYear(0),
- trim(0)
-{
-}
-
-
-
-bool VehicleType::set_make(const std::string& make_)
-{
- if(make_.length()>500) return false;
- delete make;
- make=0;
-
- make=new std::string(make_);
- return true;
-}
-
-void VehicleType::reset_make(void)
-{
- if(make)
- delete make;
- make=0;
-}
-
-bool VehicleType::set_model(const std::string& model_)
-{
- if(model_.length()>500) return false;
- delete model;
- model=0;
-
- model=new std::string(model_);
- return true;
-}
-
-void VehicleType::reset_model(void)
-{
- if(model)
- delete model;
- model=0;
-}
-
-bool VehicleType::set_modelYear(const std::string& modelYear_)
-{
- if(modelYear_.length()>500) return false;
- delete modelYear;
- modelYear=0;
-
- modelYear=new std::string(modelYear_);
- return true;
-}
-
-void VehicleType::reset_modelYear(void)
-{
- if(modelYear)
- delete modelYear;
- modelYear=0;
-}
-
-bool VehicleType::set_trim(const std::string& trim_)
-{
- if(trim_.length()>500) return false;
- delete trim;
- trim=0;
-
- trim=new std::string(trim_);
- return true;
-}
-
-void VehicleType::reset_trim(void)
-{
- if(trim)
- delete trim;
- trim=0;
-}
-
-
-
-
-const std::string* VehicleType::get_make(void) const
-{
- return make;
-}
-
-
-const std::string* VehicleType::get_model(void) const
-{
- return model;
-}
-
-
-const std::string* VehicleType::get_modelYear(void) const
-{
- return modelYear;
-}
-
-
-const std::string* VehicleType::get_trim(void) const
-{
- return trim;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp
deleted file mode 100644
index af3067400..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-
-
-#include "VehicleTypeMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool VehicleTypeMarshaller::checkIntegrity(VehicleType& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool VehicleTypeMarshaller::fromString(const std::string& s,VehicleType& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string VehicleTypeMarshaller::toString(const VehicleType& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool VehicleTypeMarshaller::checkIntegrityConst(const VehicleType& s)
-{
- if(s.make && s.make->length()>500) return false;
- if(s.model && s.model->length()>500) return false;
- if(s.modelYear && s.modelYear->length()>500) return false;
- if(s.trim && s.trim->length()>500) return false;
- return true;
-}
-
-Json::Value VehicleTypeMarshaller::toJSON(const VehicleType& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- if(e.make)
- json["make"]=Json::Value(*e.make);
-
- if(e.model)
- json["model"]=Json::Value(*e.model);
-
- if(e.modelYear)
- json["modelYear"]=Json::Value(*e.modelYear);
-
- if(e.trim)
- json["trim"]=Json::Value(*e.trim);
-
-
- return json;
-}
-
-
-bool VehicleTypeMarshaller::fromJSON(const Json::Value& json,VehicleType& c)
-{
- if(c.make) delete c.make;
- c.make=0;
-
- if(c.model) delete c.model;
- c.model=0;
-
- if(c.modelYear) delete c.modelYear;
- c.modelYear=0;
-
- if(c.trim) delete c.trim;
- c.trim=0;
-
- try
- {
- if(!json.isObject()) return false;
-
- if(json.isMember("make"))
- {
- const Json::Value& j=json["make"];
- if(!j.isString()) return false;
- c.make=new std::string(j.asString());
- }
- if(json.isMember("model"))
- {
- const Json::Value& j=json["model"];
- if(!j.isString()) return false;
- c.model=new std::string(j.asString());
- }
- if(json.isMember("modelYear"))
- {
- const Json::Value& j=json["modelYear"];
- if(!j.isString()) return false;
- c.modelYear=new std::string(j.asString());
- }
- if(json.isMember("trim"))
- {
- const Json::Value& j=json["trim"];
- if(!j.isString()) return false;
- c.trim=new std::string(j.asString());
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h
deleted file mode 100644
index ea28ffe70..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct VehicleTypeMarshaller
- {
- static bool checkIntegrity(VehicleType& e);
- static bool checkIntegrityConst(const VehicleType& e);
-
- static bool fromString(const std::string& s,VehicleType& e);
- static const std::string toString(const VehicleType& e);
-
- static bool fromJSON(const Json::Value& s,VehicleType& e);
- static Json::Value toJSON(const VehicleType& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp
deleted file mode 100644
index f82ee2417..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h"
-#include "VrCapabilitiesMarshaller.h"
-#include "VrCapabilitiesMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const VrCapabilities::VrCapabilitiesInternal VrCapabilitiesMarshaller::getIndex(const char* s)
-{
- if(!s)
- return VrCapabilities::INVALID_ENUM;
- const struct PerfectHashTable* p=VrCapabilities_intHash::getPointer(s,strlen(s));
- return p ? static_cast<VrCapabilities::VrCapabilitiesInternal>(p->idx) : VrCapabilities::INVALID_ENUM;
-}
-
-
-bool VrCapabilitiesMarshaller::fromJSON(const Json::Value& s,VrCapabilities& e)
-{
- e.mInternal=VrCapabilities::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=VrCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value VrCapabilitiesMarshaller::toJSON(const VrCapabilities& e)
-{
- if(e.mInternal==VrCapabilities::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VrCapabilitiesMarshaller::fromString(const std::string& s,VrCapabilities& e)
-{
- e.mInternal=VrCapabilities::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string VrCapabilitiesMarshaller::toString(const VrCapabilities& e)
-{
- Json::FastWriter writer;
- return e.mInternal==VrCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VrCapabilitiesMarshaller::mHashTable[1]=
-{
- {"TEXT",0}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp
deleted file mode 100644
index c9afb3021..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,17 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VrCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-TEXT,0
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h
deleted file mode 100644
index 8dcc212c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VRCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VRCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for VrCapabilities
-
- class VrCapabilitiesMarshaller
- {
- public:
-
- static std::string toName(const VrCapabilities& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(VrCapabilities& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=VrCapabilities::INVALID_ENUM;
- }
-
- static bool checkIntegrity(VrCapabilities& e) { return e.mInternal!=VrCapabilities::INVALID_ENUM; }
- static bool checkIntegrityConst(const VrCapabilities& e) { return e.mInternal!=VrCapabilities::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,VrCapabilities& e);
- static const std::string toString(const VrCapabilities& e);
-
- static bool fromJSON(const Json::Value& s,VrCapabilities& e);
- static Json::Value toJSON(const VrCapabilities& e);
-
- static const char* getName(VrCapabilities::VrCapabilitiesInternal e)
- {
- return (e>=0 && e<1) ? mHashTable[e].name : NULL;
- }
-
- static const VrCapabilities::VrCapabilitiesInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[1];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc
deleted file mode 100644
index 1048563f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 1
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 4
-/* maximum key range = 1, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class VrCapabilities_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-VrCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-VrCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 4
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp"
- {"TEXT",0}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp
deleted file mode 100644
index a87dd3949..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-#include "VrHelpItemMarshaller.h"
-#include "ImageMarshaller.h"
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-VrHelpItem::VrHelpItem(const VrHelpItem& c)
-{
- *this=c;
-}
-
-
-bool VrHelpItem::checkIntegrity(void)
-{
- return VrHelpItemMarshaller::checkIntegrity(*this);
-}
-
-
-VrHelpItem::VrHelpItem(void)
-{
-}
-
-
-
-bool VrHelpItem::set_image(const Image& image_)
-{
- if(!ImageMarshaller::checkIntegrityConst(image_)) return false;
- image=image_;
- return true;
-}
-
-bool VrHelpItem::set_position(unsigned int position_)
-{
- if(position_>8) return false;
- if(position_<1) return false;
- position=position_;
- return true;
-}
-
-bool VrHelpItem::set_text(const std::string& text_)
-{
- if(text_.length()>500) return false;
- text=text_;
- return true;
-}
-
-
-
-
-const Image& VrHelpItem::get_image(void) const
-{
- return image;
-}
-
-
-unsigned int VrHelpItem::get_position(void) const
-{
- return position;
-}
-
-
-const std::string& VrHelpItem::get_text(void) const
-{
- return text;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp
deleted file mode 100644
index 23d010c6d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-#include "ImageMarshaller.h"
-
-#include "VrHelpItemMarshaller.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool VrHelpItemMarshaller::checkIntegrity(VrHelpItem& s)
-{
- return checkIntegrityConst(s);
-}
-
-
-bool VrHelpItemMarshaller::fromString(const std::string& s,VrHelpItem& e)
-{
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(!fromJSON(json,e)) return false;
- }
- catch(...)
- {
- return false;
- }
- return true;
-}
-
-
-const std::string VrHelpItemMarshaller::toString(const VrHelpItem& e)
-{
- Json::FastWriter writer;
- return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool VrHelpItemMarshaller::checkIntegrityConst(const VrHelpItem& s)
-{
- if(!ImageMarshaller::checkIntegrityConst(s.image)) return false;
- if(s.position>8) return false;
- if(s.position<1) return false;
- if(s.text.length()>500) return false;
- return true;
-}
-
-Json::Value VrHelpItemMarshaller::toJSON(const VrHelpItem& e)
-{
- Json::Value json(Json::objectValue);
- if(!checkIntegrityConst(e))
- return Json::Value(Json::nullValue);
-
- json["image"]=ImageMarshaller::toJSON(e.image);
-
- json["position"]=Json::Value(e.position);
-
- json["text"]=Json::Value(e.text);
-
-
- return json;
-}
-
-
-bool VrHelpItemMarshaller::fromJSON(const Json::Value& json,VrHelpItem& c)
-{
- try
- {
- if(!json.isObject()) return false;
-
- if(!json.isMember("image")) return false;
- {
- const Json::Value& j=json["image"];
- if(!ImageMarshaller::fromJSON(j,c.image))
- return false;
- }
- if(!json.isMember("position")) return false;
- {
- const Json::Value& j=json["position"];
- if(!j.isInt()) return false;
- c.position=j.asInt();
- }
- if(!json.isMember("text")) return false;
- {
- const Json::Value& j=json["text"];
- if(!j.isString()) return false;
- c.text=j.asString();
- }
-
- }
- catch(...)
- {
- return false;
- }
- return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h
deleted file mode 100644
index c426beb5f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VRHELPITEMMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VRHELPITEMMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
- struct VrHelpItemMarshaller
- {
- static bool checkIntegrity(VrHelpItem& e);
- static bool checkIntegrityConst(const VrHelpItem& e);
-
- static bool fromString(const std::string& s,VrHelpItem& e);
- static const std::string toString(const VrHelpItem& e);
-
- static bool fromJSON(const Json::Value& s,VrHelpItem& e);
- static Json::Value toJSON(const VrHelpItem& e);
- };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp
deleted file mode 100644
index 1dc2a7506..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/messageType.h"
-#include "messageTypeMarshaller.h"
-#include "messageTypeMarshaller.inc"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const messageType::messageTypeInternal messageTypeMarshaller::getIndex(const char* s)
-{
- if(!s)
- return messageType::INVALID_ENUM;
- const struct PerfectHashTable* p=messageType_intHash::getPointer(s,strlen(s));
- return p ? static_cast<messageType::messageTypeInternal>(p->idx) : messageType::INVALID_ENUM;
-}
-
-
-bool messageTypeMarshaller::fromJSON(const Json::Value& s,messageType& e)
-{
- e.mInternal=messageType::INVALID_ENUM;
- if(!s.isString())
- return false;
-
- e.mInternal=getIndex(s.asString().c_str());
- return (e.mInternal!=messageType::INVALID_ENUM);
-}
-
-
-Json::Value messageTypeMarshaller::toJSON(const messageType& e)
-{
- if(e.mInternal==messageType::INVALID_ENUM)
- return Json::Value(Json::nullValue);
- const char* s=getName(e.mInternal);
- return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool messageTypeMarshaller::fromString(const std::string& s,messageType& e)
-{
- e.mInternal=messageType::INVALID_ENUM;
- try
- {
- Json::Reader reader;
- Json::Value json;
- if(!reader.parse(s,json,false)) return false;
- if(fromJSON(json,e)) return true;
- }
- catch(...)
- {
- return false;
- }
- return false;
-}
-
-const std::string messageTypeMarshaller::toString(const messageType& e)
-{
- Json::FastWriter writer;
- return e.mInternal==messageType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable messageTypeMarshaller::mHashTable[3]=
-{
- {"request",0},
- {"response",1},
- {"notification",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp
deleted file mode 100644
index b5c842d92..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name messageType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
- const char *name;
- unsigned int idx;
-};
-
-%%
-request,0
-response,1
-notification,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h
deleted file mode 100644
index d74b9bd0d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_MESSAGETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_MESSAGETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/messageType.h"
-
-
-/*
- interface Ford Sync RAPI
- version 2.0O
- date 2012-11-02
- generated at Thu Jan 24 06:36:23 2013
- source stamp Thu Jan 24 06:35:41 2013
- author RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for messageType
-
- class messageTypeMarshaller
- {
- public:
-
- static std::string toName(const messageType& e) { return getName(e.mInternal) ?: ""; }
-
- static bool fromName(messageType& e,const std::string& s)
- {
- return (e.mInternal=getIndex(s.c_str()))!=messageType::INVALID_ENUM;
- }
-
- static bool checkIntegrity(messageType& e) { return e.mInternal!=messageType::INVALID_ENUM; }
- static bool checkIntegrityConst(const messageType& e) { return e.mInternal!=messageType::INVALID_ENUM; }
-
- static bool fromString(const std::string& s,messageType& e);
- static const std::string toString(const messageType& e);
-
- static bool fromJSON(const Json::Value& s,messageType& e);
- static Json::Value toJSON(const messageType& e);
-
- static const char* getName(messageType::messageTypeInternal e)
- {
- return (e>=0 && e<3) ? mHashTable[e].name : NULL;
- }
-
- static const messageType::messageTypeInternal getIndex(const char* s);
-
- static const PerfectHashTable mHashTable[3];
- };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc
deleted file mode 100644
index a4f943916..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 12
-/* maximum key range = 6, duplicates = 0 */
-
-class messageType_intHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-messageType_intHash::hash (register const char *str, register unsigned int len)
-{
- return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-messageType_intHash::getPointer (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 12
- };
- static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp"
- {"request",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp"
- {"response",1},
- {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp"
- {"notification",2}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}