c: code refactoring.

remove duplicated arguments validataion code.

Change-Id: Id4559edaf47563aca27840128eb0564a3977a231

diff --git a/src/include/interface/ui_iface_types.h b/src/include/interface/ui_iface_types.h
index fa50ed0941275ad574a9702134088a61db8ce5d2..8ac5bbb5b97881bb5004987b37942927b481b154 100644 (file)
--- a/src/include/interface/ui_iface_types.h
+++ b/src/include/interface/ui_iface_types.h
@@ -22,7 +22,8 @@
  */
 enum ui_view_indicator
 {
-       UI_VIEW_INDICATOR_DEFAULT = 0, ///< Opaque indicator
+       UI_VIEW_INDICATOR_UNKNOWN = 0, ///< Unknown state (Exceptional case)
+       UI_VIEW_INDICATOR_DEFAULT,     ///< Opaque indicator
        UI_VIEW_INDICATOR_OPTIMAL,     ///< Transparent indicator
        UI_VIEW_INDICATOR_OVERLAP,     ///< Overlap indicator
        UI_VIEW_INDICATOR_HIDE,        ///< Indicator hide
@@ -35,12 +36,12 @@ enum ui_view_indicator
  */
 enum ui_view_state
 {
-       UI_VIEW_STATE_LOAD = 0,        ///< Load state
+       UI_VIEW_STATE_UNKNOWN = 0,     ///< Unknown state (Exceptional case)
+       UI_VIEW_STATE_LOAD,            ///< Load state
        UI_VIEW_STATE_UNLOAD,          ///< Unload state
        UI_VIEW_STATE_ACTIVATE,        ///< Activate state
        UI_VIEW_STATE_DEACTIVATE,      ///< Deactivate state
        UI_VIEW_STATE_PAUSE,           ///< Pause state
-       UI_VIEW_STATE_UNKNOWN,         ///< Unknown state
        UI_VIEW_STATE_LAST
 };
 

diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp
index 28e392dca6842cf3a8bc3af9649183b7575d798e..d568417475d448a59a90412bc237832b8851c455 100644 (file)
--- a/src/lib/efl/mobile/c/ui_menu.cpp
+++ b/src/lib/efl/mobile/c/ui_menu.cpp
@@ -8,101 +8,67 @@ struct ui_menu_s
        ui_menu *p;
 };
 
-bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup)
+static bool validate_menu(ui_menu *menu)
 {
        if (!menu)
        {
-               LOGE("Invalid ui_menu");
+               LOGE("Invalid ui_menu = NULL");
                return false;
        }
+       return true;
+}
+
 
+bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup)
+{
+       if (!validate_menu(menu)) return false;
        return menu->set_content(ctxpopup);
 }
 
 Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return NULL;
-       }
-
+       if (!validate_menu(menu)) return NULL;
        return menu->get_content();
 }
 
 Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return NULL;
-       }
-
+       if (!validate_menu(menu)) return NULL;
        return menu->unset_content();
 }
 
 bool ui_menu_activate(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return false;
-       }
-
+       if (!validate_menu(menu)) return false;
        return menu->activate();
 }
 
 bool ui_menu_deactivate(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return false;
-       }
-
+       if (!validate_menu(menu)) return false;
        return menu->deactivate();
 }
 
 bool ui_menu_activated_get(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return false;
-       }
-
+       if (!validate_menu(menu)) return false;
        return menu->is_activated();
 }
 
 Evas_Object *ui_menu_base_get(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return NULL;
-       }
-
+       if (!validate_menu(menu)) return NULL;
        return menu->get_base();
 }
 
 int ui_menu_degree_get(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return -1;
-       }
-
+       if (!validate_menu(menu)) return -1;
        return menu->get_degree();
 }
 
 ui_view *ui_menu_view_get(ui_menu *menu)
 {
-       if (!menu)
-       {
-               LOGE("Invalid ui_menu");
-               return NULL;
-       }
-
+       if (!validate_menu(menu)) return NULL;
        return dynamic_cast<ui_view *>(menu->get_view());
 }

diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp
index 6950ae4166006229c8fdbf49a2edaa4fdbef63a7..a91694fd1fe628abcf874d6f2ab886badf4f655d 100644 (file)
--- a/src/lib/efl/mobile/c/ui_popup.cpp
+++ b/src/lib/efl/mobile/c/ui_popup.cpp
@@ -8,6 +8,17 @@ struct ui_popup_s
        ui_popup *p;
 };
 
