From 8a4d81c443503b3915e836ef433cd84cdda2f635 Mon Sep 17 00:00:00 2001 From: Lukasz Wlazly Date: Mon, 15 Oct 2018 07:39:51 +0200 Subject: [PATCH] [Refactor] Move field to CameraSwitchesPage class Change-Id: I1cb66f1a42795d723915e075d4bdcdbd97809216 --- src/CameraSwitchesPage.cpp | 4 ++-- src/CameraSwitchesPage.hpp | 2 ++ src/SettingAccessibility.hpp | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CameraSwitchesPage.cpp b/src/CameraSwitchesPage.cpp index 72b82d1..ffdb98b 100644 --- a/src/CameraSwitchesPage.cpp +++ b/src/CameraSwitchesPage.cpp @@ -14,7 +14,7 @@ CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad) elm_object_style_set(genlist, "dialogue"); elm_genlist_clear(genlist); - ad->universal_switch_camera_comment = setting_create_Gendial_field_def( + universal_switch_camera_comment = setting_create_Gendial_field_def( genlist, &ad->itc_multiline_sub, NULL, ad, SwallowType::INVALID, NULL, NULL, 0, @@ -22,7 +22,7 @@ CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad) _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_COMMENT), NULL); - elm_genlist_item_select_mode_set(ad->universal_switch_camera_comment->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + elm_genlist_item_select_mode_set(universal_switch_camera_comment->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); setting_create_Gendial_field_titleItem(genlist, &itc_group_item, DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_GROUP_HEAD, NULL); auto switches = setting_accessibility_universal_switch_dbus_config_get_switches(&ad->config, ACCESSIBILITY_UNIVERSAL_SWITCH_CAMERA_SWITCH_PROVIDER); diff --git a/src/CameraSwitchesPage.hpp b/src/CameraSwitchesPage.hpp index 282413b..52d94f8 100644 --- a/src/CameraSwitchesPage.hpp +++ b/src/CameraSwitchesPage.hpp @@ -14,6 +14,8 @@ private: static void createActionPage(SettingAccessibility *ad, UniversalSwitchInfoType * camera_switch); static void switchActionCb(SettingAccessibility *ad, const std::string& action, void *user_data); static void backCb(void *data, Evas_Object *obj, void *event_info); + + GenGroupItemData *universal_switch_camera_comment; }; #endif diff --git a/src/SettingAccessibility.hpp b/src/SettingAccessibility.hpp index c91b1e3..93763a2 100644 --- a/src/SettingAccessibility.hpp +++ b/src/SettingAccessibility.hpp @@ -67,7 +67,6 @@ struct SettingAccessibility { GenGroupItemData *universal_switch_add_switch_screen; GenGroupItemData *universal_switch_add_switch_accessories; GenGroupItemData *universal_switch_add_switch_camera; - GenGroupItemData *universal_switch_camera_comment; GenGroupItemData *universal_switch_settings_switches; GenGroupItemData *universal_switch_auto_scan_int; GenGroupItemData *universal_switch_scans_num; -- 2.7.4