c/ui_viewmgr_app: renamed api prefix from ui_tizen_app to ui_application.

once more changed.

Change-Id: Iab248aad8e0d7365474fcb4777ff340ca05206d2

diff --git a/src/examples/efl/c/main.cpp b/src/examples/efl/c/main.cpp
index 60cea3ae78929f5204699f5674758b353c05a049..99d9886734b85b9e0bc2c3968fc34ed690a5cc4a 100644 (file)
--- a/src/examples/efl/c/main.cpp
+++ b/src/examples/efl/c/main.cpp
@@ -26,7 +26,7 @@ main(int argc, char *argv[])
        ui_app_lifecycle_callback_s lifecycle_callback = {0, };
 
        //Initialize ui_app. ui_app initializes basic resources including ui_viewmgr internally.
-       if (!(ret = ui_tizen_app_init(PACKAGE, LOCALE_DIR)))
+       if (!(ret = ui_application_init(PACKAGE, LOCALE_DIR)))
        {
                dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_init() is failed. err = %d", ret);
                return ret;
@@ -37,14 +37,14 @@ main(int argc, char *argv[])
        lifecycle_callback.app_control = app_control;
 
        //Run ui_app. Now it requests to run an application mainloop.
-       if (!(ret = ui_tizen_app_run(argc, argv, &lifecycle_callback, NULL)))
+       if (!(ret = ui_application_run(argc, argv, &lifecycle_callback, NULL)))
        {
                dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_run() is failed. err = %d", ret);
                return ret;
        }
 
        //Terminate ui_app. Remove all ui_app resources.
-       if (!(ret = ui_tizen_app_term()))
+       if (!(ret = ui_application_term()))
        {
                dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_term() is failed. err = %d", ret);
                return ret;

diff --git a/src/include/efl/mobile/c/ui_application.h b/src/include/efl/mobile/c/ui_application.h
new file mode 100644 (file)
index 0000000..4d4de90
--- /dev/null
+++ b/src/include/efl/mobile/c/ui_application.h
@@ -0,0 +1,51 @@
+#ifndef _UI_TIZEN_APP_CAPI_H_
+#define _UI_TIZEN_APP_CAPI_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  @brief Initialize ui_application.
+ *
+ *  This function initializes ui_application and ui_viewmgr.
+ *
+ *  @param pkg The name of package.
+ *  @param loale_dir The path of locale directory.
+ *
+ *  @return @c true if it succeeds, @c false otherwise.
+ *
+ *  @warning Before exit application, call ui_application_term()
+ *
+ *  @see ui_application_term()
+ */
+bool ui_application_init(const char *pkg, const char *locale_dir);
+
+/**
+ *  @brief Run ui_application. This triggers application main loops.
+ *
+ *  @note This is wrapping ui_app_main() function.
+ *
+ *  @param argc The argument count.
+ *  @param argv The argument vector.
+ *  @param lifecycle_callback The set of callback functions to handle application lifecycle events.
+ *  @param user_data The user data to be passed to the gieven @p life_cycle_callback functions.
+ *
+ *  @return 0 on success, otherwise a negative error value
+ */
+int ui_application_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *user_data);
+
+/**
+ *  @brief This is ui_application destructor.
+ *
+ *  @return @c true if it succeeds, @c false otherwise.
+ *
+ *  @see ui_application_init()
+ */
+bool ui_application_term(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UI_TIZEN_APP_CAPI_H_ */

diff --git a/src/include/efl/mobile/c/ui_mobile_viewmanager.h b/src/include/efl/mobile/c/ui_mobile_viewmanager.h
index 4838f4a0c38c5e170c668d1bb41413521b64084a..3dc470a2f507d839b91611490cbf6963266af9b5 100644 (file)
--- a/src/include/efl/mobile/c/ui_mobile_viewmanager.h
+++ b/src/include/efl/mobile/c/ui_mobile_viewmanager.h
@@ -39,7 +39,7 @@
 //FIXME: better way?
 #include "../../../interface/ui_iface_types.h"
 
-#include "ui_tizen_app.h"
+#include "ui_application.h"
 #include "ui_menu.h"
 #include "ui_popup.h"
 #include "ui_viewmgr.h"

diff --git a/src/include/efl/mobile/c/ui_tizen_app.h b/src/include/efl/mobile/c/ui_tizen_app.h
deleted file mode 100644 (file)
index 3d651ec..0000000
--- a/src/include/efl/mobile/c/ui_tizen_app.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _UI_TIZEN_APP_CAPI_H_
-#define _UI_TIZEN_APP_CAPI_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @brief Initialize ui_tizen_app.
- *
- *  This function initializes ui_tizen_app and ui_viewmgr.
- *
- *  @param pkg The name of package.
- *  @param loale_dir The path of locale directory.
- *
- *  @return @c true if it succeeds, @c false otherwise.
- *
- *  @warning Before exit application, call ui_tizen_app_term()
- *
- *  @see ui_tizen_app_term()
- */
-bool ui_tizen_app_init(const char *pkg, const char *locale_dir);
-
-/**
- *  @brief Run ui_tizen_app. This triggers application main loops.
- *
- *  @note This is wrapping ui_app_main() function.
- *
- *  @param argc The argument count.
- *  @param argv The argument vector.
- *  @param lifecycle_callback The set of callback functions to handle application lifecycle events.
- *  @param user_data The user data to be passed to the gieven @p life_cycle_callback functions.
- *
- *  @return 0 on success, otherwise a negative error value
- */
-int ui_tizen_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *user_data);
-
-/**
- *  @brief This is ui_tizen_app destructor.
- *
- *  @return @c true if it succeeds, @c false otherwise.
- *
- *  @see ui_tizen_app_init()
- */
-bool ui_tizen_app_term(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UI_TIZEN_APP_CAPI_H_ */

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 949c7687b7a6c9154fe0a8f08c8b1823fb3700bf..bd42cdf405302d38e3aa43b7823cf82da67b41d5 100644 (file)
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(SRCS
      efl/mobile/ui_standard_view.cpp
      efl/mobile/ui_key_listener.cpp
      efl/mobile/ui_viewmgr.cpp
-     efl/mobile/c/ui_tizen_app.cpp
+     efl/mobile/c/ui_application.cpp
      efl/mobile/c/ui_menu.cpp
      efl/mobile/c/ui_popup.cpp
      efl/mobile/c/ui_view.cpp

diff --git a/src/lib/efl/mobile/c/ui_application.cpp b/src/lib/efl/mobile/c/ui_application.cpp
new file mode 100644 (file)
index 0000000..05d27d5
--- /dev/null
+++ b/src/lib/efl/mobile/c/ui_application.cpp
@@ -0,0 +1,110 @@
+#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/ui_mobile_viewmanager.h"
+
+using namespace efl_viewmanager;
+
+class ui_app_capi : public ui_app
+{
+public:
+       ui_app_lifecycle_callback_s capi_lifecycle_callback;
+       void *data;
+
+       bool on_create()
+       {
+               if (!ui_app::on_create()) return false;
+
+               if (!this->capi_lifecycle_callback.create) return false;
+               return this->capi_lifecycle_callback.create(this->data);
+       }
+
+       void on_terminate()
+       {
+               ui_app::on_terminate();
+
+               if (!this->capi_lifecycle_callback.terminate) return;
+               this->capi_lifecycle_callback.terminate(this->data);
+       }
+
+       void on_pause()
+       {
+               ui_app::on_pause();
+
+               if (!this->capi_lifecycle_callback.pause) return;
+               this->capi_lifecycle_callback.pause(this->data);
+       }
+
+       void on_resume()
+       {
+               ui_app::on_resume();
+
+               if (!this->capi_lifecycle_callback.resume) return;
+               this->capi_lifecycle_callback.resume(this->data);
+       }
+
+       void on_control(app_control_h app_control)
+       {
+               ui_app::on_control(app_control);
+
+               if (!this->capi_lifecycle_callback.app_control) return;
+               this->capi_lifecycle_callback.app_control(app_control, this->data);
+       }
+
+       ui_app_capi(const char *pkg, const char *locale_dir)
+                       : ui_app(pkg, locale_dir), data(NULL)
+       {
+       }
+
+       ~ui_app_capi()
+       {
+       }
+
+       int run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *user_data)
+       {
+               if (lifecycle_callback)
+               {
+                       this->capi_lifecycle_callback = *lifecycle_callback;
+               }
+
+               this->data = user_data;
+
+               return ui_app::run(argc, argv);
+       }
+};
+
+static ui_app_capi *g_app = NULL;
+
+bool ui_application_init(const char *pkg, const char *locale_dir)
+{
+       ui_app_capi *app = g_app;
+       if (app) return true;
+
+       app = new ui_app_capi(pkg, locale_dir);
+       if (!app)
+       {
+               LOGE("Failed to create new ui_app_capi()!");
+               return false;
+       }
+
+       g_app = app;
+
+       return true;
+}
+
+int ui_application_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *user_data)
+{
+       ui_app_capi *app = g_app;
+       if (!app) return -1;
+
+       return app->run(argc, argv, lifecycle_callback, user_data);
+}
+
+bool ui_application_term(void)
+{
+       ui_app_capi *app = g_app;
+       if (app) delete (app);
+       else return false;
+
+       g_app = NULL;
+
+       return true;
+}

diff --git a/src/lib/efl/mobile/c/ui_tizen_app.cpp b/src/lib/efl/mobile/c/ui_tizen_app.cpp
deleted file mode 100644 (file)
index b522d6f..0000000
--- a/src/lib/efl/mobile/c/ui_tizen_app.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
-#include "../../../../include/efl/mobile/c/ui_mobile_viewmanager.h"
-
-using namespace efl_viewmanager;
-
-class ui_app_capi : public ui_app
-{
-public:
-       ui_app_lifecycle_callback_s capi_lifecycle_callback;
-       void *data;
-
-       bool on_create()
-       {
-               if (!ui_app::on_create()) return false;
-
-               if (!this->capi_lifecycle_callback.create) return false;
-               return this->capi_lifecycle_callback.create(this->data);
-       }
-
-       void on_terminate()
-       {
-               ui_app::on_terminate();
-
-               if (!this->capi_lifecycle_callback.terminate) return;
-               this->capi_lifecycle_callback.terminate(this->data);
-       }
-
-       void on_pause()
-       {
-               ui_app::on_pause();
-
-               if (!this->capi_lifecycle_callback.pause) return;
-               this->capi_lifecycle_callback.pause(this->data);
-       }
-
-       void on_resume()
-       {
-               ui_app::on_resume();
-
-               if (!this->capi_lifecycle_callback.resume) return;
-               this->capi_lifecycle_callback.resume(this->data);
-       }
-
-       void on_control(app_control_h app_control)
-       {
-               ui_app::on_control(app_control);
-
-               if (!this->capi_lifecycle_callback.app_control) return;
-               this->capi_lifecycle_callback.app_control(app_control, this->data);
-       }
-
-       ui_app_capi(const char *pkg, const char *locale_dir)
-                       : ui_app(pkg, locale_dir), data(NULL)
-       {
-       }
-
-       ~ui_app_capi()
-       {
-       }
-
-       int run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *user_data)
-       {
-               if (lifecycle_callback)
-               {
-                       this->capi_lifecycle_callback = *lifecycle_callback;
-               }
-
-               this->data = user_data;
-
-               return ui_app::run(argc, argv);
-       }
-};
-
-static ui_app_capi *g_app = NULL;
-
-bool ui_tizen_app_init(const char *pkg, const char *locale_dir)
-{
-       ui_app_capi *app = g_app;
-       if (app) return true;
-
-       app = new ui_app_capi(pkg, locale_dir);
-       if (!app)
-       {
-               LOGE("Failed to create new ui_app_capi()!");
-               return false;
-       }
-
-       g_app = app;
-
-       return true;
-}
-
-int ui_tizen_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *lifecycle_callback, void *user_data)
-{
-       ui_app_capi *app = g_app;
-       if (!app) return -1;
-
-       return app->run(argc, argv, lifecycle_callback, user_data);
-}
-
-bool ui_tizen_app_term(void)
-{
-       ui_app_capi *app = g_app;
-       if (app) delete (app);
-       else return false;
-
-       g_app = NULL;
-
-       return true;
-}