make code neat

Change-Id: I48d216fbc71a5f4e332164d681787b8fdb6092de
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/src/FShell_AppWidgetLayer.cpp b/src/FShell_AppWidgetLayer.cpp
index 0053922..53b5425 100644 (file)
--- a/src/FShell_AppWidgetLayer.cpp
+++ b/src/FShell_AppWidgetLayer.cpp
@@ -370,7 +370,7 @@ _AppWidgetLayer::AcquirePixmap(void)
 
        int pixmapId = -1;
 
-       result r = _AppWidgetProviderManagerImpl::GetInstance()->RequestSharedMemoryId(__providerId, __size.width, __size.height, pixmapId);
+       result r = _AppWidgetProviderManagerImpl::GetInstance()->AcquireRemoteBuffer(__providerId, __size.width, __size.height, pixmapId);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, -1, r, "[%s] Propagating.", GetErrorMessage(r));
 
        SysSecureLog(NID_SHELL, "pixmapId(%d) size(%f %f)", pixmapId, __size.width, __size.height);
@@ -394,7 +394,7 @@ _AppWidgetLayer::Sync(const FloatDimension& size)
        }
 #endif //_DUMP_BUFFER
 
-       result r = _AppWidgetProviderManagerImpl::GetInstance()->RequestSyncSharedMemory(__providerId, size.width, size.height);
+       result r = _AppWidgetProviderManagerImpl::GetInstance()->SyncRemoteBuffer(__providerId, size.width, size.height);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;
@@ -405,7 +405,7 @@ _AppWidgetLayer::ReleasePixmap(void)
 {
        SysTryReturnVoidResult(NID_SHELL, !__providerId.IsEmpty(), E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid.");
 
-       _AppWidgetProviderManagerImpl::GetInstance()->RequestReleaseSharedMemory(__providerId);
+       _AppWidgetProviderManagerImpl::GetInstance()->ReleaseRemoteBuffer(__providerId);
 }
 
 int

diff --git a/src/FShell_AppWidgetManagerProxy.cpp b/src/FShell_AppWidgetManagerProxy.cpp
index 0df926d..e2eec1d 100644 (file)
--- a/src/FShell_AppWidgetManagerProxy.cpp
+++ b/src/FShell_AppWidgetManagerProxy.cpp
@@ -160,78 +160,78 @@ _AppWidgetManagerProxy::RequestUpdateInstance(const Tizen::Base::String& instanc
 }
 
 result
-_AppWidgetManagerProxy::RequestSharedMemoryId(const Tizen::Base::String& instanceId, int width, int height, int& shmId )
+_AppWidgetManagerProxy::AcquireRemoteBuffer(const Tizen::Base::String& instanceId, int width, int height, int& bufferId )
 {
        SysTryReturnResult(NID_SHELL, __pIpcClient != null, E_SYSTEM, "__pIpcClient instance must not be null.");
 
-       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_RequestSharedMemoryId(instanceId, width, height, &shmId));
+       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_AcquireRemoteBuffer(instanceId, width, height, &bufferId));
        result r = __pIpcClient->SendRequest(*pMsg.get());
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "SendRequest failed.");
-       SysLog(NID_SHELL, "shmId(%d) is retrieved from appwidget-service", shmId);
+       SysLog(NID_SHELL, "bufferId(%d) is retrieved from appwidget-service", bufferId);
 
        return E_SUCCESS;
 }
 
 result
-_AppWidgetManagerProxy::RequestSharedMemoryIdForPD(const Tizen::Base::String& instanceId, int width, int height, int& shmId )
+_AppWidgetManagerProxy::AcquireRemoteBufferForPD(const Tizen::Base::String& instanceId, int width, int height, int& bufferId )
 {
        SysTryReturnResult(NID_SHELL, __pIpcClient != null, E_SYSTEM, "__pIpcClient instance must not be null.");
 
-       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_RequestSharedMemoryIdForPD(instanceId, width, height, &shmId));
+       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_AcquireRemoteBufferForPD(instanceId, width, height, &bufferId));
        result r = __pIpcClient->SendRequest(*pMsg.get());
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "SendRequest is failed.");
-       SysLog(NID_SHELL, "shmId(%d) is retrieved from appwidget-service", shmId);
+       SysLog(NID_SHELL, "bufferId(%d) is retrieved from appwidget-service", bufferId);
 
        return E_SUCCESS;
 }
 
 result