+static bool validate_popup(ui_popup *popup)
+{
+       if (!popup)
+       {
+               LOGE("Invalid ui_popup = NULL");
+               return false;
+       }
+       return true;
+}
+
+
 ui_popup *ui_popup_create(ui_view *view)
 {
        return new ui_popup(view);
@@ -15,100 +26,60 @@ ui_popup *ui_popup_create(ui_view *view)
 
 void ui_popup_destroy(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return;
-       }
+       if (!validate_popup(popup)) return;
        delete(popup);
 }
 
 bool ui_popup_content_set(ui_popup *popup, Elm_Popup *content)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return false;
-       }
+       if (!validate_popup(popup)) return false;
        return popup->set_content(content);
 }
 
 Elm_Popup *ui_popup_content_get(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return NULL;
-       }
+       if (!validate_popup(popup)) return NULL;
        return popup->get_content();
 }
 
 Elm_Popup *ui_popup_content_unset(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return NULL;
-       }
+       if (!validate_popup(popup)) return NULL;
        return popup->unset_content();
 }
 
 bool ui_popup_activate(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return false;
-       }
+       if (!validate_popup(popup)) return false;
        return popup->activate();
 }
 
 bool ui_popup_deactivate(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return false;
-       }
+       if (!validate_popup(popup)) return false;
        return popup->deactivate();
 }
 
 bool ui_popup_activate_get(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return false;
-       }
+       if (!validate_popup(popup)) return false;
        return popup->is_activated();
 }
 
 Evas_Object *ui_popup_base_get(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return NULL;
-       }
+       if (!validate_popup(popup)) return NULL;
        return popup->get_base();
 }
 
 int ui_popup_degree_get(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return -1;
-       }
+       if (!validate_popup(popup)) return -1;
        return popup->get_degree();
 }
 
 ui_view *ui_popup_view_get(ui_popup *popup)
 {
-       if (!popup)
-       {
-               LOGE("Invalid ui_popup");
-               return NULL;
-       }
+       if (!validate_popup(popup)) return NULL;
        return dynamic_cast<ui_view *>(popup->get_view());
 }

diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp
index 8b6b6819bb1a4d15cf470ab88014e671c12b0883..0c44b3e22c02b383d9081e597ea6c0e7cc62a814 100644 (file)
--- a/src/lib/efl/mobile/c/ui_standard_view.cpp
+++ b/src/lib/efl/mobile/c/ui_standard_view.cpp
@@ -133,260 +133,124 @@ struct ui_standard_view_s
        ui_standard_view_capi *p;
 };
 
-ui_standard_view* ui_standard_view_create(const char *name)
-{
-       return new ui_standard_view_capi(name);
-}
-
-bool ui_standard_view_content_set(ui_standard_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn,
-        Evas_Object *title_right_btn)
+static ui_standard_view_capi *validate_view(ui_standard_view *view)
 {
        if (!view)
        {
                LOGE("Invalid ui_standard_view = NULL");
-               return false;
+               return NULL;
        }
 
        ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
        if (!capi_view)
        {
                LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
+               return NULL;
        }
 
-       return capi_view->set_content(content, title, subtitle, title_left_btn, title_right_btn);
+       return capi_view;
 }
 
-bool ui_standard_view_title_set(ui_standard_view *view, const char *text)
+ui_standard_view* ui_standard_view_create(const char *name)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return false;
-       }
+       return new ui_standard_view_capi(name);
+}
 
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
+bool ui_standard_view_content_set(ui_standard_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn,
+        Evas_Object *title_right_btn)
+{
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
+       return capi_view->set_content(content, title, subtitle, title_left_btn, title_right_btn);
+}
 
