Clean: Remove conversion table from old role

[apps/agl-service-windowmanager.git] / src / window_manager.hpp

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index 6416e67..739abee 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -173,13 +173,12 @@ 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);
-    void api_ping();
     void send_event(const std::string& evname, const std::string& role);
     void send_event(const std::string& evname, const std::string& role, const std::string& area, int x, int y, int w, int h);
 
@@ -189,7 +188,6 @@ class WindowManager
 
     void removeClient(const std::string &appid);
     void exceptionProcessForTransition();
-    const char* convertRoleOldToNew(char const *role);
 
     // Do not use this function
     void timerHandler();
@@ -221,13 +219,9 @@ class WindowManager
 
     int loadOldRoleDb();
 
-    const char *check_surface_exist(const char *role);
-
   private:
     std::map<std::string, struct afb_event> map_afb_event;
     std::unordered_map<std::string, struct rect> area2size;
-    std::unordered_map<std::string, std::string> roleold2new;
-    std::unordered_map<std::string, std::string> rolenew2old;
     std::shared_ptr<LayerControl> lc;
     PMWrapper pmw;
     rect_map area_info;
@@ -235,7 +229,6 @@ class WindowManager
 
     // ID allocation and proxy methods for lookup
     std::unordered_map<unsigned, struct TmpClient> tmp_surface2app;
-    static const char* kDefaultOldRoleDb;
 };
 
 } // namespace wm