From 7f6ceaf920b5cb0d5984b8e8294f8ce0f52dfbbb Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 8 Jun 2018 00:53:53 +0900 Subject: Add const to get functions Change-Id: Ibb6976639018f4f45132577f77d57096e2512997 Signed-off-by: Kazumasa Mitsunari --- src/applist.cpp | 14 +++++++------- src/applist.hpp | 12 ++++++------ src/wm-client.cpp | 9 ++++----- src/wm-client.hpp | 8 ++++---- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/applist.cpp b/src/applist.cpp index 462a0d8..2575849 100644 --- a/src/applist.cpp +++ b/src/applist.cpp @@ -53,7 +53,7 @@ void AppList::removeClient(const string &appid) this->app2client.erase(appid); } -bool AppList::contains(const string &appid) +bool AppList::contains(const string &appid) const { auto result = this->app2client.find(appid); return (this->app2client.end() != result) ? true : false; @@ -83,18 +83,18 @@ shared_ptr AppList::lookUpClient(const string &appid) return this->app2client.at(appid); } -int AppList::countClient() +int AppList::countClient() const { return this->app2client.size(); } -unsigned AppList::currentRequestNumber() +unsigned AppList::currentRequestNumber() const { return this->current_req; } // Is this function necessary ? -unsigned AppList::getRequestNumber(const string &appid) +unsigned AppList::getRequestNumber(const string &appid) const { for (const auto &x : this->req_list) { @@ -122,14 +122,14 @@ unsigned AppList::addAllocateRequest(WMRequest req) return req.req_num; // return 1; if you test time_expire } -bool AppList::requestFinished() +bool AppList::requestFinished() const { return this->req_list.empty(); } struct WMTrigger AppList::getRequest(unsigned req_num) { - for (auto &x : this->req_list) + for (const auto &x : this->req_list) { if (req_num == x.req_num) { @@ -269,7 +269,7 @@ void AppList::next() } } -bool AppList::haveRequest() +bool AppList::haveRequest() const { return !this->req_list.empty(); } diff --git a/src/applist.hpp b/src/applist.hpp index a5f64d4..bb80961 100644 --- a/src/applist.hpp +++ b/src/applist.hpp @@ -41,26 +41,26 @@ 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 lookUpClient(const std::string &appid); void removeSurface(unsigned surface); // Request Interface - unsigned currentRequestNumber(); - unsigned getRequestNumber(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 requestFinished() const; 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); 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 &getActions(unsigned req_num); diff --git a/src/wm-client.cpp b/src/wm-client.cpp index 13dae6f..2542016 100644 --- a/src/wm-client.cpp +++ b/src/wm-client.cpp @@ -38,8 +38,7 @@ static const char kKeyError[] = "error"; static const char kKeyErrorDesc[] = "kErrorDescription"; WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, const string &role) - : layer(layerID), - id(appid), + : id(appid), layer(layerID), role2surface(0) { role2surface[role] = surfaceID; @@ -76,12 +75,12 @@ WMClient::~WMClient() { } -string WMClient::appID() +string WMClient::appID() const { return this->id; } -unsigned WMClient::surfaceID(const string &role) +unsigned WMClient::surfaceID(const string &role) const { if (0 == this->role2surface.count(role)) { @@ -91,7 +90,7 @@ unsigned WMClient::surfaceID(const string &role) return this->role2surface.at(role); } -unsigned WMClient::layerID() +unsigned WMClient::layerID() const { return this->layer; } diff --git a/src/wm-client.hpp b/src/wm-client.hpp index 459822d..ad9e7b0 100644 --- a/src/wm-client.hpp +++ b/src/wm-client.hpp @@ -43,9 +43,9 @@ class WMClient WMClient(const std::string &appid, const std::string &role); virtual ~WMClient(); - std::string appID(); - unsigned surfaceID(const std::string &role); - unsigned layerID(); + std::string appID() const; + unsigned surfaceID(const std::string &role) const; + unsigned layerID() const; void registerLayer(unsigned layerID); bool addSurface(const std::string& role, unsigned surface); bool removeSurfaceIfExist(unsigned surfaceID); @@ -57,8 +57,8 @@ class WMClient void dumpInfo(); private: - unsigned layer; std::string id; + unsigned layer; std::unordered_map role2surface; #if GTEST_ENABLED // This is for unit test. afb_make_event occurs sig11 if call not in afb-binding -- cgit 1.2.3-korg