+bool ui_standard_view_title_set(ui_standard_view *view, const char *text)
+{
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_title(text);
 }
 
 bool ui_standard_view_sub_title_set(ui_standard_view *view, const char *text)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return false;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_subtitle(text);
 }
 
 bool ui_standard_view_title_badge_set(ui_standard_view *view, const char *badge_text)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return false;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_title_badge(badge_text);
 }
 
 bool ui_standard_view_title_right_btn_set(ui_standard_view *view, Evas_Object *title_right_btn)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return false;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_title_right_btn(title_right_btn);
 }
 
 Elm_Button *ui_standard_view_title_right_btn_get(ui_standard_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return NULL;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return NULL;
        return capi_view->get_title_right_btn();
 }
 
 Elm_Button *ui_standard_view_title_right_btn_unset(ui_standard_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return NULL;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return NULL;
        return capi_view->unset_title_right_btn();
 }
 
 bool ui_standard_view_title_left_btn_set(ui_standard_view *view, Evas_Object *title_left_btn)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return false;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_title_left_btn(title_left_btn);
 }
 
 Elm_Button *ui_standard_view_title_left_btn_get(ui_standard_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return NULL;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return NULL;
        return capi_view->get_title_left_btn();
 }
 
 Elm_Button *ui_standard_view_title_left_btn_unset(ui_standard_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view = NULL");
-               return NULL;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return NULL;
        return capi_view->unset_title_right_btn();
 }
 
 bool ui_standard_view_toolbar_set(ui_standard_view *view, Elm_Toolbar *toolbar)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view");
-               return false;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_toolbar(toolbar);
 }
 
 Elm_Toolbar *ui_standard_view_toolbar_get(ui_standard_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view");
-               return NULL;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return NULL;
        return capi_view->get_toolbar();
 }
 
 Elm_Toolbar *ui_standard_view_toolbar_unset(ui_standard_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view");
-               return NULL;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return NULL;
        return capi_view->unset_toolbar();
 }
 
 bool ui_standard_view_title_visible_set(ui_standard_view *view, bool visible, bool anim)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_standard_view");
-               return false;
-       }
-
-       ui_standard_view_capi *capi_view = dynamic_cast<ui_standard_view_capi *>(view);
-       if (!capi_view)
-       {
-               LOGE("Invalid ui_standard_view = %p. Probably, you passed ui_view, not ui_standard_view.", view);
-               return false;
-       }
-
+       ui_standard_view_capi *capi_view;
+       if (!(capi_view = validate_view(view))) return false;
        return capi_view->set_title_visible(visible, anim);
 }

diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp
index ec70e1c12b179351eafeecaaadef0e7776fe249b..916a2f127099a49210ac78399b7a306994416abe 100644 (file)
--- a/src/lib/efl/mobile/c/ui_view.cpp
+++ b/src/lib/efl/mobile/c/ui_view.cpp
@@ -132,6 +132,16 @@ struct ui_view_s
        ui_view_capi *p;
 };
 
+static bool validate_view(ui_view *view)
+{
+       if (!view)
+       {
+               LOGE("Invalid ui_view = NULL");
+               return false;
+       }
+       return true;
+}
+
 ui_view* ui_view_create(const char *name)
 {
        return new ui_view_capi(name);
@@ -139,11 +149,7 @@ ui_view* ui_view_create(const char *name)
 
 bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
+       if (!validate_view(view)) return false;
 
        ui_common_view_capi *event_attr = dynamic_cast<ui_common_view_capi *>(view);
        if (!event_attr)
@@ -163,11 +169,7 @@ bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s
 
 bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *event_callback, void *data)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
+       if (!validate_view(view)) return false;
 
        ui_common_view_capi *event_attr = dynamic_cast<ui_common_view_capi *>(view);
        if (!event_attr)
@@ -187,187 +189,103 @@ bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *event_
 
 Evas_Object* ui_view_base_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return NULL;
-       }
+       if (!validate_view(view)) return NULL;
        return view->get_base();
 }
 
 Evas_Object *ui_view_content_unset(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return NULL;
-       }
-
+       if (!validate_view(view)) return NULL;
        return view->unset_content();
 }
 
 void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return;
-       }
-
+       if (!validate_view(view)) return;
        view->set_indicator(indicator);
 }
 
 ui_view_indicator ui_view_indicator_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return UI_VIEW_INDICATOR_LAST;
-       }
-
+       if (!validate_view(view)) return UI_VIEW_INDICATOR_UNKNOWN;
        return view->get_indicator();
 }
 
 void ui_view_removable_content_set(ui_view *view, bool remove)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return;
-       }
-
+       if (!validate_view(view)) return;
        view->set_removable_content(remove);
 }
 
 bool ui_view_removable_content_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
-
+       if (!validate_view(view)) return false;
        return view->get_removable_content();
 }
 
 int ui_view_degree_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return -1;