-_AppWidgetManagerProxy::RequestSyncSharedMemory(const Tizen::Base::String& instanceId, int width, int height)
+_AppWidgetManagerProxy::SyncRemoteBuffer(const Tizen::Base::String& instanceId, int width, int height)
 {
        SysTryReturnResult(NID_SHELL, __pIpcClient != null, E_SYSTEM, "__pIpcClient instance must not be null.");
        SysLog(NID_SHELL, "");
 
        result ret = E_FAILURE;
-       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_RequestSyncSharedMemory(instanceId, width, height, &ret));
+       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_SyncRemoteBuffer(instanceId, width, height, &ret));
        result r = __pIpcClient->SendRequest(*pMsg.get());
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "SendRequest failed.");
        return E_SUCCESS;
 }
 
 result
-_AppWidgetManagerProxy::RequestSyncSharedMemoryForPD(const Tizen::Base::String& instanceId)
+_AppWidgetManagerProxy::SyncRemoteBufferForPD(const Tizen::Base::String& instanceId)
 {
        SysTryReturnResult(NID_SHELL, __pIpcClient != null, E_SYSTEM, "__pIpcClient instance must not be null.");
        SysLog(NID_SHELL, "");
 
        result ret = E_FAILURE;
-       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_RequestSyncSharedMemoryForPD(instanceId, &ret));
+       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_SyncRemoteBufferForPD(instanceId, &ret));
        result r = __pIpcClient->SendRequest(*pMsg.get());
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "SendRequest failed.");
        return E_SUCCESS;
 }
 
 result
-_AppWidgetManagerProxy::RequestReleaseSharedMemory(const Tizen::Base::String& instanceId)
+_AppWidgetManagerProxy::ReleaseRemoteBuffer(const Tizen::Base::String& instanceId)
 {
        SysTryReturnResult(NID_SHELL, __pIpcClient != null, E_SYSTEM, "__pIpcClient instance must not be null.");
        SysLog(NID_SHELL, "");
 
        result ret = E_FAILURE;
-       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_RequestReleaseSharedMemory(instanceId, &ret));
+       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_ReleaseRemoteBuffer(instanceId, &ret));
        result r = __pIpcClient->SendRequest(*pMsg.get());
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "SendRequest failed.");
        return E_SUCCESS;
 }
 
 result
-_AppWidgetManagerProxy::RequestReleaseSharedMemoryForPD(const Tizen::Base::String& instanceId)
+_AppWidgetManagerProxy::ReleaseRemoteBufferForPD(const Tizen::Base::String& instanceId)
 {
        SysTryReturnResult(NID_SHELL, __pIpcClient != null, E_SYSTEM, "__pIpcClient instance must not be null.");
        SysLog(NID_SHELL, "");
 
        result ret = E_FAILURE;
-       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_RequestReleaseSharedMemoryForPD(instanceId, &ret));
+       std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) AppWidgetManager_ReleaseRemoteBufferForPD(instanceId, &ret));
        result r = __pIpcClient->SendRequest(*pMsg.get());
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "SendRequest failed.");
        return E_SUCCESS;

diff --git a/src/FShell_AppWidgetPopup.cpp b/src/FShell_AppWidgetPopup.cpp
index 866b457..15a9db1 100644 (file)
--- a/src/FShell_AppWidgetPopup.cpp
+++ b/src/FShell_AppWidgetPopup.cpp
@@ -98,7 +98,7 @@ _AppWidgetPopupLayer::AcquirePixmap(void)
 
        int pixmapId = -1;
 
