remove vconf.h dependency

Change-Id: Ice4ccce672669dff7f63e4e42b48076fca5ad116

diff --git a/src/app/FApp_AppImpl.cpp b/src/app/FApp_AppImpl.cpp
index edf7e4d..8dd78e2 100644 (file)
--- a/src/app/FApp_AppImpl.cpp
+++ b/src/app/FApp_AppImpl.cpp
@@ -140,7 +140,6 @@ _AppImpl::Construct(const IList* pArgs)
        return E_SUCCESS;
 }
 
-
 result
 _AppImpl::Execute(_IAppImpl* pIAppImpl)
 {
@@ -1387,8 +1386,10 @@ _AppImpl::IsTerminationRequested(void)
        return __isTerminationRequested;
 }
 
+typedef void (*cbForVconf)(keynode_t* node, void *pData);
+
 void
-_AppImpl::OnPowerOffNotiReceived(keynode_t* node, void* user_data)
+_AppImpl::OnPowerOffNotiReceived(void* node, void* user_data)
 {
        int value = -1;
        if (!vconf_get_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, &value))
@@ -1397,7 +1398,7 @@ _AppImpl::OnPowerOffNotiReceived(keynode_t* node, void* user_data)
                {
                        SysLog(NID_APP, "Application is being terminated by power off.");
 
-                       if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, _AppImpl::OnPowerOffNotiReceived))
+                       if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, (cbForVconf)_AppImpl::OnPowerOffNotiReceived))
                        {
                                SysLog(NID_APP, "Fail to ignore vconf for key(%s)", VCONFKEY_SYSMAN_POWER_OFF_STATUS);
                        }

diff --git a/src/app/FApp_Aul.cpp b/src/app/FApp_Aul.cpp
index 6846198..0487402 100644 (file)
--- a/src/app/FApp_Aul.cpp
+++ b/src/app/FApp_Aul.cpp
@@ -203,13 +203,14 @@ _Aul::SetOomAdj(int pid, int adj)
        return r;
 }
 
+typedef void (* cbForVconf)(keynode_t* node, void *pData);
 
 result
-_Aul::SetPowerOffNotiListener( void (*powerOffCb)(keynode_t* node, void *pData), void *pData)
+_Aul::SetPowerOffNotiListener( void (*powerOffCb)(void* node, void *pData), void *pData)
 {
 
 #if 1
-       int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, powerOffCb, pData);
+       int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, (cbForVconf)powerOffCb, pData);
        SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It failed to set power off");
 #else
        int heyFd = heynoti_init();

diff --git a/src/app/inc/FApp_AppImpl.h b/src/app/inc/FApp_AppImpl.h
index 1b83c5e..e5e482a 100644 (file)
--- a/src/app/inc/FApp_AppImpl.h
+++ b/src/app/inc/FApp_AppImpl.h
@@ -22,8 +22,6 @@
 #ifndef _FAPP_INTERNAL_APP_IMPL_H_
 #define _FAPP_INTERNAL_APP_IMPL_H_
 
-#include <vconf.h>
-
 #include <FAppApp.h>
 #include <FSysBattery.h>
 #include <FBaseRtIEventListener.h>
@@ -248,7 +246,7 @@ public:
 
        bool IsForcedTermination(void);
 
-       static void OnPowerOffNotiReceived(_keynode_t* node, void* pData);
+       static void OnPowerOffNotiReceived(void* node, void* pData);
 
 private:
        /**

diff --git a/src/app/inc/FApp_Aul.h b/src/app/inc/FApp_Aul.h
index 9fdcde2..43184ba 100644 (file)
--- a/src/app/inc/FApp_Aul.h
+++ b/src/app/inc/FApp_Aul.h
@@ -23,7 +23,6 @@
 #define _FAPP_INTERNAL_AUL_H_
 
 #include <appsvc/appsvc.h>
-#include <vconf.h>
 #include <FOspConfig.h>
 #include <FAppTypes.h>
 
@@ -55,7 +54,7 @@ public:
 
        static result SetOomAdj(int pid, int adj);
 
-       static result SetPowerOffNotiListener(void (*powerOffCb)(keynode_t* node, void *pData), void *pData);
+       static result SetPowerOffNotiListener(void (*powerOffCb)(void* node, void *pData), void *pData);
 
        static int GetAppType(const Tizen::Base::String& category);