-       }
-
+       if (!validate_view(view)) return -1;
        return view->get_degree();
 }
 
 bool ui_view_transition_style_set(ui_view *view, const char *style)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
-
+       if (!validate_view(view)) return false;
        return view->set_transition_style(style);
 }
 
 const char *ui_view_transition_style_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return NULL;
-       }
-
+       if (!validate_view(view)) return NULL;
        return view->get_transition_style();
 }
 
 const ui_menu *ui_view_menu_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return NULL;
-       }
-
+       if (!validate_view(view)) return NULL;
        return view->get_menu();
 }
 
 bool ui_view_name_set(ui_view *view, const char *name)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
-
+       if (!validate_view(view)) return false;
        return view->set_name(name);
-
 }
 
 const char *ui_view_name_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return NULL;
-       }
-
+       if (!validate_view(view)) return NULL;
        return view->get_name();
-
 }
 
 ui_view_state ui_view_state_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return UI_VIEW_STATE_UNKNOWN;
-       }
-
+       if (!validate_view(view)) return UI_VIEW_STATE_UNKNOWN;
        return view->get_state();
 }
 
 Evas_Object *ui_view_content_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return NULL;
-       }
-
+       if (!validate_view(view)) return NULL;
        return view->get_content();
 }
 
 bool ui_view_destroy(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
+       if (!validate_view(view)) return false;
        delete (view);
        return true;
 }
 
 bool ui_view_content_set(ui_view *view, Evas_Object *content)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
+       if (!validate_view(view)) return false;
        return view->set_content(content);
 }
 
 const char *ui_view_type_get(ui_view *view)
 {
-       if (!view)
-       {
-               LOGE("Invalid ui_view = NULL");
-               return false;
-       }
-
+       if (!validate_view(view)) return false;
        return dynamic_cast<ui_common_view_capi *>(view)->type;
 }

diff --git a/src/lib/efl/mobile/c/ui_viewmgr.cpp b/src/lib/efl/mobile/c/ui_viewmgr.cpp
index aca72351446292f8c0af4f63d2dd95d5cbd6af3c..a1c21297c3d7576adfecf17ac8dad090414ed8c3 100644 (file)
--- a/src/lib/efl/mobile/c/ui_viewmgr.cpp
+++ b/src/lib/efl/mobile/c/ui_viewmgr.cpp
@@ -8,6 +8,17 @@ struct ui_viewmgr_s
        ui_viewmgr *p;
 };
 
+static bool validate_viewmgr(ui_viewmgr *viewmgr)
+{
+       if (!viewmgr)
+       {
+               LOGE("Invalid ui_viewmgr = NULL");
+               return false;
+       }
+       return true;
+}
+
+
 ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view)
 {
        if (!viewmgr || !view)
@@ -43,78 +54,43 @@ bool ui_viewmgr_view_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *a
 
 bool ui_viewmgr_view_pop(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return -1;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return false;
        return viewmgr->pop_view();
 }
 
 bool ui_viewmgr_activate(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return -1;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return false;
        return viewmgr->activate();
 }
 
 bool ui_viewmgr_deactivate(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return -1;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return false;
        return viewmgr->deactivate();
 }
 
 Elm_Win *ui_viewmgr_window_get(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return NULL;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return NULL;
        return viewmgr->get_window();
 }
 
 ui_view *ui_viewmgr_last_view_get(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return NULL;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return NULL;
        return dynamic_cast<ui_view *>(viewmgr->get_last_view());
 }
 
 ui_view *ui_viewmgr_view_get(ui_viewmgr *viewmgr, int idx)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return NULL;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return NULL;
        return dynamic_cast<ui_view *>(viewmgr->get_view(idx));
 }
 
 Evas_Object *ui_viewmgr_base_get(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return NULL;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return NULL;
        return viewmgr->get_base();
 }
 
@@ -132,23 +108,14 @@ int ui_viewmgr_view_index_get(ui_viewmgr *viewmgr, const ui_view *view)
 
 int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return -1;
-       }
+       if (!validate_viewmgr(viewmgr)) return -1;
 
        return viewmgr->get_view_count();
 }
 
 bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr)
 {
-       if (!viewmgr)
-       {
-               LOGE("Invalid ui_viewmgr");
-               return false;
-       }
-
+       if (!validate_viewmgr(viewmgr)) return false;
        return viewmgr->need_soft_key();
 }