[Release] wrt-installer_0.1.85

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

diff --git a/src/jobs/widget_install/manifest.h b/src/jobs/widget_install/manifest.h
old mode 100755 (executable)
new mode 100644 (file)
index 30a849d..1729716
--- a/src/jobs/widget_install/manifest.h
+++ b/src/jobs/widget_install/manifest.h
@@ -29,6 +29,7 @@
 #include <dpl/string.h>
 #include <dpl/optional_typedefs.h>
 #include <dpl/foreach.h>
+#include <dpl/wrt-dao-ro/config_parser_data.h>
 
 namespace Jobs {
 namespace WidgetInstall {
@@ -77,7 +78,7 @@ typedef DPL::String NcnameType, NmtokenType, AnySimpleType, LangType;
 typedef DPL::String OperationType, MimeType, UriType, TypeType, PackageType;
 typedef DPL::OptionalString InstallLocationType, CategoriesType;
 typedef DPL::String AppCategoryType;
-typedef DPL::String KeyType, ValueType;
+typedef DPL::OptionalString KeyType, ValueType;
 
 /**
  * xmllib2 wrappers
@@ -405,15 +406,15 @@ typedef UiApplication UiApplicationType;
 /**
  * @brief LiveBox element
  */
-typedef std::list<std::pair<DPL::String, DPL::String> > boxSizeType;
-typedef std::list<std::pair<DPL::String, DPL::String> > boxLabelType;
+typedef WrtDB::ConfigParserData::LiveboxInfo::BoxSizeList BoxSizeType;
+typedef WrtDB::ConfigParserData::LiveboxInfo::BoxLabelList BoxLabelType;
 
 struct BoxInfo
 {
     NcnameType boxSrc;
     NcnameType boxMouseEvent;
     NcnameType boxTouchEffect;
-    boxSizeType boxSize;
+    BoxSizeType boxSize;
     NcnameType pdSrc;
     NcnameType pdWidth;
     NcnameType pdHeight;
@@ -436,7 +437,7 @@ class LiveBox
     {
         this->updatePeriod = x;
     }
-    void setLabel(const boxLabelType &x)
+    void setLabel(const BoxLabelType &x)
     {
         this->label = x;
     }
@@ -457,7 +458,7 @@ class LiveBox
     NcnameType autoLaunch;
     NcnameType updatePeriod;
     NcnameType timeout;
-    boxLabelType label;
+    BoxLabelType label;
     NcnameType icon;
     NcnameType lang;
     BoxInfoType box;