[Release] wrt-installer_0.1.114

[framework/web/wrt-installer.git] / src / jobs / widget_install / task_widget_config.h

diff --git a/src/jobs/widget_install/task_widget_config.h b/src/jobs/widget_install/task_widget_config.h
old mode 100644 (file)
new mode 100755 (executable)
index fe8309c..fa9b46c
--- a/src/jobs/widget_install/task_widget_config.h
+++ b/src/jobs/widget_install/task_widget_config.h
@@ -33,25 +33,15 @@
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <dpl/wrt-dao-ro/global_config.h>
 
-#include <wrt_error.h>
 #include <wrt_common_types.h>
-#include <widget_install/widget_install_popup.h>
 
 class InstallerContext;
 
 namespace Jobs {
 namespace WidgetInstall {
-namespace InstallerTaskWidgetPopupData {
-struct PopupData
-{
-    DPL::String widgetInfo;
-    void addWidgetInfo(const DPL::String &info);
-};
-} // InstalllerTaskWidgetPopupData
 
 class TaskWidgetConfig :
-    public DPL::TaskDecl<TaskWidgetConfig>,
-    public WidgetInstallPopup
+    public DPL::TaskDecl<TaskWidgetConfig>
 {
   private:
     class Exception
@@ -66,7 +56,6 @@ class TaskWidgetConfig :
     InstallerContext& m_installContext;
     WrtDB::LocaleSet m_localeFolders;
     std::set<DPL::String> m_processedIconSet;
-    InstallerTaskWidgetPopupData::PopupData m_popupData;
 
     void StepProcessConfigurationFile();
     void ReadLocaleFolders();
@@ -81,18 +70,18 @@ class TaskWidgetConfig :
     void ProcessLocalizedIcons();
     void ProcessIcon(const WrtDB::ConfigParserData::Icon& icon);
     void ProcessWidgetInstalledPath();
+    void ProcessAppControlInfo();
+    void ProcessSecurityModel();
     void StepVerifyFeatures();
-    void StepShowWidgetInfo();
+    void StepVerifyLivebox();
     void StepCheckMinVersionInfo();
 
     template <typename Ex, const char* Msg>
     void StepCancelInstallation();
 
-    void StepDeletePopupWin();
-    void StepCancelWidgetInstallationAfterVerifyFeatures();
-    void StepCancelWidgetInstallation();
-    void StepCancelWidgetInstallationAfterMinVersion();
-    void createInstallPopup(PopupType type, const std::string &label);
+    void StartStep();
+    void EndStep();
+
     DPL::String createAuthorWidgetInfo() const;
     bool isFeatureAllowed(
         WrtDB::AppType appType, DPL::String featureName);
@@ -120,14 +109,11 @@ class TaskWidgetConfig :
         const std::string& currentPath,
         WrtDB::WidgetRegisterInfo&
         pWidgetConfigInfo,
-        const std::string& baseFolder,
-        int* pErrCode);
+        const std::string& baseFolder);
     bool parseConfigurationFileBrowser(WrtDB::ConfigParserData& configInfo,
-                                       const std::string& _currentPath,
-                                       int* pErrCode);
+                                       const std::string& _currentPath);
     bool parseConfigurationFileWidget(WrtDB::ConfigParserData& configInfo,
-                                      const std::string& _currentPath,
-                                      int* pErrCode);
+                                      const std::string& _currentPath);
     bool fillWidgetConfig(WrtDB::WidgetRegisterInfo& pWidgetConfigInfo,
                           WrtDB::ConfigParserData& configInfo);