From 25299ef60fa4df5f590ff364cff004e90376a4bf Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Tue, 19 Feb 2019 09:29:53 +0800 Subject: Define func_list as static For sharing func_list between all client instance, define func_list as static. Change-Id: I8a0a131128e057cc55a2d3efb76b66033dd20a04 Signed-off-by: wang_zhiqiang --- src/hs-client.cpp | 15 +++++++++++++++ src/hs-client.h | 13 +------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/hs-client.cpp b/src/hs-client.cpp index dd91e10..e0d4bf0 100644 --- a/src/hs-client.cpp +++ b/src/hs-client.cpp @@ -27,6 +27,21 @@ static const char _parameter[] = "parameter"; static const char _replyto[] = "replyto"; static const char _caller[] = "caller"; +// homescreen-service event and event handler function list +const std::unordered_map HS_Client::func_list { + {"tap_shortcut", &HS_Client::tap_shortcut}, + {"showWindow", &HS_Client::showWindow}, + {"hideWindow", &HS_Client::hideWindow}, + {"replyShowWindow", &HS_Client::replyShowWindow}, + {"on_screen_message", &HS_Client::on_screen_message}, + {"on_screen_reply", &HS_Client::on_screen_reply}, + {"subscribe", &HS_Client::subscribe}, + {"unsubscribe", &HS_Client::unsubscribe}, + {"showNotification", &HS_Client::showNotification}, + {"showInformation", &HS_Client::showInformation}, + {"application-list-changed", nullptr} +}; + /** * HS_Client construction function * diff --git a/src/hs-client.h b/src/hs-client.h index 5b384b1..ac4d004 100644 --- a/src/hs-client.h +++ b/src/hs-client.h @@ -46,18 +46,7 @@ private: int showInformation(afb_req_t request); typedef int (HS_Client::*func_handler)(afb_req_t); - const std::unordered_map func_list { - {"tap_shortcut", &HS_Client::tap_shortcut}, - {"showWindow", &HS_Client::showWindow}, - {"hideWindow", &HS_Client::hideWindow}, - {"replyShowWindow", &HS_Client::replyShowWindow}, - {"on_screen_message", &HS_Client::on_screen_message}, - {"on_screen_reply", &HS_Client::on_screen_reply}, - {"subscribe", &HS_Client::subscribe}, - {"unsubscribe", &HS_Client::unsubscribe}, - {"showNotification", &HS_Client::showNotification}, - {"showInformation", &HS_Client::showInformation} - }; + static const std::unordered_map func_list; bool checkEvent(const char* event); bool isSupportEvent(const char* event); -- cgit 1.2.3-korg