-       result r = _AppWidgetProviderManagerImpl::GetInstance()->RequestSharedMemoryIdForPD(GetProviderId(), __size.width, __size.height, pixmapId);
+       result r = _AppWidgetProviderManagerImpl::GetInstance()->AcquireRemoteBufferForPD(GetProviderId(), __size.width, __size.height, pixmapId);
        SysTryReturn(NID_SHELL, r == E_SUCCESS, -1, r, "[%s] Propagating.", GetErrorMessage(r));
 
        SystemTime::GetTicks(ticks);
@@ -112,7 +112,7 @@ _AppWidgetPopupLayer::AcquirePixmap(void)
 result
 _AppWidgetPopupLayer::Sync(const FloatDimension& size)
 {
-       result r = _AppWidgetProviderManagerImpl::GetInstance()->RequestSyncSharedMemoryForPD(GetProviderId());
+       result r = _AppWidgetProviderManagerImpl::GetInstance()->SyncRemoteBufferForPD(GetProviderId());
        SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;
@@ -121,7 +121,7 @@ _AppWidgetPopupLayer::Sync(const FloatDimension& size)
 void
 _AppWidgetPopupLayer::ReleasePixmap(void)
 {
-       _AppWidgetProviderManagerImpl::GetInstance()->RequestReleaseSharedMemoryForPD(GetProviderId());
+       _AppWidgetProviderManagerImpl::GetInstance()->ReleaseRemoteBufferForPD(GetProviderId());
 }
 
 _AppWidgetPopup::_AppWidgetPopup(void)

diff --git a/src/FShell_AppWidgetProviderManagerImpl.cpp b/src/FShell_AppWidgetProviderManagerImpl.cpp
index 28bd420..67595fb 100644 (file)
--- a/src/FShell_AppWidgetProviderManagerImpl.cpp
+++ b/src/FShell_AppWidgetProviderManagerImpl.cpp
@@ -822,57 +822,57 @@ _AppWidgetProviderManagerImpl::ForwardTouchEventForPD(const String& instanceId,
 //////////////////////////////////////////////////////////////////////////
 
 result
-_AppWidgetProviderManagerImpl::RequestSharedMemoryId(const String& instanceId, int width, int height, int& shmId)
+_AppWidgetProviderManagerImpl::AcquireRemoteBuffer(const String& instanceId, int width, int height, int& bufferId)
 {
        _AppWidgetManagerProxy* pProxy = _AppWidgetManagerProxy::GetInstance();
        SysTryReturnResult(NID_SHELL, pProxy, E_SYSTEM, "Failed to get proxy instance!");
 
-       return pProxy->RequestSharedMemoryId(instanceId, width, height, shmId);
+       return pProxy->AcquireRemoteBuffer(instanceId, width, height, bufferId);
 }
 
 result
-_AppWidgetProviderManagerImpl::RequestSharedMemoryIdForPD(const String& instanceId, int width, int height, int& shmId)
+_AppWidgetProviderManagerImpl::AcquireRemoteBufferForPD(const String& instanceId, int width, int height, int& bufferId)
 {
        _AppWidgetManagerProxy* pProxy = _AppWidgetManagerProxy::GetInstance();
        SysTryReturnResult(NID_SHELL, pProxy, E_SYSTEM, "Failed to get proxy instance!");
 
-       return pProxy->RequestSharedMemoryIdForPD(instanceId, width, height, shmId);
+       return pProxy->AcquireRemoteBufferForPD(instanceId, width, height, bufferId);
 }
 
 result
-_AppWidgetProviderManagerImpl::RequestReleaseSharedMemory(const String& instanceId)
+_AppWidgetProviderManagerImpl::ReleaseRemoteBuffer(const String& instanceId)
 {
        _AppWidgetManagerProxy* pProxy = _AppWidgetManagerProxy::GetInstance();
        SysTryReturnResult(NID_SHELL, pProxy, E_SYSTEM, "Failed to get proxy instance!");
 
-       return pProxy->RequestReleaseSharedMemory(instanceId);
+       return pProxy->ReleaseRemoteBuffer(instanceId);
 }
 
 result
-_AppWidgetProviderManagerImpl::RequestReleaseSharedMemoryForPD(const String& instanceId)
+_AppWidgetProviderManagerImpl::ReleaseRemoteBufferForPD(const String& instanceId)
 {
        _AppWidgetManagerProxy* pProxy = _AppWidgetManagerProxy::GetInstance();
        SysTryReturnResult(NID_SHELL, pProxy, E_SYSTEM, "Failed to get proxy instance!");
 
-       return pProxy->RequestReleaseSharedMemoryForPD(instanceId);
+       return pProxy->ReleaseRemoteBufferForPD(instanceId);
 }
 
 result
-_AppWidgetProviderManagerImpl::RequestSyncSharedMemory(const String& instanceId, int width, int height)
+_AppWidgetProviderManagerImpl::SyncRemoteBuffer(const String& instanceId, int width, int height)
 {
        _AppWidgetManagerProxy* pProxy = _AppWidgetManagerProxy::GetInstance();
        SysTryReturnResult(NID_SHELL, pProxy, E_SYSTEM, "Failed to get proxy instance!");
 
-       return pProxy->RequestSyncSharedMemory(instanceId, width, height);
+       return pProxy->SyncRemoteBuffer(instanceId, width, height);
 }
 
 result
-_AppWidgetProviderManagerImpl::RequestSyncSharedMemoryForPD(const String& instanceId)
+_AppWidgetProviderManagerImpl::SyncRemoteBufferForPD(const String& instanceId)
 {
        _AppWidgetManagerProxy* pProxy = _AppWidgetManagerProxy::GetInstance();
        SysTryReturnResult(NID_SHELL, pProxy, E_SYSTEM, "Failed to get proxy instance!");
 
-       return pProxy->RequestSyncSharedMemoryForPD(instanceId);
+       return pProxy->SyncRemoteBufferForPD(instanceId);
 }
 
 result

diff --git a/src/inc/FShell_AppWidgetManagerIpcMessage.h b/src/inc/FShell_AppWidgetManagerIpcMessage.h
index c33c60c..021e2bd 100644 (file)
--- a/src/inc/FShell_AppWidgetManagerIpcMessage.h
+++ b/src/inc/FShell_AppWidgetManagerIpcMessage.h
@@ -33,12 +33,12 @@
 IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_RequestUpdate, Tizen::Base::String, Tizen::Base::String, Tizen::Base::String, result)
 IPC_SYNC_MESSAGE_CONTROL2_1(AppWidgetManager_RequestUpdateInstance, Tizen::Base::String, Tizen::Base::String, result)
 
-IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_RequestSharedMemoryId, Tizen::Base::String, int, int, int)
-IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_RequestSharedMemoryIdForPD, Tizen::Base::String, int, int, int)
-IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_RequestSyncSharedMemory, Tizen::Base::String, int, int, result)
-IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_RequestSyncSharedMemoryForPD, Tizen::Base::String, result)
-IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_RequestReleaseSharedMemory, Tizen::Base::String, result)
-IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_RequestReleaseSharedMemoryForPD, Tizen::Base::String, result)
+IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_AcquireRemoteBuffer, Tizen::Base::String, int, int, int)
+IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_AcquireRemoteBufferForPD, Tizen::Base::String, int, int, int)
+IPC_SYNC_MESSAGE_CONTROL3_1(AppWidgetManager_SyncRemoteBuffer, Tizen::Base::String, int, int, result)
+IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_SyncRemoteBufferForPD, Tizen::Base::String, result)
+IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_ReleaseRemoteBuffer, Tizen::Base::String, result)
+IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_ReleaseRemoteBufferForPD, Tizen::Base::String, result)
 IPC_SYNC_MESSAGE_CONTROL1_1(AppWidgetManager_RequestProviderCount, Tizen::Base::String, int)
 IPC_MESSAGE_CONTROL2(AppWidgetManager_SendResult, Tizen::Base::String, bool)
 IPC_MESSAGE_CONTROL2(AppWidgetManager_SendAccessStatus, Tizen::Base::String, int)

