Fix internal function name for consistency

Fix internal function name for consistency

Change-Id: Iff85e7ab246f863ff47d7312da627a2317479b56
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

diff --git a/src/main.cpp b/src/main.cpp
index 34c5b6b..d0d7930 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -102,7 +102,7 @@ static void cbRemoveClientCtxt(void *data)
 
     // Policy Manager does not know this app was killed,
     // so notify it by deactivate request.
-    g_afb_instance->wmgr.api_deactivate_surface(
+    g_afb_instance->wmgr.api_deactivate_window(
         ctxt->name.c_str(), ctxt->role.c_str(),
         [](const char *) {});
 
@@ -251,7 +251,7 @@ void windowmanager_activatewindow(afb_req req) noexcept
         char* appid = afb_req_get_application_id(req);
         if(appid)
         {
-            g_afb_instance->wmgr.api_activate_surface(
+            g_afb_instance->wmgr.api_activate_window(
                 appid, a_drawing_name, a_drawing_area,
                 [&req](const char *errmsg) {
                     if (errmsg != nullptr)
@@ -294,7 +294,7 @@ void windowmanager_deactivatewindow(afb_req req) noexcept
         char* appid = afb_req_get_application_id(req);
         if(appid)
         {
-            g_afb_instance->wmgr.api_deactivate_surface(
+            g_afb_instance->wmgr.api_deactivate_window(
                 appid, a_drawing_name,
                 [&req](const char *errmsg) {
                     if (errmsg != nullptr)

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index c69c839..c73952d 100644 (file)
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -260,7 +260,7 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
     return nullptr;
 }
 
-void WindowManager::api_activate_surface(char const *appid, char const *drawing_name,
+void WindowManager::api_activate_window(char const *appid, char const *drawing_name,
                                char const *drawing_area, const reply_func &reply)
 {
     // TODO: application requests by old role,
@@ -313,7 +313,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
     }
 }
 
-void WindowManager::api_deactivate_surface(char const *appid, char const *drawing_name,
+void WindowManager::api_deactivate_window(char const *appid, char const *drawing_name,
                                  const reply_func &reply)
 {
     // TODO: application requests by old role,

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index 6416e67..712edec 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -173,9 +173,9 @@ class WindowManager
 
     result<int> api_request_surface(char const *appid, char const *role);
     char const *api_request_surface(char const *appid, char const *role, char const *ivi_id);
-    void api_activate_surface(char const *appid, char const *role, char const *drawing_area, const reply_func &reply);
-    void api_deactivate_surface(char const *appid, char const *role, const reply_func &reply);
-    void  api_enddraw(char const *appid, char const *role);
+    void api_activate_window(char const *appid, char const *role, char const *drawing_area, const reply_func &reply);
+    void api_deactivate_window(char const *appid, char const *role, const reply_func &reply);
+    void api_enddraw(char const *appid, char const *role);
     int  api_subscribe(afb_req req, int event_id);
     result<json_object *> api_get_display_info();
     result<json_object *> api_get_area_info(char const *role);