Change function name

addAllocateRequest -> addRequest for convenience

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

diff --git a/src/app.cpp b/src/app.cpp
index b029601..a0e7130 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -892,7 +892,7 @@ WMError App::setRequest(const std::string& appid, const std::string &role, const
     }
 
     WMRequest req = WMRequest(appid, role, area, task);
-    unsigned new_req = g_app_list.addAllocateRequest(req);
+    unsigned new_req = g_app_list.addRequest(req);
     *req_num = new_req;
     g_app_list.reqDump();
 

diff --git a/src/applist.cpp b/src/applist.cpp
index b947518..c6eaa0c 100644 (file)
--- a/src/applist.cpp
+++ b/src/applist.cpp
@@ -225,7 +225,7 @@ unsigned AppList::getRequestNumber(const string &appid) const
  * @attention If the request number is different with curent request number,
  *            it means the previous request is not finished.
  */
-unsigned AppList::addAllocateRequest(WMRequest req)
+unsigned AppList::addRequest(WMRequest req)
 {
     std::lock_guard<std::mutex> lock(this->mtx);
     if (this->req_list.size() == 0)

diff --git a/src/applist.hpp b/src/applist.hpp
index 9431ff6..86c9903 100644 (file)
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -53,7 +53,7 @@ class AppList
     // Request Interface
     unsigned currentRequestNumber() const;
     unsigned getRequestNumber(const std::string &appid) const;
-    unsigned addAllocateRequest(WMRequest req);
+    unsigned addRequest(WMRequest req);
     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, TaskVisible visible);
     bool setEndDrawFinished(unsigned req_num, const std::string &appid, const std::string &role);

diff --git a/test/test.cpp b/test/test.cpp
index 95d7bb5..6fad4bf 100644 (file)
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -153,9 +153,9 @@ TEST_F(reqtest, 3_allocate_sequence)
   wm::WMRequest req1(test1, test_role1, test_area1, wm::Task::TASK_ALLOCATE);
   wm::WMRequest req2(test2, test_role2, test_area2, wm::Task::TASK_RELEASE);
   wm::WMRequest req3(test3, test_role3, test_area3, wm::Task::TASK_ALLOCATE);
-  unsigned seq1 = app_list.addAllocateRequest(req1);
-  unsigned seq2 = app_list.addAllocateRequest(req2);
-  unsigned seq3 = app_list.addAllocateRequest(req3);
+  unsigned seq1 = app_list.addRequest(req1);
+  unsigned seq2 = app_list.addRequest(req2);
+  unsigned seq3 = app_list.addRequest(req3);
   bool found = false;
   bool result = false;