diff --git a/src/inc/FShell_AppWidgetManagerProxy.h b/src/inc/FShell_AppWidgetManagerProxy.h
index 0725fac..7752ade 100644 (file)
--- a/src/inc/FShell_AppWidgetManagerProxy.h
+++ b/src/inc/FShell_AppWidgetManagerProxy.h
@@ -48,12 +48,12 @@ public:
        result RequestUpdate(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& argument);
        result RequestUpdateInstance(const Tizen::Base::String& instanceId, const Tizen::Base::String& argument);
 
-       result RequestSharedMemoryId(const Tizen::Base::String& instanceId, int w, int h, int& shmId);
-       result RequestSharedMemoryIdForPD(const Tizen::Base::String& instanceId, int w, int h, int& shmId);
-       result RequestSyncSharedMemory(const Tizen::Base::String& instanceId, int width, int height);
-       result RequestSyncSharedMemoryForPD(const Tizen::Base::String& instanceId);
-       result RequestReleaseSharedMemory(const Tizen::Base::String& instanceId);
-       result RequestReleaseSharedMemoryForPD(const Tizen::Base::String& instanceId);
+       result AcquireRemoteBuffer(const Tizen::Base::String& instanceId, int w, int h, int& bufferId);
+       result AcquireRemoteBufferForPD(const Tizen::Base::String& instanceId, int w, int h, int& bufferId);
+       result SyncRemoteBuffer(const Tizen::Base::String& instanceId, int width, int height);
+       result SyncRemoteBufferForPD(const Tizen::Base::String& instanceId);
+       result ReleaseRemoteBuffer(const Tizen::Base::String& instanceId);
+       result ReleaseRemoteBufferForPD(const Tizen::Base::String& instanceId);
        result RequestProviderCount(const Tizen::Base::String& instanceId, int& providerCount);
        result SendResult(const Tizen::Base::String& instanceId, bool isSucceeded);
        result SendAccessStatus(const Tizen::Base::String& instanceId, int accessStatus);

