Return WMError instead of bool

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

diff --git a/src/wm_client.hpp b/src/wm_client.hpp
index c78d6f9..5342b76 100644 (file)
--- a/src/wm_client.hpp
+++ b/src/wm_client.hpp
@@ -20,6 +20,7 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
+#include "wm_error.hpp"
 
 extern "C"
 {
@@ -42,6 +43,7 @@ class WMClient
     WMClient(const std::string &appid, unsigned layer,
             unsigned surface, const std::string &role);
     WMClient(const std::string &appid, const std::string &role);
+    WMClient(const std::string &appid, unsigned layer, const std::string &role);
     WMClient(const std::string &appid, unsigned layer,
         const std::string& layer_name, unsigned surface, const std::string &role);
     ~WMClient() = default;
@@ -49,7 +51,6 @@ class WMClient
     std::string appID() const;
     unsigned surfaceID(const std::string &role) const;
     unsigned layerID() const;
-    const std::string& getWMLayerName();
     unsigned surfaceID() const;
     std::vector<unsigned> renderOrder() const;
     std::string role(unsigned surface) const;
@@ -57,7 +58,8 @@ class WMClient
     const std::vector<std::string> &roles() const;
     void setRole(const std::string& role);
     void appendRole(const std::string& role);
-    bool addSurface(const std::string& role, unsigned surface);
+    //bool addSurface(const std::string& role, unsigned surface);
+    WMError addSurface(unsigned surface);
     bool removeSurfaceIfExist(unsigned surface);
     bool removeRole(const std::string& role);
 
@@ -71,7 +73,6 @@ class WMClient
   private:
     std::string id;
     unsigned layer;
-    std::string wm_layer_name;
     std::string main_role;
     std::string area;
     unsigned surface; // currently, main application has only one surface.