From: Woochan Lee Date: Fri, 24 Jun 2016 09:11:37 +0000 (+0900) Subject: Coding Rule: 1. Fix #define guide and some indentation errors from script result. X-Git-Tag: submit/tizen/20160630.072558~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfaf2e9d9074f7fbb18da940306cb13cffc73710;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git Coding Rule: 1. Fix #define guide and some indentation errors from script result. Change-Id: I910449d434ad4fc422e4eb260038a9a29df8b8a9 --- diff --git a/src/examples/efl/c/page10.cpp b/src/examples/efl/c/page10.cpp index aab36c1..e092a1b 100644 --- a/src/examples/efl/c/page10.cpp +++ b/src/examples/efl/c/page10.cpp @@ -45,16 +45,14 @@ view10_rotate_cb(ui_standard_view *view, int degree, void *data) //Check orientation manually to create a content. - //Portrait if (degree == 0 || degree == 180) { + //Portrait content = create_content(base, "ViewMgr Demo
Rotation", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; ui_view_indicator_set(view, UI_VIEW_INDICATOR_DEFAULT); - } - //Landscape - else - { + } else { + //Landscape content = create_landscape_content(base, "ViewMgr Demo
Rotation", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; ui_view_indicator_set(view, UI_VIEW_INDICATOR_OPTIMAL); diff --git a/src/examples/efl/c/page7.cpp b/src/examples/efl/c/page7.cpp index a9bdb40..c26f780 100644 --- a/src/examples/efl/c/page7.cpp +++ b/src/examples/efl/c/page7.cpp @@ -44,7 +44,7 @@ view7_load_cb(ui_standard_view *view, void *data) } //Create and set a main content. - content = create_content(base, "ViewMgr Demo
Navigationbar",prev_btn_clicked_cb, next_btn_clicked_cb); + content = create_content(base, "ViewMgr Demo
Navigationbar", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; if (!ui_standard_view_content_set(view, content, "Page7", NULL, NULL, NULL)) diff --git a/src/examples/efl/c/page9.cpp b/src/examples/efl/c/page9.cpp index 646a1ef..39c231a 100644 --- a/src/examples/efl/c/page9.cpp +++ b/src/examples/efl/c/page9.cpp @@ -92,9 +92,7 @@ view9_load_cb(ui_standard_view *view, void *data) if (ui_view_degree_get(view) == 90 || ui_view_degree_get(view) == 270) { return view9_landscape_cb(view, data); - } - else - { + } else { return view9_portrait_cb(view, data); } } diff --git a/src/examples/efl/cpp/page10.h b/src/examples/efl/cpp/page10.h index a4cce67..0c3fbca 100644 --- a/src/examples/efl/cpp/page10.h +++ b/src/examples/efl/cpp/page10.h @@ -31,9 +31,9 @@ protected: { ui_standard_view::on_rotate(degree); - //Portrait if (this->get_degree() == 0 || this->get_degree() == 180) { + //Portrait Evas_Object *content = create_content(this->get_base(), "ViewMgr++ Demo
Rotation", //Prev Button Callback [](void *data, Evas_Object *obj, void *event_info) -> void @@ -48,10 +48,8 @@ protected: this->set_content(content, "Page 10"); this->set_indicator(UI_VIEW_INDICATOR_DEFAULT); - } - //Landscape - else - { + } else { + //Landscape Evas_Object *content = create_landscape_content(this->get_base(), "ViewMgr++ Demo
Rotation", //Prev Button Callback [](void *data, Evas_Object *obj, void *event_info) -> void diff --git a/src/include/efl/mobile/c/_ui_common_view_capi.h b/src/include/efl/mobile/c/_ui_common_view_capi.h index c6fb86b..a5271c1 100644 --- a/src/include/efl/mobile/c/_ui_common_view_capi.h +++ b/src/include/efl/mobile/c/_ui_common_view_capi.h @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef _UI_PRIVATE_VIEW_H_ -#define _UI_PRIVATE_VIEW_H_ +#ifndef _UI_COMMON_VIEW_CAPI_H_ +#define _UI_COMMON_VIEW_CAPI_H_ namespace efl_viewmanager { @@ -42,4 +42,4 @@ public: } -#endif /* _UI_PRIVATE_VIEW_H_ */ +#endif /* _UI_COMMON_VIEW_CAPI_H_ */ diff --git a/src/include/efl/mobile/c/ui_application.h b/src/include/efl/mobile/c/ui_application.h index 160f52a..6f5073c 100644 --- a/src/include/efl/mobile/c/ui_application.h +++ b/src/include/efl/mobile/c/ui_application.h @@ -1,5 +1,5 @@ -#ifndef _UI_APPLICATION_CAPI_H_ -#define _UI_APPLICATION_CAPI_H_ +#ifndef _CAPI_UI_APPLICATION_H_ +#define _CAPI_UI_APPLICATION_H_ #ifdef __cplusplus extern "C" { @@ -59,4 +59,4 @@ EAPI bool ui_application_term(void); * @} */ -#endif /* _UI_APPLICATION_CAPI_H_ */ +#endif /* _CAPI_UI_APPLICATION_H_ */ diff --git a/src/include/interface/ui_iface_types.h b/src/include/interface/ui_iface_types.h index 2ccbb64..db900c7 100644 --- a/src/include/interface/ui_iface_types.h +++ b/src/include/interface/ui_iface_types.h @@ -47,4 +47,4 @@ enum ui_view_state }; typedef enum ui_view_state ui_view_state; -#endif +#endif /* _UI_IFACE_TYPES_H_ */ diff --git a/src/include/ui_viewmanager.h b/src/include/ui_viewmanager.h index ebfa3a1..06b6d8a 100644 --- a/src/include/ui_viewmanager.h +++ b/src/include/ui_viewmanager.h @@ -15,8 +15,13 @@ * */ +#ifndef _UI_VIEWMANAGER_H_ +#define _UI_VIEWMANAGER_H_ + #ifdef TARGET_LANG_CPLUS #include "efl/mobile/ui_mobile_viewmanager.h" #else #include "efl/mobile/c/ui_mobile_viewmanager.h" #endif + +#endif /* _UI_VIEWMANAGER_H_ */ diff --git a/src/lib/efl/mobile/ui_standard_view.cpp b/src/lib/efl/mobile/ui_standard_view.cpp index 217df59..b530fa6 100644 --- a/src/lib/efl/mobile/ui_standard_view.cpp +++ b/src/lib/efl/mobile/ui_standard_view.cpp @@ -142,9 +142,7 @@ bool ui_standard_view_impl::create_layout() if (!prev_btn) { LOGE("Failed to create a button = ui_standard_view(%p)", this); - } - else - { + } else { evas_object_smart_callback_add(prev_btn, "clicked", [](void *data, Evas_Object *obj, void *event_info) -> void { ui_viewmgr *viewmgr = static_cast(data); @@ -181,9 +179,7 @@ bool ui_standard_view_impl::set_content(Evas_Object *content, const char *title) if (content) { elm_object_signal_emit(layout, "elm.state,elm.swallow.content,show", "viewmgr"); - } - else - { + } else { elm_object_signal_emit(layout, "elm.state,elm.swallow.content,hide", "viewmgr"); } @@ -291,9 +287,7 @@ bool ui_standard_view_impl::set_toolbar(Elm_Toolbar *toolbar) { elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_SCROLL); elm_toolbar_align_set(toolbar, 0); - } - else - { + } else { elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND); } elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE); @@ -407,9 +401,7 @@ bool ui_standard_view_impl::set_title_visible(bool visible, bool anim) { if (anim) elm_object_signal_emit(layout, "elm,state,title,show,anim", "viewmgr"); else elm_object_signal_emit(layout, "elm,state,title,show", "viewmgr"); - } - else - { + } else { if (anim) elm_object_signal_emit(layout, "elm,state,title,hide,anim", "viewmgr"); else elm_object_signal_emit(layout, "elm,state,title,hide", "viewmgr"); } diff --git a/src/lib/efl/ui_base_key_listener.cpp b/src/lib/efl/ui_base_key_listener.cpp index 06afb8f..f5a88d4 100644 --- a/src/lib/efl/ui_base_key_listener.cpp +++ b/src/lib/efl/ui_base_key_listener.cpp @@ -51,7 +51,6 @@ static void key_grab_rect_key_up_cb(ui_base_key_listener_impl *key_listener, Eva ui_base_key_listener_impl::ui_base_key_listener_impl(ui_base_key_listener *key_listener, ui_base_viewmgr *viewmgr) : key_listener(key_listener), viewmgr(viewmgr), key_grabber(NULL) { - } void ui_base_key_listener_impl::event_proc(Evas_Event_Key_Down *ev) diff --git a/src/lib/efl/ui_base_viewmgr.cpp b/src/lib/efl/ui_base_viewmgr.cpp index a5c3742..10d6b63 100644 --- a/src/lib/efl/ui_base_viewmgr.cpp +++ b/src/lib/efl/ui_base_viewmgr.cpp @@ -147,9 +147,7 @@ Elm_Layout *ui_base_viewmgr_impl::set_transition_layout(string transition_style) effect_map.insert(pair("default", this->layout)); this->create_base_layout(this->scroller, transition_style.c_str()); effect_map.insert(pair(transition_style, this->layout)); - } - else - { + } else { elm_object_content_set(this->scroller, effect_layout); this->layout = effect_layout; @@ -172,9 +170,7 @@ void ui_base_viewmgr_impl::activate_top_view() if (view->get_base() == this->get_base()) { content = view->get_content(); - } - else - { + } else { content = view->get_base(); } @@ -352,9 +348,7 @@ bool ui_base_viewmgr_impl::deactivate() if (true) { evas_object_lower(this->win); - } - else - { + } else { delete(this->viewmgr); } diff --git a/src/lib/interface/ui_iface_view.cpp b/src/lib/interface/ui_iface_view.cpp index 2d6cfb9..2e6d9c3 100644 --- a/src/lib/interface/ui_iface_view.cpp +++ b/src/lib/interface/ui_iface_view.cpp @@ -120,7 +120,6 @@ void ui_iface_view_impl::on_resume() void ui_iface_view_impl::on_destroy() { - } ui_iface_view_impl::ui_iface_view_impl(ui_iface_view *view, const char *name)