Popup removal

[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 100755 (executable)
new mode 100644 (file)
index 9b44559..e67ddb2
--- a/src/jobs/widget_install/task_widget_config.h
+++ b/src/jobs/widget_install/task_widget_config.h
@@ -33,9 +33,7 @@
 #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;
 
@@ -50,8 +48,7 @@ struct PopupData
 } // InstalllerTaskWidgetPopupData
 
 class TaskWidgetConfig :
-    public DPL::TaskDecl<TaskWidgetConfig>,
-    public WidgetInstallPopup
+    public DPL::TaskDecl<TaskWidgetConfig>
 {
   private:
     class Exception
@@ -71,39 +68,35 @@ class TaskWidgetConfig :
     void StepProcessConfigurationFile();
     void ReadLocaleFolders();
     void ProcessLocalizedStartFiles();
-    void ProcessStartFile(const DPL::OptionalString& path,
-            const DPL::OptionalString& type,
-            const DPL::OptionalString& encoding = DPL::OptionalString::Null,
-            bool typeForcedInConfig = false);
+    void ProcessStartFile(
+        const DPL::OptionalString& path,
+        const DPL::OptionalString& type,
+        const DPL::OptionalString& encoding =
+            DPL::OptionalString::Null,
+        bool typeForcedInConfig = false);
     void ProcessBackgroundPageFile();
     void ProcessLocalizedIcons();
     void ProcessIcon(const WrtDB::ConfigParserData::Icon& icon);
     void ProcessWidgetInstalledPath();
     void StepVerifyFeatures();
-    void StepShowWidgetInfo();
     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);
     DPL::String createAuthorWidgetInfo() const;
     bool isFeatureAllowed(
-            WrtDB::AppType appType, DPL::String featureName);
+        WrtDB::AppType appType, DPL::String featureName);
     bool isMinVersionCompatible(
-            WrtDB::AppType appType,
-            const DPL::OptionalString &widgetVersion) const;
+        WrtDB::AppType appType,
+        const DPL::OptionalString &widgetVersion) const;
     /**
      * @brief Parses version string in format "major.minor.micro anything"
      * Returns false if format is invalid
      */
     bool isTizenWebApp() const;
     bool parseVersionString(const std::string &version, long &majorVersion,
-            long &minorVersion, long &microVersion) const;
+                            long &minorVersion, long &microVersion) const;
     /**
      * This method is used to process the config.xml of widget, get
      * the corresponding configuration to pWidgetConfigInfo
@@ -114,16 +107,18 @@ class TaskWidgetConfig :
     void processFile(const std::string& path,
                      WrtDB::WidgetRegisterInfo &wConfig);
 
-    bool locateAndParseConfigurationFile(const std::string& currentPath,
-            WrtDB::WidgetRegisterInfo& pWidgetConfigInfo,
-            const std::string& baseFolder,
-            int* pErrCode);
+    bool locateAndParseConfigurationFile(
+        const std::string& currentPath,
+        WrtDB::WidgetRegisterInfo&
+        pWidgetConfigInfo,
+        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);
+                          WrtDB::ConfigParserData& configInfo);
+
   public:
     TaskWidgetConfig(InstallerContext& installTaskContext);
 };