diff options
author | agaliuzov <agaliuzov@luxoft.com> | 2016-04-12 14:35:32 +0300 |
---|---|---|
committer | agaliuzov <agaliuzov@luxoft.com> | 2016-04-12 16:12:38 +0300 |
commit | ead57194e3ce5ffca73dbe24f14ccc3b998296fa (patch) | |
tree | 5eddbe4c7430ceb70b781c2caf09ef5cefb0c188 | |
parent | 667595d80cf9c49babdd66a0285e2648884728b5 (diff) | |
download | sdl_core-ead57194e3ce5ffca73dbe24f14ccc3b998296fa.tar.gz |
Make the string used for keys extern
Did this stuff in order to prevent the case when we have a lot of string
definition in different translation units.
Now we have only cpp file which contain all definition. Thus we avoid
multiple definition
3 files changed, 757 insertions, 357 deletions
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h index 0aaf21a8f5..ec725f05aa 100644 --- a/src/components/application_manager/include/application_manager/smart_object_keys.h +++ b/src/components/application_manager/include/application_manager/smart_object_keys.h @@ -37,398 +37,396 @@ namespace application_manager { namespace strings { -const char params[] = "params"; -const char message_type[] = "message_type"; -const char correlation_id[] = "correlation_id"; -const char function_id[] = "function_id"; -const char protocol_version[] = "protocol_version"; -const char protocol_type[] = "protocol_type"; -const char connection_key[] = "connection_key"; -const char error[] = "error"; -const char error_msg[] = "message"; -const char default_app_id[] = "default"; -const char msg_params[] = "msg_params"; -const char method_name[] = "methodName"; -const char info[] = "info"; -const char app_id[] = "appID"; -const char hmi_app_id[] = "hmiAppID"; -const char device_id[] = "deviceID"; -const char url[] = "url"; -const char urlScheme[] = "urlScheme"; -const char packageName[] = "packageName"; -const char cmd_icon[] = "cmdIcon"; -const char result_code[] = "resultCode"; -const char success[] = "success"; -const char sync_msg_version[] = "syncMsgVersion"; -const char major_version[] = "majorVersion"; -const char minor_version[] = "minorVersion"; -const char app_name[] = "appName"; -const char ngn_media_screen_app_name[] = "ngnMediaScreenAppName"; -const char vr_synonyms[] = "vrSynonyms"; -const char uses_vehicle_data[] = "usesVehicleData"; -const char is_media_application[] = "isMediaApplication"; -const char greyOut[] = "greyOut"; -const char language_desired[] = "languageDesired"; -const char auto_activated_id[] = "autoActivateID"; -const char app_type[] = "appType"; -const char app_hmi_type[] = "appHMIType"; -const char tts_name[] = "ttsName"; -const char binary_data[] = "binary_data"; -const char timeout_prompt[] = "timeoutPrompt"; -const char timeout[] = "timeout"; -const char vr_help_title[] = "vrHelpTitle"; -const char vr_help[] = "vrHelp"; -const char main_field_1[] = "mainField1"; -const char main_field_2[] = "mainField2"; -const char main_field_3[] = "mainField3"; -const char main_field_4[] = "mainField4"; -const char eta[] = "eta"; -const char time_to_destination[] = "timeToDestination"; -const char total_distance[] = "totalDistance"; -const char alignment[] = "alignment"; -const char graphic[] = "graphic"; -const char secondary_graphic[] = "secondaryGraphic"; -const char status_bar[] = "statusBar"; -const char media_clock[] = "mediaClock"; -const char media_track[] = "mediaTrack"; -const char properties[] = "properties"; -const char cmd_id[] = "cmdID"; -const char menu_params[] = "menuParams"; -const char menu_title[] = "menuTitle"; -const char menu_icon[] = "menuIcon"; -const char keyboard_properties[] = "keyboardProperties"; -const char vr_commands[] = "vrCommands"; -const char position[] = "position"; -const char num_ticks[] = "numTicks"; -const char slider_footer[] = "sliderFooter"; -const char menu_id[] = "menuID"; -const char menu_name[] = "menuName"; -const char interaction_choice_set_id[] = "interactionChoiceSetID"; -const char interaction_choice_set_id_list[] = "interactionChoiceSetIDList"; -const char choice_set[] = "choiceSet"; -const char choice_id[] = "choiceID"; -const char grammar_id[] = "grammarID"; -const char navigation_text_1[] = "navigationText1"; -const char navigation_text_2[] = "navigationText2"; -const char alert_text1[] = "alertText1"; -const char alert_text2[] = "alertText2"; -const char alert_text3[] = "alertText3"; -const char tts_chunks[] = "ttsChunks"; -const char initial_prompt[] = "initialPrompt"; -const char initial_text[] = "initialText"; -const char duration[] = "duration"; -const char progress_indicator[] = "progressIndicator"; -const char alert_type[] = "alertType"; -const char play_tone[] = "playTone"; -const char soft_buttons[] = "softButtons"; -const char soft_button_id[] = "softButtonID"; -const char custom_presets[] = "customPresets"; -const char audio_pass_display_text1[] = "audioPassThruDisplayText1"; -const char audio_pass_display_text2[] = "audioPassThruDisplayText2"; -const char max_duration[] = "maxDuration"; -const char sampling_rate[] = "samplingRate"; -const char bits_per_sample[] = "bitsPerSample"; -const char audio_type[] = "audioType"; -const char mute_audio[] = "muteAudio"; -const char button_name[] = "buttonName"; -const char button_event_mode[] = "buttonEventMode"; -const char button_press_mode[] = "buttonPressMode"; -const char custom_button_id[] = "customButtonID"; -const char data_type[] = "dataType"; -const char turn_list[] = "turnList"; -const char turn_icon[] = "turnIcon"; -const char next_turn_icon[] = "nextTurnIcon"; -const char value[] = "value"; -const char hmi_display_language[] = "hmiDisplayLanguage"; -const char language[] = "language"; -const char data[] = "data"; -const char start_time[] = "startTime"; -const char end_time[] = "endTime"; -const char hours[] = "hours"; -const char minutes[] = "minutes"; -const char seconds [] = "seconds"; -const char update_mode[] = "updateMode"; -const char trigger_source[] = "triggerSource"; -const char hmi_level[] = "hmiLevel"; -const char activate_app_hmi_level[] = "level"; -const char audio_streaming_state[] = "audioStreamingState"; -const char system_context[] = "systemContext"; -const char speech_capabilities[] = "speechCapabilities"; -const char vr_capabilities[] = "vrCapabilities"; -const char audio_pass_thru_capabilities[] = "audioPassThruCapabilities"; +extern const char* params; +extern const char* message_type; +extern const char* correlation_id; +extern const char* function_id; +extern const char* protocol_version; +extern const char* protocol_type; +extern const char* connection_key; +extern const char* error; +extern const char* error_msg; +extern const char* default_app_id; +extern const char* msg_params; +extern const char* method_name; +extern const char* info; +extern const char* app_id; +extern const char* hmi_app_id; +extern const char* device_id; +extern const char* url; +extern const char* urlScheme; +extern const char* packageName; +extern const char* cmd_icon; +extern const char* result_code; +extern const char* success; +extern const char* sync_msg_version; +extern const char* major_version; +extern const char* minor_version; +extern const char* app_name; +extern const char* ngn_media_screen_app_name; +extern const char* vr_synonyms; +extern const char* uses_vehicle_data; +extern const char* is_media_application; +extern const char* greyOut; +extern const char* language_desired; +extern const char* auto_activated_id; +extern const char* app_type; +extern const char* app_hmi_type; +extern const char* tts_name; +extern const char* binary_data; +extern const char* timeout_prompt; +extern const char* timeout; +extern const char* vr_help_title; +extern const char* vr_help; +extern const char* main_field_1; +extern const char* main_field_2; +extern const char* main_field_3; +extern const char* main_field_4; +extern const char* eta; +extern const char* time_to_destination; +extern const char* total_distance; +extern const char* alignment; +extern const char* graphic; +extern const char* secondary_graphic; +extern const char* status_bar; +extern const char* media_clock; +extern const char* media_track; +extern const char* properties; +extern const char* cmd_id; +extern const char* menu_params; +extern const char* menu_title; +extern const char* menu_icon; +extern const char* keyboard_properties; +extern const char* vr_commands; +extern const char* position; +extern const char* num_ticks; +extern const char* slider_footer; +extern const char* menu_id; +extern const char* menu_name; +extern const char* interaction_choice_set_id; +extern const char* interaction_choice_set_id_list; +extern const char* choice_set; +extern const char* choice_id; +extern const char* grammar_id; +extern const char* navigation_text_1; +extern const char* navigation_text_2; +extern const char* alert_text1; +extern const char* alert_text2; +extern const char* alert_text3; +extern const char* tts_chunks; +extern const char* initial_prompt; +extern const char* initial_text; +extern const char* duration; +extern const char* progress_indicator; +extern const char* alert_type; +extern const char* play_tone; +extern const char* soft_buttons; +extern const char* soft_button_id; +extern const char* custom_presets; +extern const char* audio_pass_display_text1; +extern const char* audio_pass_display_text2; +extern const char* max_duration; +extern const char* sampling_rate; +extern const char* bits_per_sample; +extern const char* audio_type; +extern const char* mute_audio; +extern const char* button_name; +extern const char* button_event_mode; +extern const char* button_press_mode; +extern const char* custom_button_id; +extern const char* data_type; +extern const char* turn_list; +extern const char* turn_icon; +extern const char* next_turn_icon; +extern const char* value; +extern const char* hmi_display_language; +extern const char* language; +extern const char* data; +extern const char* start_time; +extern const char* end_time; +extern const char* hours; +extern const char* minutes; +extern const char* seconds ; +extern const char* update_mode; +extern const char* trigger_source; +extern const char* hmi_level; +extern const char* activate_app_hmi_level; +extern const char* audio_streaming_state; +extern const char* system_context; +extern const char* speech_capabilities; +extern const char* vr_capabilities; +extern const char* audio_pass_thru_capabilities; // PutFile -const char sync_file_name[] = "syncFileName"; -const char file_name[] = "fileName"; -const char file_type[] = "fileType"; -const char file_size[] = "fileSize"; -const char request_type[] = "requestType"; -const char persistent_file[] = "persistentFile"; -const char file_data[] = "fileData"; -const char space_available[] = "spaceAvailable"; -const char image_type[] = "imageType"; -const char image[] = "image"; -const char type[] = "type"; -const char system_file[] = "systemFile"; -const char offset[] = "offset"; -const char length[] = "length"; -const char secondary_image[] = "secondaryImage"; -const char filenames[] = "filenames"; +extern const char* sync_file_name; +extern const char* file_name; +extern const char* file_type; +extern const char* file_size; +extern const char* request_type; +extern const char* persistent_file; +extern const char* file_data; +extern const char* space_available; +extern const char* image_type; +extern const char* image; +extern const char* type; +extern const char* system_file; +extern const char* offset; +extern const char* length; +extern const char* secondary_image; +extern const char* filenames; -const char hmi_display_language_desired[] = "hmiDisplayLanguageDesired"; -const char ecu_name[] = "ecuName"; -const char dtc_mask[] = "dtcMask"; -const char did_location[] = "didLocation"; -const char app_list[] = "appList"; -const char device_list[] = "deviceList"; -const char device_info[] = "deviceInfo"; -const char name[] = "name"; -const char id[] = "id"; -const char isSDLAllowed[] = "isSDLAllowed"; -const char transport_type[] = "transportType"; -const char application[] = "application"; -const char applications[] = "applications"; -const char icon[] = "icon"; -const char device_name[] = "deviceName"; -const char reason[] = "reason"; -const char available[] = "available"; -const char text[] = "text"; -const char character_set[] = "characterSet"; -const char secondary_text[] = "secondaryText"; -const char tertiary_text[] = "tertiaryText"; -const char hardware[] = "hardware"; -const char firmware_rev[] = "firmwareRev"; -const char os[] = "os"; -const char os_version[] = "osVersion"; -const char carrier[] = "carrier"; -const char slider_header[] = "sliderHeader"; -const char key_press_mode[] = "keypressMode"; +extern const char* hmi_display_language_desired; +extern const char* ecu_name; +extern const char* dtc_mask; +extern const char* did_location; +extern const char* app_list; +extern const char* device_list; +extern const char* device_info; +extern const char* name; +extern const char* id; +extern const char* isSDLAllowed; +extern const char* transport_type; +extern const char* application; +extern const char* applications; +extern const char* icon; +extern const char* device_name; +extern const char* reason; +extern const char* available; +extern const char* text; +extern const char* character_set; +extern const char* secondary_text; +extern const char* tertiary_text; +extern const char* hardware; +extern const char* firmware_rev; +extern const char* os; +extern const char* os_version; +extern const char* carrier; +extern const char* slider_header; +extern const char* key_press_mode; // duplicate names from hmi_request -const char limited_character_list[] = "limitedCharacterList"; -const char auto_complete_text[] = "autoCompleteText"; -const char navigation_text[] = "navigationText"; +extern const char* limited_character_list; +extern const char* auto_complete_text; +extern const char* navigation_text; // vehicle info -const char gps[] = "gps"; -const char speed[] = "speed"; -const char rpm[] = "rpm"; -const char fuel_level[] = "fuelLevel"; -const char fuel_level_state[] = "fuelLevel_State"; -const char instant_fuel_consumption[] = "instantFuelConsumption"; -const char external_temp[] = "externalTemperature"; -const char vin[] = "vin"; -const char prndl[] = "prndl"; -const char tire_pressure[] = "tirePressure"; -const char odometer[] = "odometer"; -const char belt_status[] = "beltStatus"; -const char body_information[] = "bodyInformation"; -const char device_status[] = "deviceStatus"; -const char driver_braking[] = "driverBraking"; -const char wiper_status[] = "wiperStatus"; -const char head_lamp_status[] = "headLampStatus"; -const char engine_torque[] = "engineTorque"; -const char acc_pedal_pos[] = "accPedalPosition"; -const char steering_wheel_angle[] = "steeringWheelAngle"; -const char e_call_info[] = "eCallInfo"; -const char airbag_status[] = "airbagStatus"; -const char emergency_event[] = "emergencyEvent"; -const char cluster_mode_status[] = "clusterModeStatus"; -const char my_key[] = "myKey"; -const char help_prompt[] = "helpPrompt"; -const char scroll_message_body[] = "scrollableMessageBody"; -const char data_result[] = "dataResult"; -const char dtc_list[] = "dtcList"; -const char interaction_mode[] = "interactionMode"; -const char slider_position[] = "sliderPosition"; -const char system_action[] = "systemAction"; -const char prerecorded_speech[] = "prerecordedSpeech"; -const char supported_diag_modes[] = "supportedDiagModes"; -const char hmi_capabilities[] = "hmiCapabilities"; -const char navigation[] = "navigation"; -const char phone_call[] = "phoneCall"; -const char sdl_version[] = "sdlVersion"; -const char system_software_version[] = "systemSoftwareVersion"; -const char priority[] = "priority"; +extern const char* gps; +extern const char* speed; +extern const char* rpm; +extern const char* fuel_level; +extern const char* fuel_level_state; +extern const char* instant_fuel_consumption; +extern const char* external_temp; +extern const char* vin; +extern const char* prndl; +extern const char* tire_pressure; +extern const char* odometer; +extern const char* belt_status; +extern const char* body_information; +extern const char* device_status; +extern const char* driver_braking; +extern const char* wiper_status; +extern const char* head_lamp_status; +extern const char* engine_torque; +extern const char* acc_pedal_pos; +extern const char* steering_wheel_angle; +extern const char* e_call_info; +extern const char* airbag_status; +extern const char* emergency_event; +extern const char* cluster_mode_status; +extern const char* my_key; +extern const char* help_prompt; +extern const char* scroll_message_body; +extern const char* data_result; +extern const char* dtc_list; +extern const char* interaction_mode; +extern const char* slider_position; +extern const char* system_action; +extern const char* prerecorded_speech; +extern const char* supported_diag_modes; +extern const char* hmi_capabilities; +extern const char* navigation; +extern const char* phone_call; +extern const char* sdl_version; +extern const char* system_software_version; +extern const char* priority; //resuming -const char application_commands[] = "applicationCommands"; -const char application_submenus[] = "applicationSubMenus"; -const char application_choice_sets[] = "applicationChoiceSets"; -const char application_global_properties[] = "globalProperties"; -const char application_vehicle_info[] = "vehicleInfo"; -const char application_buttons[] = "buttons"; -const char application_subscribtions[] = "subscribtions"; -const char application_files[] = "applicationFiles"; -const char application_show[] = "applicationShow"; -const char resumption[] = "resumption"; -const char resume_app_list[] = "resume_app_list"; -const char last_ign_off_time[] = "last_ign_off_time"; +extern const char* application_commands; +extern const char* application_submenus; +extern const char* application_choice_sets; +extern const char* application_global_properties; +extern const char* application_vehicle_info; +extern const char* application_buttons; +extern const char* application_subscribtions; +extern const char* application_files; +extern const char* application_show; +extern const char* resumption; +extern const char* resume_app_list; +extern const char* last_ign_off_time; -const char resume_vr_grammars[] = "resumeVrGrammars"; +extern const char* resume_vr_grammars; -const char ign_off_count[] = "ign_off_count"; -const char suspend_count[] = "suspend_count"; +extern const char* ign_off_count; +extern const char* suspend_count; -const char connection_info[] = "connection_info"; -const char is_download_complete[] = "is_download_complete"; +extern const char* connection_info; +extern const char* is_download_complete; -const char hash_id[] = "hashID"; -const char time_stamp[] = "timeStamp"; -const char manual_text_entry[] = "manualTextEntry"; -const char image_type_supported[] = "imageTypeSupported"; -const char unexpected_disconnect[] = "unexpectedDisconnect"; +extern const char* longitude_degrees; +extern const char* latitude_degrees; +extern const char* address; +extern const char* country_name; +extern const char* country_code; +extern const char* postal_code; +extern const char* administrative_area; +extern const char* locality; +extern const char* sub_locality; +extern const char* thoroughfare; +extern const char* sub_thoroughfare; -const char longitude_degrees[] = "longitudeDegrees"; -const char latitude_degrees[] = "latitudeDegrees"; -const char location_name[] = "locationName"; -const char location_description[] = "locationDescription"; -const char address_lines[] = "addressLines"; -const char phone_number[] = "phoneNumber"; -const char number[] = "number"; -const char location_image[] = "locationImage"; -const char address[] = "address"; -const char country_name[] = "countryName"; -const char country_code[] = "countryCode"; -const char postal_code[] = "postalCode"; -const char administrative_area[] = "administrativeArea"; -const char locality[] = "locality"; -const char sub_locality[] = "subLocality"; -const char thoroughfare[] = "thoroughfare"; -const char sub_thoroughfare[] = "subThoroughfare"; - - -const char is_suscribed[] = "isSubscribed"; -const char message_data[] = "messageData"; +extern const char* hash_id; +extern const char* time_stamp; +extern const char* manual_text_entry; +extern const char* image_type_supported; +extern const char* unexpected_disconnect; +extern const char* location_name; +extern const char* location_description; +extern const char* address_lines; +extern const char* phone_number; +extern const char* number; +extern const char* location_image; +extern const char* is_suscribed; +extern const char* message_data; } // namespace strings namespace json { -const char appId[] = "appId"; -const char name[] = "name"; -const char ios[] = "ios"; -const char android[] = "android"; -const char appHmiType[] = "appHmiType"; -const char urlScheme[] = "urlScheme"; -const char packageName[] = "packageName"; -const char response[] = "response"; -const char is_media_application[] = "isMediaApplication"; -const char default_[] = "default"; -const char languages[] = "languages"; -const char ttsName[] = "ttsName"; -const char vrSynonyms[] = "vrSynonyms"; +extern const char* appId; +extern const char* name; +extern const char* ios; +extern const char* android; +extern const char* appHmiType; +extern const char* urlScheme; +extern const char* packageName; +extern const char* response; +extern const char* is_media_application; +extern const char* default_; +extern const char* languages; +extern const char* ttsName; +extern const char* vrSynonyms; } // namespace json namespace http_request { -const char httpRequest[] = "HTTPRequest"; -const char headers[] = "headers"; -const char content_type[] = "ContentType"; -const char connect_timeout[] = "ConnectTimout"; -const char do_output[] = "DoOutput"; -const char do_input[] = "DoInput"; -const char use_caches[] = "UseCaches"; -const char request_method[] = "RequestMethod"; -const char read_timeout[] = "ReadTimeout"; -const char instance_follow_redirect[] = "InstanceFollowRedirect"; -const char charset[] = "charset"; -const char content_lenght[] = "Content_Lenght"; -const char GET[] = "GET"; +extern const char* httpRequest; +extern const char* headers; +extern const char* content_type; +extern const char* connect_timeout; +extern const char* do_output; +extern const char* do_input; +extern const char* use_caches; +extern const char* request_method; +extern const char* read_timeout; +extern const char* instance_follow_redirect; +extern const char* charset; +extern const char* content_lenght; +extern const char* GET; } // http_request namespace mobile_notification { -const char state[] = "state"; -const char syncp_timeout[] = "Timeout"; -const char syncp_url[] = "URL"; +extern const char* state; +extern const char* syncp_timeout; +extern const char* syncp_url; } // namespace mobile_notification namespace hmi_levels { -const char kFull[] = "FULL"; -const char kLimited[] = "LIMITED"; -const char kBackground[] = "BACKGROUND"; -const char kNone[] = "NONE"; +extern const char* kFull; +extern const char* kLimited; +extern const char* kBackground; +extern const char* kNone; } namespace hmi_request { -const char parent_id[] = "parentID"; -const char field_name[] = "fieldName"; -const char field_text[] = "fieldText"; -const char alert_strings[] = "alertStrings"; -const char duration[] = "duration"; -const char soft_buttons[] = "softButtons"; -const char tts_chunks[] = "ttsChunks"; -const char speak_type[] = "speakType"; -const char audio_pass_display_texts[] = "audioPassThruDisplayTexts"; -const char max_duration[] = "maxDuration"; -const char reason[] = "reason"; -const char message_text[] = "messageText"; -const char initial_text[] = "initialText"; -const char navi_texts[] = "navigationTexts"; -const char navi_text[] = "navigationText"; -const char show_strings[] = "showStrings"; -const char interaction_layout[] = "interactionLayout"; -const char menu_title[] = "menuTitle"; -const char menu_icon[] = "menuIcon"; -const char keyboard_properties[] = "keyboardProperties"; -const char method_name[] = "methodName"; -const char keyboard_layout[] = "keyboardLayout"; -const char limited_character_list[] = "limitedCharacterList"; -const char auto_complete_text[] = "autoCompleteText"; -const char file[] = "file"; -const char retry[] = "retry"; -const char service[] = "service"; +extern const char* parent_id; +extern const char* field_name; +extern const char* field_text; +extern const char* alert_strings; +extern const char* duration; +extern const char* soft_buttons; +extern const char* tts_chunks; +extern const char* speak_type; +extern const char* audio_pass_display_texts; +extern const char* max_duration; +extern const char* reason; +extern const char* message_text; +extern const char* initial_text; +extern const char* navi_texts; +extern const char* navi_text; +extern const char* show_strings; +extern const char* interaction_layout; +extern const char* menu_title; +extern const char* menu_icon; +extern const char* keyboard_properties; +extern const char* method_name; +extern const char* keyboard_layout; +extern const char* limited_character_list; +extern const char* auto_complete_text; +extern const char* file; +extern const char* retry; +extern const char* service; } // namespace hmi_request namespace hmi_response { -const char code[] = "code"; -const char message[] = "message"; -const char method[] = "method"; -const char try_again_time[] = "tryAgainTime"; -const char custom_button_id[] = "customButtonID"; -const char button_name[] = "name"; -const char button_mode[] = "mode"; -const char attenuated_supported[] = "attenuatedSupported"; -const char languages[] = "languages"; -const char language[] = "language"; -const char display_capabilities[] = "displayCapabilities"; -const char hmi_zone_capabilities[] = "hmiZoneCapabilities"; -const char soft_button_capabilities[] = "softButtonCapabilities"; -const char image_supported[] = "imageSupported"; -const char button_capabilities[] = "buttonCapabilities"; -const char capabilities[] = "capabilities"; -const char speech_capabilities[] = "speechCapabilities"; -const char prerecorded_speech_capabilities[] = "prerecordedSpeechCapabilities"; -const char preset_bank_capabilities[] = "presetBankCapabilities"; -const char allowed[] = "allowed"; -const char vehicle_type[] = "vehicleType"; -const char did_result[] = "didResult"; -const char result_code[] = "resultCode"; -const char dtc[] = "dtc"; -const char ecu_header[] = "ecuHeader"; -const char image_capabilities[] = "imageCapabilities"; -const char display_type[] = "displayType"; -const char text_fields[] = "textFields"; -const char media_clock_formats[] = "mediaClockFormats"; -const char graphic_supported[] = "graphicSupported"; -const char image_fields[] = "imageFields"; -const char templates_available[] = "templatesAvailable"; -const char screen_params[] = "screenParams"; -const char num_custom_presets_available[] = "numCustomPresetsAvailable"; -const char urls[] = "urls"; -const char policy_app_id[] = "policyAppID"; -const char enabled[] = "enabled"; +extern const char* code; +extern const char* message; +extern const char* method; +extern const char* try_again_time; +extern const char* custom_button_id; +extern const char* button_name; +extern const char* button_mode; +extern const char* attenuated_supported; +extern const char* languages; +extern const char* language; +extern const char* display_capabilities; +extern const char* hmi_zone_capabilities; +extern const char* soft_button_capabilities; +extern const char* image_supported; +extern const char* button_capabilities; +extern const char* capabilities; +extern const char* speech_capabilities; +extern const char* prerecorded_speech_capabilities; +extern const char* preset_bank_capabilities; +extern const char* allowed; +extern const char* vehicle_type; +extern const char* did_result; +extern const char* result_code; +extern const char* dtc; +extern const char* ecu_header; +extern const char* image_capabilities; +extern const char* display_type; +extern const char* text_fields; +extern const char* media_clock_formats; +extern const char* graphic_supported; +extern const char* image_fields; +extern const char* templates_available; +extern const char* screen_params; +extern const char* num_custom_presets_available; +extern const char* urls; +extern const char* policy_app_id; +extern const char* enabled; } // namespace hmi_response namespace hmi_notification { -const char prndl[] = "prndl"; -const char file_name[] = "file_name"; -const char system_context[] = "systemContext"; -const char state[] = "state"; -const char result[] = "result"; -const char statistic_type[] = "statisticType"; -const char error[] = "error"; -const char policyfile[] = "policyfile"; -const char is_active[] = "isActive"; -const char is_deactivated[] = "isDeactivated"; -const char event_name[] = "eventName"; +extern const char* prndl; +extern const char* file_name; +extern const char* system_context; +extern const char* state; +extern const char* result; +extern const char* statistic_type; +extern const char* error; +extern const char* policyfile; +extern const char* is_active; +extern const char* is_deactivated; +extern const char* event_name; } // namespace hmi_notification diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc new file mode 100644 index 0000000000..2ab41a50b8 --- /dev/null +++ b/src/components/application_manager/src/smart_object_keys.cc @@ -0,0 +1,401 @@ +#include <application_manager/smart_object_keys.h> + +namespace application_manager { + +namespace strings { + +const char* params = "params"; +const char* message_type = "message_type"; +const char* correlation_id = "correlation_id"; +const char* function_id = "function_id"; +const char* protocol_version = "protocol_version"; +const char* protocol_type = "protocol_type"; +const char* connection_key = "connection_key"; +const char* error = "error"; +const char* error_msg = "message"; +const char* default_app_id = "default"; +const char* msg_params = "msg_params"; +const char* method_name = "methodName"; +const char* info = "info"; +const char* app_id = "appID"; +const char* hmi_app_id = "hmiAppID"; +const char* device_id = "deviceID"; +const char* url = "url"; +const char* urlScheme = "urlScheme"; +const char* packageName = "packageName"; +const char* cmd_icon = "cmdIcon"; +const char* result_code = "resultCode"; +const char* success = "success"; +const char* sync_msg_version = "syncMsgVersion"; +const char* major_version = "majorVersion"; +const char* minor_version = "minorVersion"; +const char* app_name = "appName"; +const char* ngn_media_screen_app_name = "ngnMediaScreenAppName"; +const char* vr_synonyms = "vrSynonyms"; +const char* uses_vehicle_data = "usesVehicleData"; +const char* is_media_application = "isMediaApplication"; +const char* greyOut = "greyOut"; +const char* language_desired = "languageDesired"; +const char* auto_activated_id = "autoActivateID"; +const char* app_type = "appType"; +const char* app_hmi_type = "appHMIType"; +const char* tts_name = "ttsName"; +const char* binary_data = "binary_data"; +const char* timeout_prompt = "timeoutPrompt"; +const char* timeout = "timeout"; +const char* vr_help_title = "vrHelpTitle"; +const char* vr_help = "vrHelp"; +const char* main_field_1 = "mainField1"; +const char* main_field_2 = "mainField2"; +const char* main_field_3 = "mainField3"; +const char* main_field_4 = "mainField4"; +const char* eta = "eta"; +const char* time_to_destination = "timeToDestination"; +const char* total_distance = "totalDistance"; +const char* alignment = "alignment"; +const char* graphic = "graphic"; +const char* secondary_graphic = "secondaryGraphic"; +const char* status_bar = "statusBar"; +const char* media_clock = "mediaClock"; +const char* media_track = "mediaTrack"; +const char* properties = "properties"; +const char* cmd_id = "cmdID"; +const char* menu_params = "menuParams"; +const char* menu_title = "menuTitle"; +const char* menu_icon = "menuIcon"; +const char* keyboard_properties = "keyboardProperties"; +const char* vr_commands = "vrCommands"; +const char* position = "position"; +const char* num_ticks = "numTicks"; +const char* slider_footer = "sliderFooter"; +const char* menu_id = "menuID"; +const char* menu_name = "menuName"; +const char* interaction_choice_set_id = "interactionChoiceSetID"; +const char* interaction_choice_set_id_list = "interactionChoiceSetIDList"; +const char* choice_set = "choiceSet"; +const char* choice_id = "choiceID"; +const char* grammar_id = "grammarID"; +const char* navigation_text_1 = "navigationText1"; +const char* navigation_text_2 = "navigationText2"; +const char* alert_text1 = "alertText1"; +const char* alert_text2 = "alertText2"; +const char* alert_text3 = "alertText3"; +const char* tts_chunks = "ttsChunks"; +const char* initial_prompt = "initialPrompt"; +const char* initial_text = "initialText"; +const char* duration = "duration"; +const char* progress_indicator = "progressIndicator"; +const char* alert_type = "alertType"; +const char* play_tone = "playTone"; +const char* soft_buttons = "softButtons"; +const char* soft_button_id = "softButtonID"; +const char* custom_presets = "customPresets"; +const char* audio_pass_display_text1 = "audioPassThruDisplayText1"; +const char* audio_pass_display_text2 = "audioPassThruDisplayText2"; +const char* max_duration = "maxDuration"; +const char* sampling_rate = "samplingRate"; +const char* bits_per_sample = "bitsPerSample"; +const char* audio_type = "audioType"; +const char* mute_audio = "muteAudio"; +const char* button_name = "buttonName"; +const char* button_event_mode = "buttonEventMode"; +const char* button_press_mode = "buttonPressMode"; +const char* custom_button_id = "customButtonID"; +const char* data_type = "dataType"; +const char* turn_list = "turnList"; +const char* turn_icon = "turnIcon"; +const char* next_turn_icon = "nextTurnIcon"; +const char* value = "value"; +const char* hmi_display_language = "hmiDisplayLanguage"; +const char* language = "language"; +const char* data = "data"; +const char* start_time = "startTime"; +const char* end_time = "endTime"; +const char* hours = "hours"; +const char* minutes = "minutes"; +const char* seconds = "seconds"; +const char* update_mode = "updateMode"; +const char* trigger_source = "triggerSource"; +const char* hmi_level = "hmiLevel"; +const char* activate_app_hmi_level = "level"; +const char* audio_streaming_state = "audioStreamingState"; +const char* system_context = "systemContext"; +const char* speech_capabilities = "speechCapabilities"; +const char* vr_capabilities = "vrCapabilities"; +const char* audio_pass_thru_capabilities = "audioPassThruCapabilities"; +// PutFile +const char* sync_file_name = "syncFileName"; +const char* file_name = "fileName"; +const char* file_type = "fileType"; +const char* file_size = "fileSize"; +const char* request_type = "requestType"; +const char* persistent_file = "persistentFile"; +const char* file_data = "fileData"; +const char* space_available = "spaceAvailable"; +const char* image_type = "imageType"; +const char* image = "image"; +const char* type = "type"; +const char* system_file = "systemFile"; +const char* offset = "offset"; +const char* length = "length"; +const char* secondary_image = "secondaryImage"; +const char* filenames = "filenames"; + +const char* hmi_display_language_desired = "hmiDisplayLanguageDesired"; +const char* ecu_name = "ecuName"; +const char* dtc_mask = "dtcMask"; +const char* did_location = "didLocation"; +const char* app_list = "appList"; +const char* device_list = "deviceList"; +const char* device_info = "deviceInfo"; +const char* name = "name"; +const char* id = "id"; +const char* isSDLAllowed = "isSDLAllowed"; +const char* transport_type = "transportType"; +const char* application = "application"; +const char* applications = "applications"; +const char* icon = "icon"; +const char* device_name = "deviceName"; +const char* reason = "reason"; +const char* available = "available"; +const char* text = "text"; +const char* character_set = "characterSet"; +const char* secondary_text = "secondaryText"; +const char* tertiary_text = "tertiaryText"; +const char* hardware = "hardware"; +const char* firmware_rev = "firmwareRev"; +const char* os = "os"; +const char* os_version = "osVersion"; +const char* carrier = "carrier"; +const char* slider_header = "sliderHeader"; +const char* key_press_mode = "keypressMode"; + +// duplicate names from hmi_request +const char* limited_character_list = "limitedCharacterList"; +const char* auto_complete_text = "autoCompleteText"; +const char* navigation_text = "navigationText"; + +// vehicle info +const char* gps = "gps"; +const char* speed = "speed"; +const char* rpm = "rpm"; +const char* fuel_level = "fuelLevel"; +const char* fuel_level_state = "fuelLevel_State"; +const char* instant_fuel_consumption = "instantFuelConsumption"; +const char* external_temp = "externalTemperature"; +const char* vin = "vin"; +const char* prndl = "prndl"; +const char* tire_pressure = "tirePressure"; +const char* odometer = "odometer"; +const char* belt_status = "beltStatus"; +const char* body_information = "bodyInformation"; +const char* device_status = "deviceStatus"; +const char* driver_braking = "driverBraking"; +const char* wiper_status = "wiperStatus"; +const char* head_lamp_status = "headLampStatus"; +const char* engine_torque = "engineTorque"; +const char* acc_pedal_pos = "accPedalPosition"; +const char* steering_wheel_angle = "steeringWheelAngle"; +const char* e_call_info = "eCallInfo"; +const char* airbag_status = "airbagStatus"; +const char* emergency_event = "emergencyEvent"; +const char* cluster_mode_status = "clusterModeStatus"; +const char* my_key = "myKey"; +const char* help_prompt = "helpPrompt"; +const char* scroll_message_body = "scrollableMessageBody"; +const char* data_result = "dataResult"; +const char* dtc_list = "dtcList"; +const char* interaction_mode = "interactionMode"; +const char* slider_position = "sliderPosition"; +const char* system_action = "systemAction"; +const char* prerecorded_speech = "prerecordedSpeech"; +const char* supported_diag_modes = "supportedDiagModes"; +const char* hmi_capabilities = "hmiCapabilities"; +const char* navigation = "navigation"; +const char* phone_call = "phoneCall"; +const char* sdl_version = "sdlVersion"; +const char* system_software_version = "systemSoftwareVersion"; +const char* priority = "priority"; + +//resuming +const char* application_commands = "applicationCommands"; +const char* application_submenus = "applicationSubMenus"; +const char* application_choice_sets = "applicationChoiceSets"; +const char* application_global_properties = "globalProperties"; +const char* application_vehicle_info = "vehicleInfo"; +const char* application_buttons = "buttons"; +const char* application_subscribtions = "subscribtions"; +const char* application_files = "applicationFiles"; +const char* application_show = "applicationShow"; +const char* resumption = "resumption"; +const char* resume_app_list = "resume_app_list"; +const char* last_ign_off_time = "last_ign_off_time"; + +const char* resume_vr_grammars = "resumeVrGrammars"; + +const char* ign_off_count = "ign_off_count"; +const char* suspend_count = "suspend_count"; + +const char* connection_info = "connection_info"; +const char* is_download_complete = "is_download_complete"; + +const char* hash_id = "hashID"; +const char* time_stamp = "timeStamp"; +const char* manual_text_entry = "manualTextEntry"; +const char* image_type_supported = "imageTypeSupported"; +const char* unexpected_disconnect = "unexpectedDisconnect"; +const char* longitude_degrees = "longitudeDegrees"; +const char* latitude_degrees = "latitudeDegrees"; +const char* address = "address"; +const char* country_name = "countryName"; +const char* country_code = "countryCode"; +const char* postal_code = "postalCode"; +const char* administrative_area = "administrativeArea"; +const char* locality = "locality"; +const char* sub_locality = "subLocality"; +const char* thoroughfare = "thoroughfare"; +const char* sub_thoroughfare = "subThoroughfare"; +const char* location_name = "locationName"; +const char* location_description = "locationDescription"; +const char* address_lines = "addressLines"; +const char* phone_number = "phoneNumber"; +const char* number = "number"; +const char* location_image = "locationImage"; +const char* is_suscribed = "isSubscribed"; +const char* message_data = "messageData"; +} // namespace strings + +namespace json { +const char* appId = "appId"; +const char* name = "name"; +const char* ios = "ios"; +const char* android = "android"; +const char* appHmiType = "appHmiType"; +const char* urlScheme = "urlScheme"; +const char* packageName = "packageName"; +const char* response = "response"; +const char* is_media_application = "isMediaApplication"; +const char* default_ = "default"; +const char* languages = "languages"; +const char* ttsName = "ttsName"; +const char* vrSynonyms = "vrSynonyms"; +} // namespace json + +namespace http_request { +const char* httpRequest = "HTTPRequest"; +const char* headers = "headers"; +const char* content_type = "ContentType"; +const char* connect_timeout = "ConnectTimout"; +const char* do_output = "DoOutput"; +const char* do_input = "DoInput"; +const char* use_caches = "UseCaches"; +const char* request_method = "RequestMethod"; +const char* read_timeout = "ReadTimeout"; +const char* instance_follow_redirect = "InstanceFollowRedirect"; +const char* charset = "charset"; +const char* content_lenght = "Content_Lenght"; +const char* GET = "GET"; +} // http_request + +namespace mobile_notification { +const char* state = "state"; +const char* syncp_timeout = "Timeout"; +const char* syncp_url = "URL"; +} // namespace mobile_notification + +namespace hmi_levels { +const char* kFull = "FULL"; +const char* kLimited = "LIMITED"; +const char* kBackground = "BACKGROUND"; +const char* kNone = "NONE"; +} + +namespace hmi_request { +const char* parent_id = "parentID"; +const char* field_name = "fieldName"; +const char* field_text = "fieldText"; +const char* alert_strings = "alertStrings"; +const char* duration = "duration"; +const char* soft_buttons = "softButtons"; +const char* tts_chunks = "ttsChunks"; +const char* speak_type = "speakType"; +const char* audio_pass_display_texts = "audioPassThruDisplayTexts"; +const char* max_duration = "maxDuration"; +const char* reason = "reason"; +const char* message_text = "messageText"; +const char* initial_text = "initialText"; +const char* navi_texts = "navigationTexts"; +const char* navi_text = "navigationText"; +const char* show_strings = "showStrings"; +const char* interaction_layout = "interactionLayout"; +const char* menu_title = "menuTitle"; +const char* menu_icon = "menuIcon"; +const char* keyboard_properties = "keyboardProperties"; +const char* method_name = "methodName"; +const char* keyboard_layout = "keyboardLayout"; +const char* limited_character_list = "limitedCharacterList"; +const char* auto_complete_text = "autoCompleteText"; +const char* file = "file"; +const char* retry = "retry"; +const char* service = "service"; +} // namespace hmi_request + +namespace hmi_response { +const char* code = "code"; +const char* message = "message"; +const char* method = "method"; +const char* try_again_time = "tryAgainTime"; +const char* custom_button_id = "customButtonID"; +const char* button_name = "name"; +const char* button_mode = "mode"; +const char* attenuated_supported = "attenuatedSupported"; +const char* languages = "languages"; +const char* language = "language"; +const char* display_capabilities = "displayCapabilities"; +const char* hmi_zone_capabilities = "hmiZoneCapabilities"; +const char* soft_button_capabilities = "softButtonCapabilities"; +const char* image_supported = "imageSupported"; +const char* button_capabilities = "buttonCapabilities"; +const char* capabilities = "capabilities"; +const char* speech_capabilities = "speechCapabilities"; +const char* prerecorded_speech_capabilities = "prerecordedSpeechCapabilities"; +const char* preset_bank_capabilities = "presetBankCapabilities"; +const char* allowed = "allowed"; +const char* vehicle_type = "vehicleType"; +const char* did_result = "didResult"; +const char* result_code = "resultCode"; +const char* dtc = "dtc"; +const char* ecu_header = "ecuHeader"; +const char* image_capabilities = "imageCapabilities"; +const char* display_type = "displayType"; +const char* text_fields = "textFields"; +const char* media_clock_formats = "mediaClockFormats"; +const char* graphic_supported = "graphicSupported"; +const char* image_fields = "imageFields"; +const char* templates_available = "templatesAvailable"; +const char* screen_params = "screenParams"; +const char* num_custom_presets_available = "numCustomPresetsAvailable"; +const char* urls = "urls"; +const char* policy_app_id = "policyAppID"; +const char* enabled = "enabled"; + +} // namespace hmi_response + +namespace hmi_notification { +const char* prndl = "prndl"; +const char* file_name = "file_name"; +const char* system_context = "systemContext"; +const char* state = "state"; +const char* result = "result"; +const char* statistic_type = "statisticType"; +const char* error = "error"; +const char* policyfile = "policyfile"; +const char* is_active = "isActive"; +const char* is_deactivated = "isDeactivated"; +const char* event_name = "eventName"; + +} // namespace hmi_notification + +} // namespace application_manager + +# diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt index 3a055ffc1a..62a35477f5 100644 --- a/src/components/application_manager/test/CMakeLists.txt +++ b/src/components/application_manager/test/CMakeLists.txt @@ -154,6 +154,7 @@ set(testSources ${AM_SOURCE_DIR}/policy/src/policy/policy_table/table_struct ) set(testLibraries + ApplicationManager Utils dbms jsoncpp |