diff options
| author | JuWan Kim <juwan.kim@samsung.com> | 2015-03-31 17:00:03 +0900 |
|---|---|---|
| committer | JuWan Kim <juwan.kim@samsung.com> | 2015-03-31 17:00:03 +0900 |
| commit | 6994e6e34937d5a973cef16c544848383e66807f (patch) | |
| tree | 73162b931e4e3b3a45e448225518968792d57023 /src | |
| parent | ad9dfe235f2169e251f417a5cf903d337b9864fa (diff) | |
| download | settings-6994e6e34937d5a973cef16c544848383e66807f.tar.gz settings-6994e6e34937d5a973cef16c544848383e66807f.tar.bz2 settings-6994e6e34937d5a973cef16c544848383e66807f.zip | |
Fix sub menu launch bug after refactoring
Change-Id: I0d7c7b9d7920b1df3dce20f8e4d5d9d9e1e23298
Signed-off-by: JuWan Kim <juwan.kim@samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/settingviewmgr.cpp | 25 | ||||
| -rw-r--r-- | src/view_uigadget.cpp | 3 |
2 files changed, 9 insertions, 19 deletions
diff --git a/src/settingviewmgr.cpp b/src/settingviewmgr.cpp index 4da9d71..0666250 100644 --- a/src/settingviewmgr.cpp +++ b/src/settingviewmgr.cpp @@ -360,29 +360,20 @@ bool CSettingMgr::Initialize(Evas_Object *win) return false; } - CUiGadgetView g_uigadget(VCLASS_TITLE_UG); - CSublistView g_sublist(VCLASS_TITLE_SUBLIST); - CPasscodePopupView g_passcodePopup(VCLASS_TITLE_CHANGE_PASSCODE); - CSystemClockView g_systemclock(VCLASS_TITLE_SYSTEM_CLOCK); - CNeedPasscodeView g_needpasscode(VCLASS_TITLE_NEED_PASSCODE); - g_func_map[0].style = STYLE_UIGADGET; - g_func_map[0].view = &g_uigadget; + g_func_map[0].view = new CUiGadgetView(VCLASS_TITLE_UG); g_func_map[1].style = STYLE_CTXPOPUP; - g_func_map[1].view = &g_sublist; + g_func_map[1].view = new CSublistView(VCLASS_TITLE_SUBLIST); g_func_map[2].style = STYLE_PASSCODE_POPUP; - g_func_map[2].view = &g_passcodePopup; + g_func_map[2].view = new CPasscodePopupView(VCLASS_TITLE_CHANGE_PASSCODE); g_func_map[3].style = STYLE_CLOCK_CTXPOPUP; - g_func_map[3].view = &g_systemclock; + g_func_map[3].view = new CSystemClockView(VCLASS_TITLE_SYSTEM_CLOCK); g_func_map[4].style = STYLE_NEED_PASSCODE; - g_func_map[4].view = &g_needpasscode; - - - + g_func_map[4].view = new CNeedPasscodeView(VCLASS_TITLE_NEED_PASSCODE); instance->m->win = win; instance->m->depth = 0; @@ -454,9 +445,9 @@ bool CSettingMgr::ViewPush(const char *name, void *data) ASSERT(m); ASSERT(name); - struct _settinginfo *sinfo; - CSettingBaseView *sclass; - struct settingview_data *view; + struct _settinginfo *sinfo = NULL; + CSettingBaseView *sclass = NULL; + struct settingview_data *view = NULL; m->depth++; diff --git a/src/view_uigadget.cpp b/src/view_uigadget.cpp index 0eb479e..698fbb2 100644 --- a/src/view_uigadget.cpp +++ b/src/view_uigadget.cpp @@ -248,7 +248,6 @@ bool CUiGadgetView::Create(struct settingview_data *view, void *prev) ASSERT(prev); Evas_Object *win, *base; - SUiGadgetView *m; struct evas_obj_data *param; CSettingMgr *mgr = CSettingMgr::GetInstance(); @@ -363,4 +362,4 @@ struct setting_class *view_uigadget_get_vclass(void) { return &_vclass; } -#endif
\ No newline at end of file +#endif |