Merge branch 'sandbox/knimitz/format_code' into sandbox/knimitz/lock

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

diff --git a/src/applist.hpp b/src/applist.hpp
index 320d36b..0f2285b 100644 (file)
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -20,9 +20,9 @@
 #include <string>
 #include <map>
 #include <memory>
-//#include <experimental/optional>
 #include "wm-client.hpp"
 #include "request.hpp"
+#include "wm-error.h"
 
 namespace wm
 {
@@ -41,26 +41,25 @@ class AppList
     void addClient(const std::string &appid, const std::string &role);
     void addClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role);
     void removeClient(const std::string &appid);
-    bool contains(const std::string &appid);
-    int  countClient();
+    bool contains(const std::string &appid) const;
+    int  countClient() const;
     std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
     void removeSurface(unsigned surface);
 
     // Request Interface
-    unsigned currentSequenceNumber();
-    unsigned getSequenceNumber(const std::string &appid);
+    unsigned currentRequestNumber() const;
+    unsigned getRequestNumber(const std::string &appid) const;
     unsigned addAllocateRequest(WMRequest req);
     /* TODO: consider, which is better WMClient or std::string appid?
     if appid is key to manage resources, it is better to select std::string
     otherwise WMClient is better, IMO */
-    bool requestFinished();
-    bool setAction(unsigned req_num, const struct WMAction &action);
-    bool setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
+    WMError setAction(unsigned req_num, const struct WMAction &action);
+    WMError setAction(unsigned req_num, const std::string &appid, const std::string &role, const std::string &area, bool visible = true);
     bool setEndDrawFinished(unsigned req_num, const std::string &appid, const std::string &role);
     bool endDrawFullfilled(unsigned req_num);
     void removeRequest(unsigned req_num);
     void next();
-    bool haveRequest();
+    bool haveRequest() const;
 
     struct WMTrigger getRequest(unsigned req_num);
     const std::vector<struct WMAction> &getActions(unsigned req_num);