Change name (getInstallerStruct -> GetInstallerStruct)

[Issue#]   LINUXWRT-358
[Problem]  Incorrect function name
[Cause]    N/A
[Solution] Rename function
            - src/jobs/plugin_install/job_plugin_install.cpp
            - src/jobs/widget_uninstall/job_widget_uninstall.cpp

Change-Id: Ic3724cb330968f607c2d43f22f84073d1cb25524

diff --git a/src/jobs/job_base.h b/src/jobs/job_base.h
index bb0bbf1..edcf0f5 100644 (file)
--- a/src/jobs/job_base.h
+++ b/src/jobs/job_base.h
@@ -73,11 +73,10 @@ class JobContextBase
         m_jobStruct(jobStruct)
     {}
 
-    T_JobStruct getInstallerStruct() const
+    T_JobStruct GetInstallerStruct() const
     {
         return m_jobStruct;
-    }                                                                  //TODO
-                                                                       // RENAME
+    }
 
   protected:
     T_JobStruct m_jobStruct;

diff --git a/src/jobs/plugin_install/job_plugin_install.cpp b/src/jobs/plugin_install/job_plugin_install.cpp
index f26e3f1..1a929d9 100644 (file)
--- a/src/jobs/plugin_install/job_plugin_install.cpp
+++ b/src/jobs/plugin_install/job_plugin_install.cpp
@@ -50,9 +50,9 @@ JobPluginInstall::JobPluginInstall(PluginPath const &pluginPath,
 
 void JobPluginInstall::SendProgress()
 {
-    if (GetProgressFlag() && getInstallerStruct().progressCallback != NULL) {
+    if (GetProgressFlag() && GetInstallerStruct().progressCallback != NULL) {
         LogDebug("Call Plugin install progressCallback");
-        getInstallerStruct().progressCallback(getInstallerStruct().userParam,
+        GetInstallerStruct().progressCallback(GetInstallerStruct().userParam,
                                               GetProgressPercent(),
                                               GetProgressDescription());
     }
@@ -66,11 +66,11 @@ void JobPluginInstall::SendFinishedSuccess()
         isReadyToInstall())
     {
         LogDebug("Call Plugin install success finishedCallback");
-        getInstallerStruct().finishedCallback(getInstallerStruct().userParam,
+        GetInstallerStruct().finishedCallback(GetInstallerStruct().userParam,
                                               Jobs::Exceptions::Success);
     } else {
         LogDebug("Call Plugin install waiting finishedCallback");
-        getInstallerStruct().finishedCallback(getInstallerStruct().userParam,
+        GetInstallerStruct().finishedCallback(GetInstallerStruct().userParam,
                                               Jobs::Exceptions::ErrorPluginInstallationFailed);
 
         LogDebug("Installation: " << getFilePath() <<
@@ -84,7 +84,7 @@ void JobPluginInstall::SendFinishedFailure()
     LogError("Message: " << m_exceptionMessage);
 
     LogDebug("Call Plugin install failure finishedCallback");
-    getInstallerStruct().finishedCallback(getInstallerStruct().userParam,
+    GetInstallerStruct().finishedCallback(GetInstallerStruct().userParam,
                                           m_exceptionCaught);
 }
 

diff --git a/src/jobs/widget_uninstall/job_widget_uninstall.cpp b/src/jobs/widget_uninstall/job_widget_uninstall.cpp
index 563f10a..785cb21 100644 (file)
--- a/src/jobs/widget_uninstall/job_widget_uninstall.cpp
+++ b/src/jobs/widget_uninstall/job_widget_uninstall.cpp
@@ -106,9 +106,9 @@ JobWidgetUninstall::JobWidgetUninstall(
             LogDebug("Widget model exists. App id : " << m_context.tzAppid);
 
             // send start signal of pkgmgr
-            if (getInstallerStruct().pkgmgrInterface->setPkgname(m_context.tzPkgid))
+            if (GetInstallerStruct().pkgmgrInterface->setPkgname(m_context.tzPkgid))
             {
-                getInstallerStruct().pkgmgrInterface->sendSignal(
+                GetInstallerStruct().pkgmgrInterface->sendSignal(
                         PKGMGR_START_KEY,
                         PKGMGR_START_UNINSTALL);
             }
@@ -203,14 +203,14 @@ void JobWidgetUninstall::SendProgress()
     if (!getRemoveStartedFlag() ||
         (getRemoveStartedFlag() && getRemoveFinishedFlag()))
     {
-        if (NULL != getInstallerStruct().progressCallback) {
+        if (NULL != GetInstallerStruct().progressCallback) {
             // send progress signal of pkgmgr
             std::ostringstream percent;
             percent << static_cast<int>(GetProgressPercent());
 
             LogDebug("Call widget uninstall progressCallback");
-            getInstallerStruct().progressCallback(
-                getInstallerStruct().userParam,
+            GetInstallerStruct().progressCallback(
+                GetInstallerStruct().userParam,
                 GetProgressPercent(), GetProgressDescription());
         }
     }
@@ -220,12 +220,12 @@ void JobWidgetUninstall::SendFinishedSuccess()
 {
     using namespace PackageManager;
     // send signal of pkgmgr
-    getInstallerStruct().pkgmgrInterface->sendSignal(
+    GetInstallerStruct().pkgmgrInterface->sendSignal(
         PKGMGR_END_KEY,
         PKGMGR_END_SUCCESS);
 
     LogDebug("Call widget uninstall success finishedCallback");
-    getInstallerStruct().finishedCallback(getInstallerStruct().userParam,
+    GetInstallerStruct().finishedCallback(GetInstallerStruct().userParam,
                                           getRemovedTizenId(),
                                           Jobs::Exceptions::Success);
 }
@@ -237,12 +237,12 @@ void JobWidgetUninstall::SendFinishedFailure()
     LogError("Message: " << m_exceptionMessage);
 
     // send signal of pkgmgr
-    getInstallerStruct().pkgmgrInterface->sendSignal(
+    GetInstallerStruct().pkgmgrInterface->sendSignal(
         PKGMGR_END_KEY,
         PKGMGR_END_FAILURE);
 
     LogDebug("Call widget uninstall failure finishedCallback");
-    getInstallerStruct().finishedCallback(getInstallerStruct().userParam,
+    GetInstallerStruct().finishedCallback(GetInstallerStruct().userParam,
                                           getRemovedTizenId(),
                                           m_exceptionCaught); //TODO
     LogDebug("[JobWidgetUninstall] Asynchronous failure callback status sent");