From 3636222542f5f52f9139968d7a62b1a92e546e77 Mon Sep 17 00:00:00 2001 From: "lke01.lee" Date: Mon, 10 Dec 2012 20:38:20 +0900 Subject: [PATCH] For livebox configuration [Issue#] [Problem] [Cause] The configuration informations has been changed from pkgname.config to config.xml [Solution] Add parsing routine for livebox configuration [Verification] This patch depends on http://slp-info.sec.samsung.net/gerrit/#/c/128073/, http://slp-info.sec.samsung.net/gerrit/#/c/124174/ Change-Id: I558af74b9b200495ed531a6e2272f23506782e2b --- modules/widget_dao/dao/config_parser_data.cpp | 27 ++++++++++++++ .../dpl/wrt-dao-ro/config_parser_data.h | 37 +++++++++++++++++++ 2 files changed, 64 insertions(+) mode change 100644 => 100755 modules/widget_dao/dao/config_parser_data.cpp mode change 100644 => 100755 modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h diff --git a/modules/widget_dao/dao/config_parser_data.cpp b/modules/widget_dao/dao/config_parser_data.cpp old mode 100644 new mode 100755 index 9e2e2a4..9b71b0f --- a/modules/widget_dao/dao/config_parser_data.cpp +++ b/modules/widget_dao/dao/config_parser_data.cpp @@ -457,4 +457,31 @@ bool ConfigParserData::ServiceInfo::operator!= (const ServiceInfo& info) const m_scheme != info.m_scheme && m_mime != info.m_mime; } + +bool ConfigParserData::LiveboxInfo::operator==(const LiveboxInfo& other) const +{ + return m_appId == other.m_appId && + m_autoLaunch == other.m_autoLaunch && + m_period == other.m_period && + m_network == other.m_network && + m_nodisplay == other.m_nodisplay && + m_primary == other.m_primary && + m_timeout == other.m_timeout && + m_label == other.m_label && + m_icon == other.m_icon; +} + +bool ConfigParserData::LiveboxInfo::operator!=(const LiveboxInfo& other) const +{ + return m_appId != other.m_appId && + m_autoLaunch != other.m_autoLaunch && + m_period != other.m_period && + m_network != other.m_network && + m_nodisplay != other.m_nodisplay && + m_primary != other.m_primary && + m_timeout != other.m_timeout && + m_label != other.m_label && + m_icon != other.m_icon; +} + } // namespace WrtDB diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h old mode 100644 new mode 100755 index 918ae0d..60c5879 --- a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h @@ -205,6 +205,43 @@ class ConfigParserData bool operator!=(const ServiceInfo&) const; }; typedef std::list ServiceInfoList; + + typedef std::list> BoxSizeList; + + struct LiveboxInfo + { + LiveboxInfo() { } + + struct Box + { + DPL::String m_boxSrc; + BoxSizeList m_boxSize ; + DPL::String m_pdSrc; + DPL::String m_pdWidth; + DPL::String m_pdHeight; + }; typedef Box BoxInfo; + + DPL::String m_appId; + DPL::String m_autoLaunch; + DPL::String m_period; + DPL::String m_network; + DPL::String m_nodisplay; + DPL::String m_primary; + DPL::String m_timeout; + DPL::String m_label; + DPL::String m_icon; + BoxInfo m_boxInfo; + + bool operator==(const LiveboxInfo&) const; + bool operator!=(const LiveboxInfo&) const; + bool operator >(const LiveboxInfo&) const; + bool operator>=(const LiveboxInfo&) const; + bool operator <(const LiveboxInfo&) const; + bool operator<=(const LiveboxInfo&) const; + }; + typedef std::list> LiveboxList; + LiveboxList m_livebox; + typedef std::list DependsPkgList; typedef std::set CategoryList; -- 2.34.1