remove unnecessary codes

[framework/osp/appwidget-service.git] / src / FShell_AppWidgetManagerService.cpp

diff --git a/src/FShell_AppWidgetManagerService.cpp b/src/FShell_AppWidgetManagerService.cpp
index 1f51a0b..81bf33b 100644 (file)
--- a/src/FShell_AppWidgetManagerService.cpp
+++ b/src/FShell_AppWidgetManagerService.cpp
@@ -19,23 +19,17 @@
  * @brief      This is the implementation for the AppWidgetManagerService class.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
 #include <unique_ptr.h>
 #include <provider.h>
-#include <aul.h>
-
-#include <FBase.h>
 #include <FBaseSysLog.h>
-#include <FApp.h>
+#include <FBaseColIList.h>
+#include <FAppApp.h>
 #include <FApp_AppManagerImpl.h>
 #include <FIo_IpcServer.h>
 #include <FBase_StringConverter.h>
-
 #include "FShell_AppWidgetContext.h"
 #include "FShell_AppWidgetPopupContext.h"
 #include "FShell_AppWidgetManagerStub.h"
-
 #include "FShell_AppWidgetManagerService.h"
 
 namespace Tizen { namespace Shell  { namespace App {
@@ -55,12 +49,12 @@ static const RequestId      LOCAL_EVENT_REQUEST_UPDATE = 0;
 
 extern const int UPDATE_PERIOD_MSEC_MIN;
 
-AppWidgetManagerService::AppWidgetManagerService()
+AppWidgetManagerService::AppWidgetManagerService(void)
 {
 
 }
 
-AppWidgetManagerService::~AppWidgetManagerService()
+AppWidgetManagerService::~AppWidgetManagerService(void)
 {
        __pingTimer.Cancel();
        DeinitializeMasterDaemonEventReceiver();
@@ -83,7 +77,7 @@ AppWidgetManagerService::GetInstance(void)
 }
 
 result
-AppWidgetManagerService::Construct()
+AppWidgetManagerService::Construct(void)
 {
        _AppWidgetManagerStub::StartIpcServer();
 
@@ -118,14 +112,13 @@ int
 AppWidgetManagerService::AppWidgetDisconnected(struct event_arg *arg, void* data)
 {
        SysLog(NID_SHELL, "success to be disconnected with master daemon");
-//     aul_terminate_pid(getpid());
     return 0;
 }
 
 void
-AppWidgetManagerService::StartPingTimer()
+AppWidgetManagerService::StartPingTimer(void)
 {
-       __pingTimer.Construct(*this);//, true);
+       __pingTimer.Construct(*this);
        __pingTimer.StartAsRepeatable(120000);
 }
 
@@ -140,12 +133,12 @@ AppWidgetManagerService::OnTimerExpired(Timer& timer)
 _AppWidgetContext*
 AppWidgetManagerService::Find(const String& appId, const String& instanceId) const
 {
-       for( int i = 0; i < __appWidgetContextList.GetCount(); i++ )
+       for (int i = 0; i < __appWidgetContextList.GetCount(); i++)
        {
                _AppWidgetContext* pAppWidgetContext = null;
                __appWidgetContextList.GetAt(i, pAppWidgetContext);
 
-               if ( pAppWidgetContext->__instanceId == instanceId )
+               if (pAppWidgetContext->GetInstanceId() == instanceId)
                {
                        return pAppWidgetContext;
                }
@@ -156,14 +149,14 @@ AppWidgetManagerService::Find(const String& appId, const String& instanceId) con
 result
 AppWidgetManagerService::SetIpcClientIds(const Tizen::App::AppId& appId, int clientId)
 {
-       for( int i = 0; i < __appWidgetContextList.GetCount(); i++ )
+       for (int i = 0; i < __appWidgetContextList.GetCount(); i++)
        {
                _AppWidgetContext* pAppWidgetContext = null;
                __appWidgetContextList.GetAt(i, pAppWidgetContext);
-               SysLog(NID_SHELL, "%ls", pAppWidgetContext->__instanceId.GetPointer());
-               SysLog(NID_SHELL, "%ls, %ls", pAppWidgetContext->__providerId.GetPointer(), appId.GetPointer());
+               SysLog(NID_SHELL, "%ls", pAppWidgetContext->GetInstanceId().GetPointer());
+               SysLog(NID_SHELL, "%ls, %ls", pAppWidgetContext->GetProviderId().GetPointer(), appId.GetPointer());
 
-               if ( pAppWidgetContext->__appId == appId )
+               if (pAppWidgetContext->GetAppId() == appId)
                {
                        SysLog(NID_SHELL,"");
                        pAppWidgetContext->SetIpcClientId(clientId);
@@ -203,7 +196,7 @@ AppWidgetManagerService::OnIpcClientDisconnected(const _IpcServer& server, int c
 result
 AppWidgetManagerService::AddAppWidget(_AppWidgetContext* pAppWidgetContext)
 {
-       SysLog(NID_SHELL, "%ls, %ls, count(%d)", pAppWidgetContext->__providerId.GetPointer(), pAppWidgetContext->__instanceId.GetPointer(), __appWidgetContextList.GetCount());
+       SysLog(NID_SHELL, "%ls, %ls, count(%d)", pAppWidgetContext->GetProviderId().GetPointer(), pAppWidgetContext->GetInstanceId().GetPointer(), __appWidgetContextList.GetCount());
 
        return __appWidgetContextList.Add(pAppWidgetContext);
 }
@@ -230,7 +223,6 @@ AppWidgetManagerService::RemoveAppWidget(const char* pPackageName, const char* p
        return r;
 }
 
-
 ///////////////////////////////////////////////////////
 // MasterDaemonEventReceiver implementation
 ///////////////////////////////////////////////////////
@@ -254,9 +246,9 @@ AppWidgetManagerService::OnAppWidgetCreate(struct event_arg *arg, int *width, in
        pAppWidgetService->AddAppWidget(pAppWidgetContext);
        pAppWidgetContext->OnAdded();
 
-       *priority = pAppWidgetContext->__priority;
-       *height= pAppWidgetContext->__height;
-       *width = pAppWidgetContext->__width;
+       *priority = pAppWidgetContext->GetPriority();
+       *height= pAppWidgetContext->GetHeight();
+       *width = pAppWidgetContext->GetWidth();
 
        SysLog(NID_SHELL, "Exit. %d appWidget(es)", pAppWidgetService->__appWidgetContextList.GetCount());
     return 0;
@@ -289,7 +281,7 @@ AppWidgetManagerService::UpdateAllAppWidgetsByAppId(const String& providerId)
                _AppWidgetContext* pAppWidgetContext = null;
                __appWidgetContextList.GetAt(i, pAppWidgetContext);
 
-               if ( pAppWidgetContext->__providerId == providerId )
+               if ( pAppWidgetContext->GetProviderId() == providerId )
                {
                        pAppWidgetContext->OnUpdate(L"");
                }
@@ -490,7 +482,7 @@ AppWidgetManagerService::InitializeMasterDaemonEventReceiver(const char *pServic
 }
 
 result
-AppWidgetManagerService::DeinitializeMasterDaemonEventReceiver()
+AppWidgetManagerService::DeinitializeMasterDaemonEventReceiver(void)
 {
        SysLog(NID_SHELL, "Enter.");
     provider_fini();
@@ -499,9 +491,8 @@ AppWidgetManagerService::DeinitializeMasterDaemonEventReceiver()
 }
 
 ///////////////////////////////////////////////////////
-// stub implmentation
+// stub implementation
 ///////////////////////////////////////////////////////
-
 result
 AppWidgetManagerService::RequestUpdate(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& argument)
 {
@@ -513,7 +504,7 @@ AppWidgetManagerService::RequestUpdate(const Tizen::App::AppId& appId, const Tiz
                _AppWidgetContext* pAppWidgetContext = null;
                __appWidgetContextList.GetAt(i, pAppWidgetContext);
 
-               if ( pAppWidgetContext->__appId == appId && pAppWidgetContext->__providerName == providerName)
+               if ( pAppWidgetContext->GetAppId() == appId && pAppWidgetContext->GetProviderName() == providerName)
                {
                        SysLog(NID_SHELL, "OK");
 
@@ -539,12 +530,12 @@ AppWidgetManagerService::RequestUpdateInstance(const Tizen::Base::String& instan
 {
        SysLog(NID_SHELL, "%ls, %ls", instanceId.GetPointer(), argument.GetPointer() );
 
-       for( int i = 0; i < __appWidgetContextList.GetCount(); i++ )
+       for (int i = 0; i < __appWidgetContextList.GetCount(); i++ )
        {
                _AppWidgetContext* pAppWidgetContext = null;
                __appWidgetContextList.GetAt(i, pAppWidgetContext);
 
-               if ( pAppWidgetContext->__instanceId == instanceId)
+               if (pAppWidgetContext->GetInstanceId() == instanceId)
                {
                        SysLog(NID_SHELL, "OK");
 
@@ -571,12 +562,6 @@ AppWidgetManagerService::RequestSharedMemoryId(const Tizen::App::AppId& appId, c
        _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId);
        SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer());
 
-//     if(pAppWidgetContext->HasValidClientId() == false)
-//     {
-//             String fullAppId = __pIpcServer->GetClientApplicationId();
-//             this->SetIpcClientIds(fullAppId, __pIpcServer->GetClientId());
-//     }
-
        shmId = pAppWidgetContext->GetSharedMemId(width, height);
        SysTryReturnResult(NID_SHELL, pAppWidgetContext , shmId != -1, "[E_SYSTEM] failed to GetSharedMemId for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer());
 
@@ -626,27 +611,12 @@ AppWidgetManagerService::RequestSyncSharedMemoryForPD(const Tizen::App::AppId& a
 result
 AppWidgetManagerService::RequestReleaseSharedMemory(const Tizen::App::AppId& appId, const Tizen::Base::String& instanceId)
 {
-//     std::unique_ptr<char[]> pkgname(_StringConverter::CopyToCharArrayN(appId));
-//     std::unique_ptr<char[]> id(_StringConverter::CopyToCharArrayN(instanceId));
-//
-//     _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId);
-//     SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer());
-//
-//     return pAppWidgetContext->ReleaseSharedMem();
        return E_SUCCESS;
 }
 
 result
 AppWidgetManagerService::RequestReleaseSharedMemoryForPD(const Tizen::App::AppId& appId, const Tizen::Base::String& instanceId)
 {
-//     std::unique_ptr<char[]> pkgname(_StringConverter::CopyToCharArrayN(appId));
-//     std::unique_ptr<char[]> id(_StringConverter::CopyToCharArrayN(instanceId));
-//
-//     _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId);
-//     SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer());
-//     SysTryReturnResult(NID_SHELL, pAppWidgetContext->GetAppWidgetPopup(), E_SYSTEM, "[E_SYSTEM] GetAppWidgetPopup() returns null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer());
-//
-//     return pAppWidgetContext->GetAppWidgetPopup()->ReleaseSharedMem();
        return E_SUCCESS;
 }
 
@@ -684,7 +654,8 @@ AppWidgetManagerService::_TaskHandlerThread::OnUserEventReceivedN(RequestId reqI
                SysAssertf(false, "never get here!");
                break;
        }
+
        SysLog(NID_SHELL, "Exit.");
 }
 
-} } } //namespace Tizen { namespace Shell  { namespace App {
+}}}    // Tizen::Shell::App