diff --git a/src/inc/FShell_AppWidgetProviderManagerImpl.h b/src/inc/FShell_AppWidgetProviderManagerImpl.h
index 5b8a8ee..5a63863 100644 (file)
--- a/src/inc/FShell_AppWidgetProviderManagerImpl.h
+++ b/src/inc/FShell_AppWidgetProviderManagerImpl.h
@@ -130,12 +130,12 @@ public:
 
        // internal APIs
        result RequestUpdateInstance(const Tizen::Base::String& instanceId, const Tizen::Base::String& argument = L"");
-       result RequestSharedMemoryId(const Tizen::Base::String& instanceId, int width, int height, int& shmId);
-       result RequestSharedMemoryIdForPD(const Tizen::Base::String& instanceId, int width, int height, int& shmId);
-       result RequestSyncSharedMemory(const Tizen::Base::String& instanceId, int width, int height);
-       result RequestSyncSharedMemoryForPD(const Tizen::Base::String& instanceId);
-       result RequestReleaseSharedMemory(const Tizen::Base::String& instanceId);
-       result RequestReleaseSharedMemoryForPD(const Tizen::Base::String& instanceId);
+       result AcquireRemoteBuffer(const Tizen::Base::String& instanceId, int width, int height, int& bufferId);
+       result AcquireRemoteBufferForPD(const Tizen::Base::String& instanceId, int width, int height, int& bufferId);
+       result SyncRemoteBuffer(const Tizen::Base::String& instanceId, int width, int height);
+       result SyncRemoteBufferForPD(const Tizen::Base::String& instanceId);
+       result ReleaseRemoteBuffer(const Tizen::Base::String& instanceId);
+       result ReleaseRemoteBufferForPD(const Tizen::Base::String& instanceId);
        result RequestProviderCount(const Tizen::Base::String& instanceId, int& providerCount);
        result SendResult(const Tizen::Base::String& instanceId, bool isSucceeded);
        result SendAccessStatus(const Tizen::Base::String& instanceId, int accessStatus);