tizen 2.4 release

[framework/web/wrt-commons.git] / modules / core / include / dpl / application.h

diff --git a/modules_wearable/core/include/dpl/application.h b/modules/core/include/dpl/application.h
similarity index 90%
rename from modules_wearable/core/include/dpl/application.h
rename to modules/core/include/dpl/application.h
index d4d9754..c358e8a 100644 (file)
--- a/modules_wearable/core/include/dpl/application.h
+++ b/modules/core/include/dpl/application.h
@@ -25,7 +25,7 @@
 #include <dpl/exception.h>
 #include <dpl/framework_efl.h>
 #include <dpl/framework_appcore.h>
-#include <dpl/atomic.h>
+#include <atomic>
 #include <string>
 
 namespace DPL {
@@ -40,13 +40,6 @@ class Application
         DECLARE_EXCEPTION_TYPE(Base, FrameworkError)
     };
 
-  private:
-    static int app_create(void *data);
-    static int app_terminate(void *data);
-    static int app_pause(void *data);
-    static int app_resume(void *data);
-    static int app_reset(bundle *b, void *data);
-
   protected:
     int m_argc;
     char **m_argv;
@@ -54,6 +47,12 @@ class Application
 
     bool m_mainWindowVisible;
 
+    static bool app_create(void *data);
+    static void app_terminate(void *data);
+    static void app_pause(void *data);
+    static void app_resume(void *data);
+    static void app_control(app_control_h app_control, void *data);
+
     virtual void OnCreate();
     virtual void OnStart();
     virtual void OnStop();
@@ -104,7 +103,7 @@ class ApplicationExt : public Application
     virtual void Quit();
 
   private:
-    static DPL::Atomic m_useCount;
+    static std::atomic<int> m_useCount;
 };
 } // namespace DPL