aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-19 11:40:15 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-19 11:40:15 +0900
commit260f9c8caae3938815fded0993c6b33676638268 (patch)
treedb12bf1dbe1d016716948a4a63fbb40ca83bed8f /src
parent9d618900f7f1673af2299d3d86a8a912ded478fc (diff)
Unify the name of request number to req_num
Change-Id: I37eee15fd220556482cc9ad2a15b656d044cf8c9 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src')
-rw-r--r--src/app.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/app.cpp b/src/app.cpp
index ba49d74..831f13f 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -648,9 +648,9 @@ WMError App::startTransition(unsigned req_num)
return ret;
}
- for (const auto &y : actions)
+ for (const auto &action : actions)
{
- if (y.visible != TaskVisible::INVISIBLE)
+ if (action.visible != TaskVisible::INVISIBLE)
{
sync_draw_happen = true;
this->emit_syncdraw(y.role, y.area);
@@ -668,12 +668,12 @@ WMError App::startTransition(unsigned req_num)
{
// deactivate only, no syncDraw
// Make it deactivate here
- for (const auto &z : actions)
+ for (const auto &x : actions)
{
if (g_app_list.contains(z.appid))
{
- auto client = g_app_list.lookUpClient(z.appid);
- this->deactivate(client->surfaceID(z.role));
+ auto client = g_app_list.lookUpClient(x.appid);
+ this->deactivate(client->surfaceID(x.role));
}
}
ret = NO_LAYOUT_CHANGE;
@@ -683,8 +683,8 @@ WMError App::startTransition(unsigned req_num)
WMError App::setInvisibleTask(const std::string &role, bool split)
{
- unsigned req = g_app_list.currentRequestNumber();
- HMI_SEQ_DEBUG(req, "set current visible app to invisible task");
+ unsigned req_num = g_app_list.currentRequestNumber();
+ HMI_SEQ_DEBUG(req_num, "set current visible app to invisible task");
// This task is copied from original actiavete surface
const char *drawing_name = role.c_str();
auto const &surface_id = this->lookup_id(drawing_name);
@@ -714,9 +714,9 @@ WMError App::setInvisibleTask(const std::string &role, bool split)
if(!found){
return WMError::NOT_REGISTERED;
}
- HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str());
+ HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str());
WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
- g_app_list.setAction(req, act);
+ g_app_list.setAction(req_num, act);
l.second.state.main = -1;
}
@@ -730,9 +730,9 @@ WMError App::setInvisibleTask(const std::string &role, bool split)
{
return WMError::NOT_REGISTERED;
}
- HMI_SEQ_INFO(req, "Invisible %s", add_name.c_str());
+ HMI_SEQ_INFO(req_num, "Invisible %s", add_name.c_str());
WMAction act{add_name, add_role, add_area, task_visible, end_draw_finished};
- g_app_list.setAction(req, act);
+ g_app_list.setAction(req_num, act);
l.second.state.sub = -1;
}
}
@@ -772,13 +772,13 @@ WMError App::setInvisibleTask(const std::string &role, bool split)
deact_sub.appid = g_app_list.getAppID(state.sub, main, &found);
if (!found)
{
- HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
+ HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
return WMError::NOT_REGISTERED;
}
deact_sub.visible = task_visible;
deact_sub.end_draw_finished = end_draw_finished;
- HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
- g_app_list.setAction(req, deact_sub);
+ HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
+ g_app_list.setAction(req_num, deact_sub);
}
}
//state = LayoutState{state.main, *surface_id};
@@ -798,13 +798,13 @@ WMError App::setInvisibleTask(const std::string &role, bool split)
deact_main.appid = g_app_list.getAppID(state.main, deact_main.role, &found);
if (!found)
{
- HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist");
+ HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist");
return WMError::NOT_REGISTERED;
}
deact_main.visible = task_visible;
deact_main.end_draw_finished = end_draw_finished;
- HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
- g_app_list.setAction(req, deact_main);
+ HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
+ g_app_list.setAction(req_num, deact_main);
}
if (state.sub != -1)
{
@@ -818,13 +818,13 @@ WMError App::setInvisibleTask(const std::string &role, bool split)
deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found);
if (!found)
{
- HMI_SEQ_DEBUG(req, "sub surface ddoesn't exist");
+ HMI_SEQ_DEBUG(req_num, "sub surface ddoesn't exist");
return WMError::NOT_REGISTERED;
}
deact_sub.visible = task_visible;
deact_sub.end_draw_finished = end_draw_finished;
- HMI_SEQ_DEBUG(req, "sub surface doesn't exist");
- g_app_list.setAction(req, deact_sub);
+ HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist");
+ g_app_list.setAction(req_num, deact_sub);
}
}
//state = LayoutState{*surface_id};