From: Pawel Sikorski
Date: Fri, 21 Aug 2015 09:41:22 +0000 (+0200)
Subject: Alignement to the manifest-parser key exposition changes
X-Git-Tag: accepted/tizen/mobile/20150902.004752~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F46527%2F2;p=platform%2Fcore%2Fappfw%2Fapp-installers.git
Alignement to the manifest-parser key exposition changes
Requires: https://review.tizen.org/gerrit/#/c/46526/
Change-Id: I56f60053b47c78a49e0a7b98f6d7848651ee19d2
---
diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index 3b715f2..cbf9d0e 100755
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -14,7 +14,6 @@
#include
#include
#include
-#include
#include
@@ -56,7 +55,6 @@ namespace wgt {
namespace parse {
namespace app_keys = wgt::application_widget_keys;
-namespace manifest_keys = wgt::application_manifest_keys;
StepParse::StepParse(common_installer::ContextInstaller* context,
bool check_start_file)
@@ -79,7 +77,7 @@ const std::string& StepParse::GetPackageVersion(
bool StepParse::FillIconPaths(manifest_x* manifest) {
std::shared_ptr icons_info =
std::static_pointer_cast(
- parser_->GetManifestData(manifest_keys::kIconsKey));
+ parser_->GetManifestData(app_keys::kIconsKey));
if (icons_info.get()) {
for (auto& application_icon : icons_info->icons()) {
icon_x* icon = reinterpret_cast (calloc(1, sizeof(icon_x)));
@@ -93,7 +91,7 @@ bool StepParse::FillIconPaths(manifest_x* manifest) {
bool StepParse::FillWidgetInfo(manifest_x* manifest) {
std::shared_ptr wgt_info =
std::static_pointer_cast(parser_->GetManifestData(
- parser::kWidgetKey));
+ app_keys::kWidgetKey));
if (!wgt_info.get()) {
LOG(ERROR) << "Widget info manifest data has not been found.";
return false;