From 19e65d3fdcde442f24e99d4df014d9ccb1bcb74e Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Mon, 11 Feb 2013 14:02:27 +0100 Subject: [PATCH] Unused fields in WidgetRegisterInfo [Issue#] LINUXWRT-72 [Bug] Unused fields [Cause] N/A [Solution] Remveo them [Verification] Build repository wrt-commons,wrt-installer Change-Id: I7b519f6f24c2106d9b397410bd0d94fd0b8def07 --- modules/widget_dao/dao/widget_dao.cpp | 11 ++--------- .../widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h | 1 - .../widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h | 3 --- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/widget_dao/dao/widget_dao.cpp b/modules/widget_dao/dao/widget_dao.cpp index 6529fd0..65ea027 100644 --- a/modules/widget_dao/dao/widget_dao.cpp +++ b/modules/widget_dao/dao/widget_dao.cpp @@ -380,15 +380,8 @@ DbWidgetHandle WidgetDAO::registerWidgetInfo( row.Set_app_id(*handle); } - if (regInfo.webAppType == APP_TYPE_UNKNOWN && regInfo.type != - APP_TYPE_UNKNOWN) - { - // TODO : regInfo.type is temporary code for security. - // This code will be removed. - row.Set_widget_type(regInfo.type.appType); - } else { - row.Set_widget_type(regInfo.webAppType.appType); - } + row.Set_widget_type(regInfo.webAppType.appType); + row.Set_widget_id(widgetConfigurationInfo.widget_id); row.Set_defaultlocale(widgetConfigurationInfo.defaultlocale); row.Set_widget_version(widgetConfigurationInfo.version); 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 index c6ae0bd..f56be55 100644 --- 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 @@ -299,7 +299,6 @@ class ConfigParserData IconsList iconsList; // tizen id / required platform min version for TIZEN webapp - DPL::OptionalString tizenId; DPL::OptionalString tizenMinVersionRequired; DPL::OptionalString tizenPkgId; DPL::OptionalString tizenAppId; diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h index a7cd866..c2b1de2 100644 --- a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h @@ -163,7 +163,6 @@ struct WidgetRegisterInfo {} WidgetType webAppType; - WidgetType type; // TODO : This type will be removed. DPL::OptionalString guid; DPL::OptionalString version; DPL::OptionalString minVersion; @@ -174,8 +173,6 @@ struct WidgetRegisterInfo ConfigParserData configInfo; LocalizationData localizationData; - DPL::OptionalString pkgname; - WidgetPkgName pkgName; TizenPkgId tzPkgid; TizenAppId tzAppid; -- 2.7.4