Update wrt-installer_0.0.54

[framework/web/wrt-installer.git] / src / logic / installer_controller.h

diff --git a/src/logic/installer_controller.h b/src/logic/installer_controller.h
index 8ce43fc..e611d0c 100644 (file)
--- a/src/logic/installer_controller.h
+++ b/src/logic/installer_controller.h
@@ -50,11 +50,6 @@ DECLARE_GENERIC_EVENT_2(InstallWidgetEvent,
 DECLARE_GENERIC_EVENT_2(InstallPluginEvent, std::string, PluginInstallerStruct)
 
 /**
- * @brief Event for indiciating W3C Geolocation plugin instalation process.
- */
-DECLARE_GENERIC_EVENT_1(InstallPluginGeolocationEvent, PluginInstallerStruct) //
-
-/**
  * @brief Event for inicietig widget uninstallation.
  *
  * WidgetHandler is used to point witch widget shuld be uninstalled
@@ -75,6 +70,9 @@ DECLARE_GENERIC_EVENT_0(TerminateEvent)
 
 } // namespace InstallerEvents
 
+
+namespace Logic {
+
 /**
  * @brief Controls Widget installation
  *
@@ -91,7 +89,6 @@ DECLARE_GENERIC_EVENT_0(TerminateEvent)
 typedef DPL::TypeListDecl<
     InstallerControllerEvents::InstallWidgetEvent,
     InstallerControllerEvents::InstallPluginEvent,
-    InstallerControllerEvents::InstallPluginGeolocationEvent,
     InstallerControllerEvents::UninstallWidgetEvent,
     InstallerControllerEvents::NextStepEvent,
     InstallerControllerEvents::InstallDeferredWidgetPackagesEvent,
@@ -115,13 +112,6 @@ class InstallerController : public DPL::Event::Controller<InstallerControllerEve
             const InstallerControllerEvents::InstallPluginEvent &event);
 
     /**
-     * @brief Executed on InstallPluginEvent received.
-     */
-    virtual void OnEventReceived(
-            const InstallerControllerEvents::InstallPluginGeolocationEvent
-            &event);
-
-    /**
      * @brief Executed on UninstallWidgetEvent received.
      */
     virtual void OnEventReceived(
@@ -143,7 +133,7 @@ class InstallerController : public DPL::Event::Controller<InstallerControllerEve
 
   private:
     // Embedded logic
-    InstallerLogic m_installerLogic;
+    Logic::InstallerLogic m_installerLogic;
 
     InstallerController();
 
@@ -154,4 +144,6 @@ class InstallerController : public DPL::Event::Controller<InstallerControllerEve
 
 typedef DPL::Singleton<InstallerController> InstallerControllerSingleton;
 
+}
+
 #endif // INSTALLER_CONTROLLER_H