Remove _c postfix.
Change-Id: If6c974806b067249c83858972e0c86bad5377407
--- /dev/null
+#ifndef _UI_APP_C_H_
+#define _UI_APP_C_H_
+
+namespace efl_viewmanager
+{
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ int ui_app_init(const char *pkg, const char *locale_dir);
+ int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data);
+#ifdef __cplusplus
+}
+#endif
+
+}
+#endif /* _UI_APP_C_H_ */
+++ /dev/null
-#ifndef _UI_APP_C_H_
-#define _UI_APP_C_H_
-
-namespace efl_viewmanager
-{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- int ui_app_init(const char *pkg, const char *locale_dir);
- int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data);
-#ifdef __cplusplus
-}
-#endif
-
-}
-#endif /* _UI_APP_C_H_ */
--- /dev/null
+#ifndef _UI_MENU_C_H_
+#define _UI_MENU_C_H_
+
+namespace efl_viewmananger
+{
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup);
+#ifdef __cplusplus
+}
+#endif
+}
+
+#endif /* _UI_MENU_C_H_ */
+++ /dev/null
-#ifndef _UI_MENU_C_H_
-#define _UI_MENU_C_H_
-
-namespace efl_viewmananger
-{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup);
-#ifdef __cplusplus
-}
-#endif
-}
-
-#endif /* _UI_MENU_C_H_ */
--- /dev/null
+#ifndef _UI_POPUP_C_H_
+#define _UI_POPUP_C_H_
+
+namespace efl_viewmananger
+{
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup);
+ bool ui_popup_activate(ui_popup *popup);
+ void ui_popup_del(ui_popup *popup);
+#ifdef __cplusplus
+}
+#endif
+
+}
+#endif /* _UI_POPUP_C_H_ */
+++ /dev/null
-#ifndef _UI_POPUP_C_H_
-#define _UI_POPUP_C_H_
-
-namespace efl_viewmananger
-{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup);
- bool ui_popup_activate(ui_popup *popup);
- void ui_popup_del(ui_popup *popup);
-#ifdef __cplusplus
-}
-#endif
-
-}
-#endif /* _UI_POPUP_C_H_ */
--- /dev/null
+#ifndef _UI_VIEW_C_H_
+#define _UI_VIEW_C_H_
+
+namespace efl_viewmananger
+{
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ typedef bool (*ui_view_lifecycle_load_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_lifecycle_unload_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_lifecycle_pause_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_lifecycle_resume_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_lifecycle_activate_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_lifecycle_deactivate_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_lifecycle_destroy_cb) (ui_view *view, void *data);
+
+ typedef bool (*ui_view_event_rotate_cb) (ui_view *view, int degree, void *data);
+ typedef bool (*ui_view_event_portrait_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_event_landscape_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_event_back_cb) (ui_view *view, void *data);
+ typedef bool (*ui_view_event_menu_cb) (ui_menu *menu, void *data);
+
+ typedef struct
+ {
+ ui_view_lifecycle_load_cb load;
+ ui_view_lifecycle_unload_cb unload;
+ ui_view_lifecycle_pause_cb pause;
+ ui_view_lifecycle_resume_cb resume;
+ ui_view_lifecycle_activate_cb activate;
+ ui_view_lifecycle_deactivate_cb deactivate;
+ ui_view_lifecycle_destroy_cb destroy;
+ } ui_view_lifecycle_callback_s;
+
+ typedef struct
+ {
+ ui_view_event_rotate_cb rotate;
+ ui_view_event_portrait_cb portrait;
+ ui_view_event_landscape_cb landscape;
+ ui_view_event_back_cb back;
+ ui_view_event_menu_cb menu;
+ } ui_view_event_callback_s;
+
+ ui_view* ui_standard_view_create(const char *name);
+ bool ui_view_lifecycle_callbacks_set(ui_view *view,
+ ui_view_lifecycle_callback_s *lifecycle_callback, void *data);
+ Evas_Object* ui_view_base_get(ui_view *view);
+ bool ui_view_content_set(ui_view *view, Evas_Object *content);
+ bool ui_standard_view_content_set(ui_view *view, Evas_Object *content,
+ const char *title, const char *subtitle,
+ Evas_Object *title_left_btn, Evas_Object *title_right_btn);
+ bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text);
+ bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator);
+ bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar);
+ void ui_view_removable_content(ui_view *view, bool remove);
+ bool ui_view_event_callbacks_set(ui_view *view,
+ ui_view_event_callback_s *event_callback, void *data);
+ bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn);
+ bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim);
+
+#ifdef __cplusplus
+}
+#endif
+
+}
+#endif /* _UI_VIEW_C_H_ */
+++ /dev/null
-#ifndef _UI_VIEW_C_H_
-#define _UI_VIEW_C_H_
-
-namespace efl_viewmananger
-{
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- typedef bool (*ui_view_lifecycle_load_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_lifecycle_unload_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_lifecycle_pause_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_lifecycle_resume_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_lifecycle_activate_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_lifecycle_deactivate_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_lifecycle_destroy_cb) (ui_view *view, void *data);
-
- typedef bool (*ui_view_event_rotate_cb) (ui_view *view, int degree, void *data);
- typedef bool (*ui_view_event_portrait_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_event_landscape_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_event_back_cb) (ui_view *view, void *data);
- typedef bool (*ui_view_event_menu_cb) (ui_menu *menu, void *data);
-
- typedef struct
- {
- ui_view_lifecycle_load_cb load;
- ui_view_lifecycle_unload_cb unload;
- ui_view_lifecycle_pause_cb pause;
- ui_view_lifecycle_resume_cb resume;
- ui_view_lifecycle_activate_cb activate;
- ui_view_lifecycle_deactivate_cb deactivate;
- ui_view_lifecycle_destroy_cb destroy;
- } ui_view_lifecycle_callback_s;
-
- typedef struct
- {
- ui_view_event_rotate_cb rotate;
- ui_view_event_portrait_cb portrait;
- ui_view_event_landscape_cb landscape;
- ui_view_event_back_cb back;
- ui_view_event_menu_cb menu;
- } ui_view_event_callback_s;
-
- ui_view* ui_standard_view_create(const char *name);
- bool ui_view_lifecycle_callbacks_set(ui_view *view,
- ui_view_lifecycle_callback_s *lifecycle_callback, void *data);
- Evas_Object* ui_view_base_get(ui_view *view);
- bool ui_view_content_set(ui_view *view, Evas_Object *content);
- bool ui_standard_view_content_set(ui_view *view, Evas_Object *content,
- const char *title, const char *subtitle,
- Evas_Object *title_left_btn, Evas_Object *title_right_btn);
- bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text);
- bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator);
- bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar);
- void ui_view_removable_content(ui_view *view, bool remove);
- bool ui_view_event_callbacks_set(ui_view *view,
- ui_view_event_callback_s *event_callback, void *data);
- bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn);
- bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim);
-
-#ifdef __cplusplus
-}
-#endif
-
-}
-#endif /* _UI_VIEW_C_H_ */
--- /dev/null
+#ifndef _UI_VIEWMGR_C_H_
+#define _UI_VIEWMGR_C_H_
+
+using namespace efl_viewmananger;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ //TODO
+ #define UI_VIEWMGR_VIEW_DEACTIVATE() (ui_app::get_instance()->get_viewmgr())->deactivate()
+ #define UI_VIEWMGR_VIEW_PUSH(x) (ui_app::get_instance()->get_viewmgr())->push_view(x)
+ #define UI_VIEWMGR_VIEW_POP() (ui_app::get_instance()->get_viewmgr())->pop_view()
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UI_VIEWMGR_C_H_ */
+++ /dev/null
-#ifndef _UI_VIEWMGR_C_H_
-#define _UI_VIEWMGR_C_H_
-
-using namespace efl_viewmananger;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- //TODO
- #define UI_VIEWMGR_VIEW_DEACTIVATE() (ui_app::get_instance()->get_viewmgr())->deactivate()
- #define UI_VIEWMGR_VIEW_PUSH(x) (ui_app::get_instance()->get_viewmgr())->push_view(x)
- #define UI_VIEWMGR_VIEW_POP() (ui_app::get_instance()->get_viewmgr())->pop_view()
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UI_VIEWMGR_C_H_ */
#include "ui_menu.h"
#include "ui_popup.h"
#include "ui_app.h"
-#include "c/ui_app_c.h"
-#include "c/ui_menu_c.h"
-#include "c/ui_popup_c.h"
-#include "c/ui_viewmgr_c.h"
-#include "c/ui_view_c.h"
+#include "c/ui_app.h"
+#include "c/ui_menu.h"
+#include "c/ui_popup.h"
+#include "c/ui_viewmgr.h"
+#include "c/ui_view.h"
#define UI_VIEWMGR (ui_app::get_instance()->get_viewmgr())
efl/mobile/ui_standard_view.cpp
efl/mobile/ui_key_listener.cpp
efl/mobile/ui_viewmgr.cpp
- efl/mobile/c/ui_app_c.cpp
- efl/mobile/c/ui_menu_c.cpp
- efl/mobile/c/ui_popup_c.cpp
- efl/mobile/c/ui_view_c.cpp
+ efl/mobile/c/ui_app.cpp
+ efl/mobile/c/ui_menu.cpp
+ efl/mobile/c/ui_popup.cpp
+ efl/mobile/c/ui_view.cpp
)
ADD_LIBRARY(${LIBNAME} SHARED ${SRCS})
--- /dev/null
+#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/ui_app.h"
+
+using namespace efl_viewmanager;
+
+extern "C" {
+ int ui_app_init(const char *pkg, const char *locale_dir)
+ {
+ //TODO
+ return 1;
+ }
+
+ int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data)
+ {
+ //TODO
+ return 1;
+ }
+}
+++ /dev/null
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
-#include "../../../../include/efl/mobile/c/ui_app_c.h"
-
-using namespace efl_viewmanager;
-
-extern "C" {
- int ui_app_init(const char *pkg, const char *locale_dir)
- {
- //TODO
- return 1;
- }
-
- int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data)
- {
- //TODO
- return 1;
- }
-}
--- /dev/null
+#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/ui_menu.h"
+
+using namespace efl_viewmanager;
+
+extern "C" {
+ bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup)
+ {
+ //TODO
+ return 1;
+ }
+}
+
+++ /dev/null
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
-#include "../../../../include/efl/mobile/c/ui_menu_c.h"
-
-using namespace efl_viewmanager;
-
-extern "C" {
- bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup)
- {
- //TODO
- return 1;
- }
-}
-
--- /dev/null
+#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/ui_popup.h"
+
+using namespace efl_viewmanager;
+
+extern "C" {
+ bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_popup_activate(ui_popup *popup)
+ {
+ //TODO
+ return 1;
+ }
+
+ void ui_popup_del(ui_popup *popup)
+ {
+ //TODO
+ }
+}
+++ /dev/null
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
-#include "../../../../include/efl/mobile/c/ui_popup_c.h"
-
-using namespace efl_viewmanager;
-
-extern "C" {
- bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup)
- {
- //TODO
- return 1;
- }
-
- bool ui_popup_activate(ui_popup *popup)
- {
- //TODO
- return 1;
- }
-
- void ui_popup_del(ui_popup *popup)
- {
- //TODO
- }
-}
--- /dev/null
+#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/ui_view.h"
+
+using namespace efl_viewmanager;
+
+extern "C" {
+ ui_view* ui_standard_view_create(const char *name)
+ {
+ //TODO
+ return NULL;
+ }
+
+ bool ui_view_lifecycle_callbacks_set(ui_view *view,
+ ui_view_lifecycle_callback_s *lifecycle_callback, void *data)
+ {
+ //TODO
+ return 1;
+ }
+ Evas_Object* ui_view_base_get(ui_view *view)
+ {
+ //TODO
+ return NULL;
+ }
+
+ bool ui_view_content_set(ui_view *view, Evas_Object *content)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_standard_view_content_set(ui_view *view, Evas_Object *content,
+ const char *title, const char *subtitle,
+ Evas_Object *title_left_btn, Evas_Object *title_right_btn)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar)
+ {
+ //TODO
+ return 1;
+ }
+
+ void ui_view_removable_content(ui_view *view, bool remove)
+ {
+ //TODO
+ }
+
+ bool ui_view_event_callbacks_set(ui_view *view,
+ ui_view_event_callback_s *event_callback, void *data)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn)
+ {
+ //TODO
+ return 1;
+ }
+
+ bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim)
+ {
+ //TODO
+ return 1;
+ }
+}
+++ /dev/null
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
-#include "../../../../include/efl/mobile/c/ui_view_c.h"
-
-using namespace efl_viewmanager;
-
-extern "C" {
- ui_view* ui_standard_view_create(const char *name)
- {
- //TODO
- return NULL;
- }
-
- bool ui_view_lifecycle_callbacks_set(ui_view *view,
- ui_view_lifecycle_callback_s *lifecycle_callback, void *data)
- {
- //TODO
- return 1;
- }
- Evas_Object* ui_view_base_get(ui_view *view)
- {
- //TODO
- return NULL;
- }
-
- bool ui_view_content_set(ui_view *view, Evas_Object *content)
- {
- //TODO
- return 1;
- }
-
- bool ui_standard_view_content_set(ui_view *view, Evas_Object *content,
- const char *title, const char *subtitle,
- Evas_Object *title_left_btn, Evas_Object *title_right_btn)
- {
- //TODO
- return 1;
- }
-
- bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text)
- {
- //TODO
- return 1;
- }
-
- bool ui_view_indicator_set(ui_view *view, ui_view_indicator indicator)
- {
- //TODO
- return 1;
- }
-
- bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar)
- {
- //TODO
- return 1;
- }
-
- void ui_view_removable_content(ui_view *view, bool remove)
- {
- //TODO
- }
-
- bool ui_view_event_callbacks_set(ui_view *view,
- ui_view_event_callback_s *event_callback, void *data)
- {
- //TODO
- return 1;
- }
-
- bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn)
- {
- //TODO
- return 1;
- }
-
- bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim)
- {
- //TODO
- return 1;
- }
-}