header depdency correction

Change-Id: I3c70cae40e1402926f4e6111a34ac9d1a863f751
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/inc/FIoFileLock.h b/inc/FIoFileLock.h
index e781155..3e6c2b5 100644 (file)
--- a/inc/FIoFileLock.h
+++ b/inc/FIoFileLock.h
@@ -23,6 +23,8 @@
 #ifndef _FIO_FILE_LOCK_H_
 #define _FIO_FILE_LOCK_H_
 
+#include <FBaseObject.h>
+
 namespace Tizen { namespace Io
 {
 

diff --git a/src/app/FAppDataControlProviderManager.cpp b/src/app/FAppDataControlProviderManager.cpp
index 3d4f630..7af1756 100644 (file)
--- a/src/app/FAppDataControlProviderManager.cpp
+++ b/src/app/FAppDataControlProviderManager.cpp
@@ -24,6 +24,7 @@
 #include <FBaseDataType.h>
 #include <FBaseString.h>
 #include <FBaseColIList.h>
+#include <FBaseColIMap.h>
 #include <FAppDataControlProviderManager.h>
 #include <FIoDbEnumerator.h>
 

diff --git a/src/app/FApp_AppArg.cpp b/src/app/FApp_AppArg.cpp
index 9109aad..843b47f 100644 (file)
--- a/src/app/FApp_AppArg.cpp
+++ b/src/app/FApp_AppArg.cpp
@@ -34,9 +34,10 @@
 #include <FBaseInteger.h>
 #include <FBaseColArrayList.h>
 #include <FBaseColHashMap.h>
+#include <FBaseByteBuffer.h>
 #include <FBaseUtilStringTokenizer.h>
-
 #include <FBaseSysLog.h>
+
 #include <FBase_StringConverter.h>
 
 #include "FApp_MapDataControlImpl.h"

diff --git a/src/app/FApp_AppControlEvent.cpp b/src/app/FApp_AppControlEvent.cpp
index a1f5e4b..5843165 100644 (file)
--- a/src/app/FApp_AppControlEvent.cpp
+++ b/src/app/FApp_AppControlEvent.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <FBaseSysLog.h>
+#include <FBaseColIMap.h>
 
 #include "FApp_AppControlEvent.h"
 #include "FApp_AppControlEventArg.h"

diff --git a/src/app/FApp_AppControlManager.cpp b/src/app/FApp_AppControlManager.cpp
index df4f4cc..4e264ab 100644 (file)
--- a/src/app/FApp_AppControlManager.cpp
+++ b/src/app/FApp_AppControlManager.cpp
@@ -101,8 +101,7 @@ _AppControlManager::_AppControlManager(void)
        __appControlEvent.Construct();
        __appControlEvent.AddListener(*dynamic_cast<_IAppControlSysEventListener*>(this));
        __listenerList.Construct();
-       __pAppControlResponseEventContainer = new (std::nothrow)HashMapT<int, _AppControlResponseEvent*>;
-       __pAppControlResponseEventContainer->Construct();
+       __appControlResponseEventContainer.Construct();
        __appControlResponseEventList.Construct();
 }
 
@@ -118,18 +117,14 @@ _AppControlManager::~_AppControlManager(void)
                {
                        int reqId;
                        pEnum->GetCurrent(reqId);
-                       if (__pAppControlResponseEventContainer != null)
-                       {
-                               _AppControlResponseEvent* pResponseEvent = null;
-                               __pAppControlResponseEventContainer->GetValue(reqId, pResponseEvent);
-                               delete pResponseEvent;
+                       _AppControlResponseEvent* pResponseEvent = null;
+                       __appControlResponseEventContainer.GetValue(reqId, pResponseEvent);
+                       delete pResponseEvent;
 
-                               __pAppControlResponseEventContainer->Remove(reqId);
-                               SysLog(NID_APP, "pResponseEvent gets deleted. reqId(%d)", reqId);
-                       }
+                       __appControlResponseEventContainer.Remove(reqId);
+                       SysLog(NID_APP, "pResponseEvent gets deleted. reqId(%d)", reqId);
                }
        }
-       delete __pAppControlResponseEventContainer;
        delete pEnum;
 }
 
