From 237be6f894c56cc32042c9dee16b6445bbae92f7 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 13 Jun 2018 22:00:58 +0900 Subject: [PATCH] Use camel case Change-Id: I4f4e714d2aeea4b7cca95495293aab88b97fc2ca Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 36 ++++++++++++++++++------------------ src/app.hpp | 14 +++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index d44986e..9e6e3d5 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -128,7 +128,7 @@ void App::timerHandler() g_app_list.reqDump(); if (g_app_list.haveRequest()) { - this->process_request(); + this->processRequest(); } } @@ -421,7 +421,7 @@ void App::layout_commit() this->display->flush(); } -void App::set_timer() +void App::setTimer() { HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate"); if (g_timer_ev_src == nullptr) @@ -442,7 +442,7 @@ void App::set_timer() } } -void App::stop_timer() +void App::stopTimer() { unsigned req_num = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req_num, "Timer stop"); @@ -563,20 +563,20 @@ WMError App::lm_layout_change(const struct WMAction &action) return WMError::SUCCESS; } -WMError App::do_transition(unsigned req_num) +WMError App::doTransition(unsigned req_num) { HMI_SEQ_DEBUG(req_num, "check next state"); - WMError ret = this->check_policy(req_num); + WMError ret = this->checkPolicy(req_num); if (ret != WMError::SUCCESS) { return ret; } HMI_SEQ_DEBUG(req_num, "Start transition."); - ret = this->start_transition(req_num); + ret = this->startTransition(req_num); return ret; } -WMError App::check_policy(unsigned req_num) +WMError App::checkPolicy(unsigned req_num) { /* * Check Policy @@ -651,7 +651,7 @@ WMError App::check_policy(unsigned req_num) return ret; } -WMError App::start_transition(unsigned req_num) +WMError App::startTransition(unsigned req_num) { bool sync_draw_happen = false; bool found = false; @@ -678,7 +678,7 @@ WMError App::start_transition(unsigned req_num) if (sync_draw_happen) { - this->set_timer(); + this->setTimer(); } else { @@ -889,7 +889,7 @@ const char *App::check_surface_exist(const char *drawing_name) //reply(nullptr); } -WMError App::set_request(const std::string& appid, const std::string &role, const std::string &area, +WMError App::setRequest(const std::string& appid, const std::string &role, const std::string &area, Task task, unsigned* req_num) { if (!g_app_list.contains(appid)) @@ -931,7 +931,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char unsigned req_num = 0; WMError ret = WMError::UNKNOWN; - ret = this->set_request(id, role, area, task, &req_num); + ret = this->setRequest(id, role, area, task, &req_num); if(ret != WMError::SUCCESS) { @@ -951,7 +951,7 @@ void App::api_activate_surface(char const *appid, char const *drawing_name, char /* * Do allocate tasks */ - ret = this->do_transition(req_num); + ret = this->doTransition(req_num); if (ret != WMError::SUCCESS) { @@ -1010,7 +1010,7 @@ void App::api_deactivate_surface(char const *appid, char const *drawing_name, co /* * Do allocate tasks */ - WMError ret = this->do_transition(new_req); + WMError ret = this->doTransition(new_req); if (ret != WMError::SUCCESS) { @@ -1089,11 +1089,11 @@ void App::do_enddraw(unsigned req_num) } while (!g_app_list.requestFinished());*/ } -void App::process_request() +void App::processRequest() { unsigned req = g_app_list.currentRequestNumber(); HMI_SEQ_DEBUG(req, "Do next request"); - WMError rc = do_transition(req); + WMError rc = doTransition(req); if(rc != WMError::SUCCESS){ HMI_SEQ_ERROR(req, errorDescription(rc)); } @@ -1115,17 +1115,17 @@ void App::api_enddraw(char const *appid, char const *drawing_name) if (g_app_list.endDrawFullfilled(current_req)) { // do task for endDraw - //this->stop_timer(); + //this->stopTimer(); this->do_enddraw(current_req); - this->stop_timer(); + this->stopTimer(); g_app_list.removeRequest(current_req); HMI_SEQ_INFO(current_req, "Finish request"); g_app_list.next(); if (g_app_list.haveRequest()) { - this->process_request(); + this->processRequest(); } } else diff --git a/src/app.hpp b/src/app.hpp index e04472e..9f53f84 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -263,16 +263,16 @@ struct App void emit_invisible(char const *label); void emit_visible(char const *label); - WMError set_request(const std::string &appid, const std::string &role, const std::string &area, + WMError setRequest(const std::string &appid, const std::string &role, const std::string &area, Task task, unsigned *req_num); - WMError do_transition(unsigned sequence_number); - WMError check_policy(unsigned req_num); - WMError start_transition(unsigned req_num); + WMError doTransition(unsigned sequence_number); + WMError checkPolicy(unsigned req_num); + WMError startTransition(unsigned req_num); + void setTimer(); + void stopTimer(); + void processRequest(); void do_enddraw(unsigned req_num); - void process_request(); - void set_timer(); - void stop_timer(); const char *check_surface_exist(const char *drawing_name); void activate(int id); -- 2.16.6