Add WidgetInstallationStruct into namespace

[Issue#]   Linux-358
[Problem]  Declaration Widget Installation Struct without any namespace
[Cause]    N/A
[Solution] WidgetInstallationStruct added into Jobs::WidgetInstall namespace

Change-Id: Iacc417fa211412e30387c01b4d43628b8f9c1552

diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp
index a680435..2761567 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.cpp
+++ b/src/jobs/widget_install/job_widget_install.cpp
@@ -69,10 +69,10 @@ namespace WidgetInstall {
 
 JobWidgetInstall::JobWidgetInstall(
     std::string const &widgetPath,
-    const WidgetInstallationStruct &
+    const Jobs::WidgetInstall::WidgetInstallationStruct &
     installerStruct) :
     Job(Installation),
-    JobContextBase<WidgetInstallationStruct>(installerStruct),
+    JobContextBase<Jobs::WidgetInstall::WidgetInstallationStruct>(installerStruct),
     m_exceptionCaught(Jobs::Exceptions::Success)
 {
     m_installerContext.mode = m_jobStruct.m_installMode;

diff --git a/src/jobs/widget_install/job_widget_install.h b/src/jobs/widget_install/job_widget_install.h
index 62f8c6c..acadd2c 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.h
+++ b/src/jobs/widget_install/job_widget_install.h
@@ -38,7 +38,7 @@ class JobWidgetInstall :
     public Job,
     public JobProgressBase<InstallerContext::InstallStep,
                            InstallerContext::INSTALL_END>,
-    public JobContextBase<WidgetInstallationStruct>   //TODO typedef
+    public JobContextBase<Jobs::WidgetInstall::WidgetInstallationStruct>   //TODO typedef
 {
   private:
     InstallerContext m_installerContext;
@@ -51,7 +51,7 @@ class JobWidgetInstall :
      * @brief Automaticaly sets installation process
      */
     JobWidgetInstall(std::string const & widgetPath,
-                     const WidgetInstallationStruct &installerStruct);
+         const Jobs::WidgetInstall::WidgetInstallationStruct &installerStruct);
 
     //overrides
     void SendProgress();

diff --git a/src/jobs/widget_install/widget_installer_struct.h b/src/jobs/widget_install/widget_installer_struct.h
index 6f0c176..1fd865e 100644 (file)
--- a/src/jobs/widget_install/widget_installer_struct.h
+++ b/src/jobs/widget_install/widget_installer_struct.h
@@ -46,7 +46,8 @@ typedef void (*InstallerProgressCallback)(void *userParam,
                                           ProgressPercent percent,
                                           const ProgressDescription &);
 
-//TODO into namespace
+namespace Jobs {
+namespace WidgetInstall {
 //InstallationStruct
 typedef Jobs::JobCallbacksBase<InstallerFinishedCallback,
                                InstallerProgressCallback>
@@ -73,5 +74,7 @@ struct WidgetInstallationStruct : public WidgetInstallCallbackBase
         pkgmgrInterface(_pkgmgrInterface)
     {}
 };
+} // namespace WidgetInstall
+} // namespace Jobs
 
 #endif // WRT_SRC_INSTALLER_CORE_INSTALLER_TASKS_WIDGET_INSTALLER_STRUCT_H_

diff --git a/src/logic/installer_controller.cpp b/src/logic/installer_controller.cpp
index 552dfae..ced23fd 100644 (file)
--- a/src/logic/installer_controller.cpp
+++ b/src/logic/installer_controller.cpp
@@ -27,7 +27,7 @@ void InstallerController::OnEventReceived(
     const InstallerControllerEvents::InstallWidgetEvent &event)
 {
     std::string fileName = event.GetArg0();
-    WidgetInstallationStruct installerStruct = event.GetArg1();
+    Jobs::WidgetInstall::WidgetInstallationStruct installerStruct = event.GetArg1();
     m_installerLogic.InstallWidget(fileName, installerStruct);
 }
 

diff --git a/src/logic/installer_controller.h b/src/logic/installer_controller.h
index 3fa7964..61093c2 100644 (file)
--- a/src/logic/installer_controller.h
+++ b/src/logic/installer_controller.h
@@ -38,8 +38,8 @@ namespace InstallerControllerEvents {
  * This event holds std::string witch should be path to widget package
  */
 DECLARE_GENERIC_EVENT_2(InstallWidgetEvent,
-                        std::string,              // zipFileName
-                        WidgetInstallationStruct) // installerStruct
+            std::string,              // zipFileName
+            Jobs::WidgetInstall::WidgetInstallationStruct) // installerStruct
 
 /**
  * @brief Event for iniciating plugin instalation process.

diff --git a/src/logic/installer_logic.cpp b/src/logic/installer_logic.cpp
index 5376b8c..bb42034 100644 (file)
--- a/src/logic/installer_logic.cpp
+++ b/src/logic/installer_logic.cpp
@@ -67,7 +67,7 @@ Jobs::JobHandle InstallerLogic::AddAndStartJob()
 // But each Job has different constructor, so creating new Job is specific
 Jobs::JobHandle InstallerLogic::InstallWidget(
     const std::string & widgetPath,
-    const WidgetInstallationStruct &
+    const Jobs::WidgetInstall::WidgetInstallationStruct &
     installerStruct)
 {
     if(m_job)

diff --git a/src/logic/installer_logic.h b/src/logic/installer_logic.h
index 0d3463e..c375d83 100644 (file)
--- a/src/logic/installer_logic.h
+++ b/src/logic/installer_logic.h
@@ -49,7 +49,7 @@ class InstallerLogic
 
     Jobs::JobHandle InstallWidget(
         const std::string & widgetPath,
-        const WidgetInstallationStruct &
+        const Jobs::WidgetInstall::WidgetInstallationStruct &
         installerStruct);
 
     Jobs::JobHandle UninstallWidget(

diff --git a/src/wrt-installer/wrt_installer_api.cpp b/src/wrt-installer/wrt_installer_api.cpp
index 76ca44b..e9f1aca 100644 (file)
--- a/src/wrt-installer/wrt_installer_api.cpp
+++ b/src/wrt-installer/wrt_installer_api.cpp
@@ -182,7 +182,7 @@ void wrt_install_widget(
         CONTROLLER_POST_EVENT(
             Logic::InstallerController,
             InstallerControllerEvents::InstallWidgetEvent(
-                path, WidgetInstallationStruct(
+                path, Jobs::WidgetInstall::WidgetInstallationStruct(
                     InstallerCallbacksTranslate::installFinishedCallback,
                     InstallerCallbacksTranslate::installProgressCallback,
                     new InstallerCallbacksTranslate::StatusCallbackStruct(