@@ -219,7 +214,7 @@ _AppControlManager::OnAppControlEventReceivedN(int reqId, const AppId& appId, co
                SysLog(NID_APP, "Invoking callback 0x%x.", pListener);
 
                _AppControlResponseEvent* pResponseEvent = null;
-               __pAppControlResponseEventContainer->GetValue(reqId, pResponseEvent);
+               __appControlResponseEventContainer.GetValue(reqId, pResponseEvent);
                SysLog(NID_APP, "StartResponseReceived Request Id(%d), ResponseEvent 0x%x.", reqId, pResponseEvent);
                if (pResponseEvent != null)
                {
@@ -328,7 +323,7 @@ _AppControlManager::OnAppControlEventReceivedN(int reqId, int res, const IMap* p
                        {
                                _AppControlResponseEvent* pResponseEvent = null;
                                int responseEventRequestId = RESPONSE_EVENT_REQID_MAGIC + reqId;
-                               __pAppControlResponseEventContainer->GetValue(responseEventRequestId, pResponseEvent);
+                               __appControlResponseEventContainer.GetValue(responseEventRequestId, pResponseEvent);
 
                                if (pResponseEvent != null)
                                {
@@ -383,7 +378,7 @@ _AppControlManager::SendAppControlEvent(IEventArg& arg)
 Tizen::Base::Collection::IMapT<int,_AppControlResponseEvent*>*
 _AppControlManager::GetAppControlResponseEventContainer(void)
 {
-       return __pAppControlResponseEventContainer;
+       return &__appControlResponseEventContainer;
 }
 
 
@@ -738,6 +733,7 @@ _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, v
        SysLog(NID_APP, "App: %ls.", appId.GetPointer());
 
        String actualAppId = appId;
+#if 0
        if (appId.GetLength() == 10)
        {
                const String& execName = _PackageManagerImpl::GetInstance()->GetDefaultAppExecutableName(appId);
@@ -748,6 +744,7 @@ _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, v
                        actualAppId.Append(execName);
                }
        }
+#endif
 
        pArg->UpdateRequestId(req);
 
@@ -763,7 +760,8 @@ _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, v
 
        actualAppId.SubString(0, 10, tempId);
 
-       if (_IsDefaultApplication(tempId, appId))
+       const int type = _AppInfo::GetAppType();
+       if ((!(type & _APP_TYPE_SERVICE_APP)) && _IsDefaultApplication(tempId, appId))
        {
                tempId += L'.';
                tempId += L"_AppControl";

diff --git a/src/app/FApp_AppMessageImpl.cpp b/src/app/FApp_AppMessageImpl.cpp
index e3765ce..659ad7f 100644 (file)
--- a/src/app/FApp_AppMessageImpl.cpp
+++ b/src/app/FApp_AppMessageImpl.cpp
@@ -27,7 +27,9 @@
 #include <FBaseSysLog.h>
 #include <FBaseString.h>
 #include <FBaseColIList.h>
+#include <FBaseColIMap.h>
 #include <FBaseColIEnumerator.h>
+#include <FBaseColArrayList.h>
 
 #include <FBase_StringConverter.h>
 

diff --git a/src/app/FApp_MapDataControlImpl.cpp b/src/app/FApp_MapDataControlImpl.cpp
index 7ee27e4..c34e74e 100644 (file)
--- a/src/app/FApp_MapDataControlImpl.cpp
+++ b/src/app/FApp_MapDataControlImpl.cpp
@@ -27,11 +27,11 @@
 #include <FBaseInteger.h>
 #include <FBaseString.h>
 #include <FBaseColLinkedList.h>
+#include <FBaseColArrayList.h>
 #include <FBaseRtIEventArg.h>
 #include <FIoFile.h>
 #include <FAppMapDataControl.h>
 #include <FAppIMapDataControlResponseListener.h>
-
 #include <FBaseSysLog.h>
 
 #include "FApp_AppControlManager.h"

diff --git a/src/app/inc/FApp_AppControlManager.h b/src/app/inc/FApp_AppControlManager.h
index b02d6af..38c0246 100644 (file)
--- a/src/app/inc/FApp_AppControlManager.h
+++ b/src/app/inc/FApp_AppControlManager.h
@@ -25,12 +25,11 @@
 #include <app_service.h>
 
 #include <FOspConfig.h>
-#include <FBaseColIListT.h>
-#include <FBaseColIList.h>
+#include <FBaseColArrayListT.h>
 #include <FBaseObject.h>
 #include <FBaseString.h>
 #include <FBaseRtIEventListener.h>
-#include <FAppAppManager.h>
+#include <FAppTypes.h>
 #include <FAppIAppControlEventListener.h>
 #include <FAppIAppControlResponseListener.h>
 #include <FBaseSysLog.h>
@@ -53,6 +52,7 @@ class _LibraryImpl;
 namespace Collection
 {
 class IMap;
+class IList;
 }
 }}
 namespace Tizen { namespace Io
@@ -305,12 +305,9 @@ private:
        _RequestManagerT<_ResultInfo> __resultManager;
        Tizen::Base::Collection::ArrayListT<void*> __listenerList;
 
-       Tizen::Base::Collection::HashMapT<int, _AppControlResponseEvent*>* __pAppControlResponseEventContainer;
+       Tizen::Base::Collection::HashMapT<int, _AppControlResponseEvent*> __appControlResponseEventContainer;
        Tizen::Base::Collection::ArrayListT<int> __appControlResponseEventList;
-       //friend class AppManager;
        friend class _AppControlImpl;
-       //friend class _SqlDataControlImpl;
-       //friend class _MapDataControlImpl;
        friend class _DataControlProviderManagerImpl;
        friend class _AppControlProviderManagerImpl;
        friend class Tizen::Io::_DataControlResultSetImpl;

diff --git a/src/app/inc/FApp_AppMessageImpl.h b/src/app/inc/FApp_AppMessageImpl.h
index b67f3df..c6f417d 100644 (file)
--- a/src/app/inc/FApp_AppMessageImpl.h
+++ b/src/app/inc/FApp_AppMessageImpl.h
@@ -31,6 +31,8 @@ typedef struct _bundle_t bundle;
 
 
 namespace Tizen { namespace Base { namespace Collection { class IList; } } }
+namespace Tizen { namespace Base { namespace Collection { class IMap; } } }
+namespace Tizen { namespace Base { namespace Collection { class ArrayList; } } }
 
 namespace Tizen { namespace App
 {

diff --git a/src/base/collection/FBaseColLinkedList.cpp b/src/base/collection/FBaseColLinkedList.cpp
index b90abba..585bd40 100644 (file)
--- a/src/base/collection/FBaseColLinkedList.cpp
+++ b/src/base/collection/FBaseColLinkedList.cpp
@@ -21,6 +21,7 @@
 #include <new>
 #include <unique_ptr.h>
 #include <FBaseColLinkedList.h>
+#include <FBaseColArrayList.h>
 #include <FBaseResult.h>
 #include <FBaseSysLog.h>
 

diff --git a/src/io/FIo_MessagePortProxy.cpp b/src/io/FIo_MessagePortProxy.cpp
index 2ba140e..859ef0b 100644 (file)
--- a/src/io/FIo_MessagePortProxy.cpp
+++ b/src/io/FIo_MessagePortProxy.cpp
@@ -27,6 +27,8 @@
 #include <message-port.h>
 
 #include <FBaseSysLog.h>
+#include <FBaseByteBuffer.h>
+
 #include <FBase_StringConverter.h>
 #include <FApp_AppInfo.h>
 

diff --git a/src/io/inc/FIo_DataSetEnumeratorImpl.h b/src/io/inc/FIo_DataSetEnumeratorImpl.h
index c969666..d574780 100755 (executable)
--- a/src/io/inc/FIo_DataSetEnumeratorImpl.h
+++ b/src/io/inc/FIo_DataSetEnumeratorImpl.h
@@ -36,6 +36,10 @@ namespace Tizen { namespace Base
 class String;
 class ByteBuffer;
 class DateTime;
+namespace Collection
+{
+class ArrayList;
+}
 }}
 
 namespace Tizen { namespace Io

diff --git a/src/security/FSecPrivacyInfo.cpp b/src/security/FSecPrivacyInfo.cpp
index 9dc7b05..2012da3 100755 (executable)
--- a/src/security/FSecPrivacyInfo.cpp
+++ b/src/security/FSecPrivacyInfo.cpp
@@ -21,12 +21,14 @@
 
 #include <new>
 #include <unique_ptr.h>
-#include <FSecPrivacyInfo.h>
+
 #include <FBaseSysLog.h>
+#include <FBaseString.h>
+#include <FSecPrivacyInfo.h>
+
 #include "FSec_PrivacyInfoImpl.h"
 
 using namespace Tizen::Base;
-using namespace Tizen::Base::Collection;
 using namespace Tizen::Security;
 
 namespace Tizen { namespace Security

diff --git a/src/security/FSecPrivilegeInfo.cpp b/src/security/FSecPrivilegeInfo.cpp
index 1fe92d1..16f32f9 100755 (executable)
--- a/src/security/FSecPrivilegeInfo.cpp
+++ b/src/security/FSecPrivilegeInfo.cpp
@@ -28,7 +28,6 @@
 #include "FSec_PrivilegeInfoImpl.h"
 
 using namespace Tizen::Base;
-using namespace Tizen::Base::Collection;
 using namespace Tizen::Security;
 
 namespace Tizen { namespace Security

diff --git a/src/security/FSec_PrivacyInfoImpl.cpp b/src/security/FSec_PrivacyInfoImpl.cpp
index d436b14..3458759 100755 (executable)
--- a/src/security/FSec_PrivacyInfoImpl.cpp
+++ b/src/security/FSec_PrivacyInfoImpl.cpp
@@ -29,7 +29,6 @@
 #include "FSec_PrivacyInfoImpl.h"
 
 using namespace Tizen::Base;
-using namespace Tizen::Base::Collection;
 using namespace Tizen::Security;
 
 namespace Tizen { namespace Security

diff --git a/src/security/FSec_PrivacyManagerImpl.cpp b/src/security/FSec_PrivacyManagerImpl.cpp
index 32acfce..2b19064 100755 (executable)
--- a/src/security/FSec_PrivacyManagerImpl.cpp
+++ b/src/security/FSec_PrivacyManagerImpl.cpp
@@ -20,12 +20,16 @@
  */
 
 #include <new>
+
 #include <privacy_manager_client.h>
+
 #include <FSecPrivacyManager.h>
 #include <FBaseSysLog.h>
+#include <FBaseColArrayList.h>
+#include <FSecPrivacyInfo.h>
+
 #include "FSec_PrivacyManagerImpl.h"
 #include <FBase_StringConverter.h>
-#include <FSecPrivacyInfo.h>
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;

diff --git a/src/security/cert/FSecCert_CertChain.h b/src/security/cert/FSecCert_CertChain.h
index 139b1f1..5d36eda 100644 (file)
--- a/src/security/cert/FSecCert_CertChain.h
+++ b/src/security/cert/FSecCert_CertChain.h
@@ -25,6 +25,9 @@
 #define _FSEC_CERT_INTERNAL_CERT_CHAIN_H_
 
 #include "unique_ptr.h"
+
+#include <FBaseColArrayList.h>
+
 #include "FSecCert_Certificate.h"
 #include "FSecCert_CertPrivateKeyInfo.h"
 

diff --git a/src/security/pkcs/FSecPkcsPkcs08Attribute.cpp b/src/security/pkcs/FSecPkcsPkcs08Attribute.cpp
index 7a1506b..bf7ac83 100644 (file)
--- a/src/security/pkcs/FSecPkcsPkcs08Attribute.cpp
+++ b/src/security/pkcs/FSecPkcsPkcs08Attribute.cpp
@@ -26,8 +26,10 @@
 #include <FBaseByteBuffer.h>
 #include <FBaseResult.h>
 #include <FBaseSysLog.h>
+#include <FBaseColArrayList.h>
 #include <FSecPkcsPkcs08Attribute.h>
 #include <FSecPkcsPkcs08AttributeValue.h>
+
 #include "FSecPkcs_Pkcs08AttributeImpl.h"
 
 using namespace Tizen::Base;

diff --git a/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.h b/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.h
index 2e4aea7..778f0e5 100644 (file)
--- a/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.h
+++ b/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.h
@@ -26,6 +26,7 @@
 
 #include <FBaseByteBuffer.h>
 #include <FBaseResult.h>
+#include <FBaseColArrayList.h>
 #include <FSecPkcsPkcs08Attribute.h>
 #include <FSecPkcsPkcs08AttributeValue.h>
 

diff --git a/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.h b/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.h
index 388612c..78581b9 100644 (file)
--- a/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.h
+++ b/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.h
@@ -27,6 +27,7 @@
 #define _FSEC_PKCS_INTERNAL_PKCS_08_PRIVATE_KEY_INFO_H_
 
 #include <FBaseByteBuffer.h>
+#include <FBaseColArrayList.h>
 #include <FSecPkcsAlgorithmIdentifier.h>
 #include <FSecPkcsPkcs08Attribute.h>
 #include <FSecPkcsPkcs08AttributeValue.h>

diff --git a/src/system/FSys_AlarmManager.cpp b/src/system/FSys_AlarmManager.cpp
index 04dbd71..15becb4 100644 (file)
--- a/src/system/FSys_AlarmManager.cpp
+++ b/src/system/FSys_AlarmManager.cpp
@@ -27,9 +27,10 @@
 
 #include <FBaseSysLog.h>
 #include <FSysSystemTime.h>
+#include <FAppApp.h>
+#include <FBaseColArrayList.h>
 
 #include <FBase_NativeError.h>
-#include <FAppApp.h>
 #include <FBase_StringConverter.h>
 
 #include "inc/FSys_AlarmManager.h"

diff --git a/src/system/FSys_SystemInfoImpl.cpp b/src/system/FSys_SystemInfoImpl.cpp
index a0e1e20..28d20e0 100644 (file)
--- a/src/system/FSys_SystemInfoImpl.cpp
+++ b/src/system/FSys_SystemInfoImpl.cpp
@@ -28,6 +28,7 @@
 #include <FBaseInteger.h>
 #include <FBaseColHashMap.h>
 #include <FBaseUtilStringUtil.h>
+#include <FIoRegistry.h>
 
 #include <FBase_NativeError.h>
 #include <FBase_StringConverter.h>