Reduce duplicate code

- Move common variables to parent class
- Declares only the prototype of the function without variable name

Change-Id: I096a6d11a7b15b030b500433b55c367becea4a23
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/tpk_manifest_handlers/account_handler.h b/src/tpk_manifest_handlers/account_handler.h
index 872f063b5e6aeb56040b84b61627537c2b3aa555..f81884aac9f6ae59f60017722174ea1808e2eacd 100644 (file)
--- a/src/tpk_manifest_handlers/account_handler.h
+++ b/src/tpk_manifest_handlers/account_handler.h
@@ -53,10 +53,10 @@ class AccountInfo : public parser::ManifestData {
 class AccountHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
-      std::string Key() const override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
+  std::string Key() const override;
 
  private:
       /**

diff --git a/src/tpk_manifest_handlers/application_handler.h b/src/tpk_manifest_handlers/application_handler.h
index 6ec2e10bb2de4341e5555f66ca6de714003046dc..fbf25a57dfd8138db192c131a297e12cdeb76d6e 100644 (file)
--- a/src/tpk_manifest_handlers/application_handler.h
+++ b/src/tpk_manifest_handlers/application_handler.h
@@ -94,6 +94,10 @@ extern const char kResControlAutoCloseKey[];
 
 class ApplicationInfo : public parser::ManifestData {
  public:
+  ApplicationInfo() {}
+
+  ApplicationInfo(std::string type) : type_(std::move(type)) {}
+
   void set_appid(std::string appid) {
     appid_ = std::move(appid);
   }
@@ -110,6 +114,14 @@ class ApplicationInfo : public parser::ManifestData {
     api_version_ = std::move(api_version);
   }
 
+  void set_type(std::string type) {
+    type_ = std::move(type);
+  }
+
+  void set_support_mode(std::string support_mode) {
+    support_mode_ = std::move(support_mode);
+  }
+
   const std::string& appid() const {
     return appid_;
   }
@@ -126,11 +138,21 @@ class ApplicationInfo : public parser::ManifestData {
     return api_version_;
   }
 
+  const std::string& type() const {
+    return type_;
+  }
+
+  const std::string& support_mode() const {
+    return support_mode_;
+  }
+
  private:
   std::string appid_;
   std::string exec_;
   std::string mainapp_;
   std::string api_version_;
+  std::string type_;
+  std::string support_mode_;
 };
 
 template<typename T>

diff --git a/src/tpk_manifest_handlers/author_handler.h b/src/tpk_manifest_handlers/author_handler.h
index e68cbd1c80b8e948804ce6464b9cffb6ff5a932d..bde38e36c48eabd558e87e7244b5cda21e440405 100644 (file)
--- a/src/tpk_manifest_handlers/author_handler.h
+++ b/src/tpk_manifest_handlers/author_handler.h
@@ -81,9 +81,9 @@ class AuthorInfo : public parser::ManifestData {
 class AuthorHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/component_based_application_handler.cc b/src/tpk_manifest_handlers/component_based_application_handler.cc
index a7e86d25bea9237fe69611d167d3f1d1704323f6..73adeb16c43f50b5bd4282e5cbe12f545a506fdf 100644 (file)
--- a/src/tpk_manifest_handlers/component_based_application_handler.cc
+++ b/src/tpk_manifest_handlers/component_based_application_handler.cc
@@ -226,10 +226,10 @@ bool ParseComponentBasedApplicationAndStore(
 }
 
 ComponentBasedApplicationInfo::ComponentBasedApplicationInfo()
-    : multiple_("false"),
+    : ApplicationInfo("capp"),
+      multiple_("false"),
       nodisplay_("true"),
       hwacceleration_("default"),
-      type_("capp"),
       splash_screen_display_("true") {
 }
 

diff --git a/src/tpk_manifest_handlers/component_based_application_handler.h b/src/tpk_manifest_handlers/component_based_application_handler.h
index 44ec7bbd889928565162e327d1984cab977e5674..a5899a6444d03a2ec1450cf9675e7e183b016259 100644 (file)
--- a/src/tpk_manifest_handlers/component_based_application_handler.h
+++ b/src/tpk_manifest_handlers/component_based_application_handler.h
@@ -49,22 +49,10 @@ class ComponentBasedApplicationInfo : public ApplicationInfo {
     nodisplay_ = std::move(nodisplay);
   }
 
-  void set_support_mode(std::string support_mode) {
-    support_mode_ = std::move(support_mode);
-  }
-
   void set_hwacceleration(std::string hwacceleration) {
     hwacceleration_ = std::move(hwacceleration);
   }
 
-  /**
-   * @brief set_launch_mode sets launch mdoe
-   * @param launch_mode
-   */
-  void set_type(std::string type) {
-    type_ = std::move(type);
-  }
-
   void set_taskmanage(std::string taskmanage) {
     taskmanage_ = std::move(taskmanage);
   }
@@ -100,18 +88,10 @@ class ComponentBasedApplicationInfo : public ApplicationInfo {
     return nodisplay_;
   }
 
-  const std::string& support_mode() const {
-    return support_mode_;
-  }
-
   const std::string& hwacceleration() const {
     return hwacceleration_;
   }
 
-  const std::string& type() const {
-    return type_;
-  }
-
   const std::string& taskmanage() const {
     return taskmanage_;
   }
@@ -128,9 +108,7 @@ class ComponentBasedApplicationInfo : public ApplicationInfo {
   std::string launch_mode_;
   std::string multiple_;
   std::string nodisplay_;
-  std::string support_mode_;
   std::string hwacceleration_;
-  std::string type_;
   std::string taskmanage_;
   std::string indicator_display_;
   std::string splash_screen_display_;
@@ -168,13 +146,13 @@ using ComponentBasedApplicationInfoList =
 class ComponentBasedApplicationHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/dependencies_handler.h b/src/tpk_manifest_handlers/dependencies_handler.h
index 3b62b76542943c0036ea90bc6b6f58707db9f467..ef1dc7231c10c323423a92f07598af51088082b1 100644 (file)
--- a/src/tpk_manifest_handlers/dependencies_handler.h
+++ b/src/tpk_manifest_handlers/dependencies_handler.h
@@ -76,13 +76,13 @@ class DependenciesInfo : public parser::ManifestData {
 class DependenciesHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/description_handler.h b/src/tpk_manifest_handlers/description_handler.h
index afe4ddcb1a8684e3606162923003f464162d5eb2..555cd4e62a3cba4ef22d7e091237acb868772317 100644 (file)
--- a/src/tpk_manifest_handlers/description_handler.h
+++ b/src/tpk_manifest_handlers/description_handler.h
@@ -72,9 +72,9 @@ class DescriptionInfoList : public parser::ManifestData {
 class DescriptionHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/feature_handler.h b/src/tpk_manifest_handlers/feature_handler.h
index c2eb4539c07298201671c12c54515f0acb2c0a28..cd418f860c5212970e89db82f65087baf4dc64e5 100644 (file)
--- a/src/tpk_manifest_handlers/feature_handler.h
+++ b/src/tpk_manifest_handlers/feature_handler.h
@@ -39,9 +39,9 @@ class FeatureInfo : public parser::ManifestData {
 class FeatureHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/light_user_handler.h b/src/tpk_manifest_handlers/light_user_handler.h
index d2a3d20ab9b255be13018b87e306c1e630ddf0d6..bc3a4866a2681fe2211c2c7e825b2eee8e838093 100644 (file)
--- a/src/tpk_manifest_handlers/light_user_handler.h
+++ b/src/tpk_manifest_handlers/light_user_handler.h
@@ -48,9 +48,9 @@ class LightUserInfo : public parser::ManifestData {
 class LightUserHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/package_handler.h b/src/tpk_manifest_handlers/package_handler.h
index 9dcbf3fb274b14d737889b8448850bc0e205062b..4208c719866bdc1c12f11ab8628029738abd8cf8 100644 (file)
--- a/src/tpk_manifest_handlers/package_handler.h
+++ b/src/tpk_manifest_handlers/package_handler.h
@@ -191,13 +191,13 @@ class PackageInfo : public parser::ManifestData {
 class PackageHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
   bool AlwaysParseForKey() const override { return true; }
 };

diff --git a/src/tpk_manifest_handlers/privileges_handler.h b/src/tpk_manifest_handlers/privileges_handler.h
index 8c9e0552f5ec9f2f1c38fda88be0bc6933c4b04f..a0aefef787d447a529cf7c71d8c32ae1ab5ac786 100644 (file)
--- a/src/tpk_manifest_handlers/privileges_handler.h
+++ b/src/tpk_manifest_handlers/privileges_handler.h
@@ -75,13 +75,13 @@ class PrivilegesInfo : public parser::ManifestData {
 class PrivilegesHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/profile_handler.h b/src/tpk_manifest_handlers/profile_handler.h
index 622d5b62753c5807087ab543f17091d3fadb6d7a..9458a7066ceb3c4a961ded3dc51fcdfa0b9c97d1 100644 (file)
--- a/src/tpk_manifest_handlers/profile_handler.h
+++ b/src/tpk_manifest_handlers/profile_handler.h
@@ -41,9 +41,9 @@ class ProfileInfo : public parser::ManifestData {
 class ProfileHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/provides_appdefined_privileges_handler.h b/src/tpk_manifest_handlers/provides_appdefined_privileges_handler.h
index 36baea7be6fa95c2129759ca8ec0be5508f21fe6..4cc2d1d62699ebb5af79c4c770a2aabb2bb0751d 100644 (file)
--- a/src/tpk_manifest_handlers/provides_appdefined_privileges_handler.h
+++ b/src/tpk_manifest_handlers/provides_appdefined_privileges_handler.h
@@ -55,13 +55,13 @@ class ProvidesAppDefinedPrivilegesInfo : public parser::ManifestData {
 class ProvidesAppDefinedPrivilegesHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/service_application_handler.h b/src/tpk_manifest_handlers/service_application_handler.h
index 766e18c3fd7b8bcfaf56017d88d6522895f2578f..00fcb4e520bd42d5bd2dd2366ee943002e8ed5bd 100644 (file)
--- a/src/tpk_manifest_handlers/service_application_handler.h
+++ b/src/tpk_manifest_handlers/service_application_handler.h
@@ -24,9 +24,6 @@ class ServiceApplicationInfo : public ApplicationInfo {
    * @param key string
    */
   static std::string key();
-  void set_type(std::string type) {
-    type_ = std::move(type);
-  }
   void set_process_pool(std::string process_pool) {
     process_pool_ = std::move(process_pool);
   }
@@ -53,13 +50,6 @@ class ServiceApplicationInfo : public ApplicationInfo {
     taskmanage_ = std::move(taskmanage);
   }
 
-  void set_support_mode(std::string support_mode) {
-    support_mode_ = std::move(support_mode);
-  }
-
-  const std::string& type() const {
-    return type_;
-  }
   const std::string& process_pool() const {
     return process_pool_;
   }
@@ -86,18 +76,12 @@ class ServiceApplicationInfo : public ApplicationInfo {
     return taskmanage_;
   }
 
-  const std::string& support_mode() const {
-    return support_mode_;
-  }
-
  private:
-  std::string type_;
   std::string process_pool_;
   std::string auto_restart_;
   std::string on_boot_;
   std::string multiple_;
   std::string taskmanage_;
-  std::string support_mode_;
 };
 
 struct ServiceApplicationSingleEntry :
@@ -127,13 +111,13 @@ using ServiceApplicationInfoList =
 class ServiceApplicationHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/shortcut_handler.h b/src/tpk_manifest_handlers/shortcut_handler.h
index 254ec09d9db4417f7a86136a01d0052e76caafbe..4805101887ab14b4aff8da986e719b085a44b18f 100644 (file)
--- a/src/tpk_manifest_handlers/shortcut_handler.h
+++ b/src/tpk_manifest_handlers/shortcut_handler.h
@@ -32,9 +32,9 @@ class ShortcutListInfo : public parser::ManifestData {
 class ShortcutHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   std::string Key() const override;
 };
 

diff --git a/src/tpk_manifest_handlers/trust_anchor_handler.h b/src/tpk_manifest_handlers/trust_anchor_handler.h
index fd36d0b76e7e246748904da3b62117a7e743009f..d9fa02e44f76c1496f6920708ecb81c003981044 100644 (file)
--- a/src/tpk_manifest_handlers/trust_anchor_handler.h
+++ b/src/tpk_manifest_handlers/trust_anchor_handler.h
@@ -35,9 +35,9 @@ class TrustAnchorInfo : public parser::ManifestData {
 class TrustAnchorHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
 
   std::string Key() const override;
 };

diff --git a/src/tpk_manifest_handlers/ui_application_handler.h b/src/tpk_manifest_handlers/ui_application_handler.h
index 57a2258496ce56e99c8e1a6df6a33fc31eba8164..00891e2b633e42a673a3010e4053095e249b02ff 100644 (file)
--- a/src/tpk_manifest_handlers/ui_application_handler.h
+++ b/src/tpk_manifest_handlers/ui_application_handler.h
@@ -30,9 +30,6 @@ class UIApplicationInfo : public ApplicationInfo {
    * @brief set_launch_mode sets launch mdoe
    * @param launch_mode
    */
-  void set_type(std::string type) {
-    type_ = std::move(type);
-  }
   void set_process_pool(std::string process_pool) {
     process_pool_ = std::move(process_pool);
   }
@@ -53,13 +50,6 @@ class UIApplicationInfo : public ApplicationInfo {
   void set_nodisplay(std::string nodisplay) {
     nodisplay_ = std::move(nodisplay);
   }
-  /**
-   * @brief set_support_mode sets support mode
-   * @param support_mode
-   */
-  void set_support_mode(std::string support_mode) {
-    support_mode_ = std::move(support_mode);
-  }
   /**
    * @brief set_taskmanage set task manage
    * @param taskmanage
@@ -95,9 +85,6 @@ class UIApplicationInfo : public ApplicationInfo {
     splash_screen_display_ = std::move(splash_screen_display);
   }
 
-  const std::string& type() const {
-    return type_;
-  }
   const std::string& process_pool() const {
     return process_pool_;
   }
@@ -122,13 +109,6 @@ class UIApplicationInfo : public ApplicationInfo {
   const std::string& nodisplay() const {
     return nodisplay_;
   }
-  /**
-   * @brief support_mode
-   * @return support_mode string
-   */
-  const std::string& support_mode() const {
-    return support_mode_;
-  }
   /**
    * @brief taskmanage
    * @return taskmanage
@@ -174,12 +154,10 @@ class UIApplicationInfo : public ApplicationInfo {
   }
 
  private:
-  std::string type_;
   std::string process_pool_;
   std::string launch_mode_;
   std::string multiple_;
   std::string nodisplay_;
-  std::string support_mode_;
   std::string taskmanage_;
   std::string uigadget_;
   std::string submode_;
@@ -223,13 +201,13 @@ using UIApplicationInfoList = ApplicationInfoList<UIApplicationSingleEntry>;
 class UIApplicationHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
   std::vector<std::string> PrerequisiteKeys() const override;
 };

diff --git a/src/tpk_manifest_handlers/watch_application_handler.cc b/src/tpk_manifest_handlers/watch_application_handler.cc
index d39113982ef5f6e1c281f9f74fca0d5d6d009cea..e967bac8cfc149b6a211ffe204215b503e345d85 100644 (file)
--- a/src/tpk_manifest_handlers/watch_application_handler.cc
+++ b/src/tpk_manifest_handlers/watch_application_handler.cc
@@ -147,7 +147,7 @@ bool ParseWatchApplication(
 }
 
 WatchApplicationInfo::WatchApplicationInfo()
-    : type_(""), ambient_support_(kFalse) {
+    : ApplicationInfo(""), ambient_support_(kFalse) {
 }
 
 bool WatchApplicationHandler::Parse(

diff --git a/src/tpk_manifest_handlers/watch_application_handler.h b/src/tpk_manifest_handlers/watch_application_handler.h
index 35671a3bf8200ca977d30958036db2446e9f30cd..5f2fab9edf76a467ac1a47da11adce71361edf30 100644 (file)
--- a/src/tpk_manifest_handlers/watch_application_handler.h
+++ b/src/tpk_manifest_handlers/watch_application_handler.h
@@ -36,18 +36,6 @@ class WatchApplicationInfo : public ApplicationInfo {
     return ambient_support_;
   }
 
-  /**
-   * @brief Watch application type.
-   * @return type string
-   */
-  const std::string& type() const {
-    return type_;
-  }
-
-  const std::string& support_mode() const {
-    return support_mode_;
-  }
-
   const std::string& setup_appid() const {
     return setup_appid_;
   }
@@ -56,22 +44,12 @@ class WatchApplicationInfo : public ApplicationInfo {
     ambient_support_ = std::move(ambient_support);
   }
 
-  void set_type(std::string type) {
-    type_ = std::move(type);
-  }
-
-  void set_support_mode(std::string support_mode) {
-    support_mode_ = std::move(support_mode);
-  }
-
   void set_setup_appid(std::string setup_appid) {
     setup_appid_ = std::move(setup_appid);
   }
 
  private:
-  std::string type_;
   std::string ambient_support_;
-  std::string support_mode_;
   std::string setup_appid_;
 };
 
@@ -95,13 +73,13 @@ using WatchApplicationInfoList =
 class WatchApplicationHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
   std::vector<std::string> PrerequisiteKeys() const override;
 };

diff --git a/src/tpk_manifest_handlers/widget_application_handler.cc b/src/tpk_manifest_handlers/widget_application_handler.cc
index 7c041505da6d16172bfb66cb1275def85b0ea7be..f305cf4aee680a742b0a2e4b3a700a00d5c50594 100644 (file)
--- a/src/tpk_manifest_handlers/widget_application_handler.cc
+++ b/src/tpk_manifest_handlers/widget_application_handler.cc
@@ -189,10 +189,10 @@ bool ParseWidgetApplicationAndStore(
 }
 
 WidgetApplicationInfo::WidgetApplicationInfo()
-    : multiple_("false"),
+    : ApplicationInfo("capp"),
+      multiple_("false"),
       nodisplay_("false"),
-      hwacceleration_("default"),
-      type_("capp") {
+      hwacceleration_("default") {
 }
 
 bool WidgetApplicationHandler::Parse(

diff --git a/src/tpk_manifest_handlers/widget_application_handler.h b/src/tpk_manifest_handlers/widget_application_handler.h
index 27eeb127838bacc524e1c32448dd0ad75ddf42bf..124a770c40c74666d7bc6e8644763645f8057afa 100644 (file)
--- a/src/tpk_manifest_handlers/widget_application_handler.h
+++ b/src/tpk_manifest_handlers/widget_application_handler.h
@@ -52,22 +52,10 @@ class WidgetApplicationInfo : public ApplicationInfo {
     nodisplay_ = std::move(nodisplay);
   }
 
-  void set_support_mode(std::string support_mode) {
-    support_mode_ = std::move(support_mode);
-  }
-
   void set_hwacceleration(std::string hwacceleration) {
     hwacceleration_ = std::move(hwacceleration);
   }
 
-  /**
-   * @brief set_launch_mode sets launch mdoe
-   * @param launch_mode
-   */
-  void set_type(std::string type) {
-    type_ = std::move(type);
-  }
-
   /**
    * @brief launch_mode
    * @return launch mode string
@@ -94,26 +82,16 @@ class WidgetApplicationInfo : public ApplicationInfo {
     return nodisplay_;
   }
 
-  const std::string& support_mode() const {
-    return support_mode_;
-  }
-
   const std::string& hwacceleration() const {
     return hwacceleration_;
   }
 
-  const std::string& type() const {
-    return type_;
-  }
-
  private:
   std::string launch_mode_;
   std::string multiple_;
   std::string main_;
   std::string nodisplay_;
-  std::string support_mode_;
   std::string hwacceleration_;
-  std::string type_;
 };
 
 struct WidgetApplicationSingleEntry :
@@ -137,13 +115,13 @@ using WidgetApplicationInfoList =
 class WidgetApplicationHandler : public parser::ManifestHandler {
  public:
   bool Parse(
-      const parser::Manifest& manifest,
-      std::shared_ptr<parser::ManifestData>* output,
-      std::string* error) override;
+      const parser::Manifest&,
+      std::shared_ptr<parser::ManifestData>*,
+      std::string*) override;
   bool Validate(
-      const parser::ManifestData& data,
-      const parser::ManifestDataMap& handlers_output,
-      std::string* error) const override;
+      const parser::ManifestData&,
+      const parser::ManifestDataMap&,
+      std::string*) const override;
   std::string Key() const override;
   std::vector<std::string> PrerequisiteKeys() const override;
 };