From 7fde65d6b2b8ca098ead7ccd1ce25c435d7af8a3 Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Tue, 15 Oct 2013 10:05:48 +0900 Subject: [PATCH] Add deprecated mark to unnecessary GlobalDAO method [Issue#] LINUXWRT-1021 [Problem] GlobalDAO has unnecessary method. [Cause] N/A [Solution] Add deprecated mark. - SetSecureByDefault, GetSecureByDefault - GetWhiteURIList, AddWhiteURI, RemoveWhiteURI - GetCookieSharingMode, SetCookieSharingMode - GetHomeNetworkDataUsage, SetHomeNetworkDataUsage - GetRoamingDataUsage, SetRoamingDataUsage - GetUserAgentValue - GlobalDAO [Verification] Build wrt repos [SCMRequest] N/A Change-Id: I1f146cfac3ddd6359b4f0a703000b5830f1f6264 --- .../include/dpl/wrt-dao-ro/global_dao_read_only.h | 13 +++++++------ .../include/dpl/wrt-dao-rw/global_dao.h | 15 ++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h b/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h index 0206e89..986d7e8 100644 --- a/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/global_dao_read_only.h @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -55,11 +56,11 @@ class GlobalDAOReadOnly public: - static bool GetSecureByDefault(); + static bool GetSecureByDefault() DPL_DEPRECATED; - static WidgetAccessInfoList GetWhiteURIList(); + static WidgetAccessInfoList GetWhiteURIList() DPL_DEPRECATED; - static bool GetCookieSharingMode(); + static bool GetCookieSharingMode() DPL_DEPRECATED; enum NetworkAccessMode { @@ -73,16 +74,16 @@ class GlobalDAOReadOnly * * @return Access mode for home network. */ - static NetworkAccessMode GetHomeNetworkDataUsage(); + static NetworkAccessMode GetHomeNetworkDataUsage() DPL_DEPRECATED; /** * This method returns network access mode while roaming is enabled. * * @return Access mode for home network. */ - static NetworkAccessMode GetRoamingDataUsage(); + static NetworkAccessMode GetRoamingDataUsage() DPL_DEPRECATED; - static DPL::String GetUserAgentValue(const DPL::String &key); + static DPL::String GetUserAgentValue(const DPL::String &key) DPL_DEPRECATED; /** * This method returns set of device capabilities used by apifeature. diff --git a/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h b/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h index 9b72a89..f4d8c9b 100644 --- a/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h +++ b/modules/widget_dao/include/dpl/wrt-dao-rw/global_dao.h @@ -23,34 +23,35 @@ #ifndef WRT_SRC_CONFIGURATION_GLOBAL_DAO_H_ #define WRT_SRC_CONFIGURATION_GLOBAL_DAO_H_ +#include #include namespace WrtDB { class GlobalDAO : public GlobalDAOReadOnly { public: - static void SetSecureByDefault(bool secureByDefault); + static void SetSecureByDefault(bool secureByDefault) DPL_DEPRECATED; - static void AddWhiteURI(const std::string &value, bool subDomain); + static void AddWhiteURI(const std::string &value, bool subDomain) DPL_DEPRECATED; - static void RemoveWhiteURI(const std::string &uri); + static void RemoveWhiteURI(const std::string &uri) DPL_DEPRECATED; /** * This method changes network access mode while roaming is enabled. * */ - static void SetHomeNetworkDataUsage(NetworkAccessMode newMode); + static void SetHomeNetworkDataUsage(NetworkAccessMode newMode) DPL_DEPRECATED; /** * This method changes network access mode while roaming is enabled. * */ - static void SetRoamingDataUsage(NetworkAccessMode newMode); + static void SetRoamingDataUsage(NetworkAccessMode newMode) DPL_DEPRECATED; - static void SetCookieSharingMode(bool mode); + static void SetCookieSharingMode(bool mode) DPL_DEPRECATED; private: - GlobalDAO() + DPL_DEPRECATED GlobalDAO() {} }; } // namespace WrtDB -- 2.34.1