From: Kazumasa Mitsunari Date: Fri, 8 Jun 2018 04:38:26 +0000 (+0900) Subject: Change struct name wmClientCtxt to WMClientCtxt X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=79475867a0d9a508d357c21d064d1f6aa141e0f2;hp=0b6c8e7cb7da03eddddab96d4bc0ec9eeb92260f;p=apps%2Fagl-service-windowmanager.git Change struct name wmClientCtxt to WMClientCtxt Change-Id: Iac27465a9a0d737209973d25397fd400572d872d Signed-off-by: Kazumasa Mitsunari --- diff --git a/src/main.cpp b/src/main.cpp index ef07e26..332a158 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,16 +31,16 @@ extern "C" #include } -typedef struct wmClientCtxt +typedef struct WMClientCtxt { std::string name; std::string role; - wmClientCtxt(const char *appName, const char* appRole) + WMClientCtxt(const char *appName, const char* appRole) { name = appName; role = role; } -} wmClientCtxt; +} WMClientCtxt; struct afb_instance { @@ -180,13 +180,13 @@ int binding_init() noexcept static bool checkFirstReq(afb_req req) { - wmClientCtxt *ctxt = (wmClientCtxt *)afb_req_context_get(req); + WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req); return (ctxt) ? false : true; } static void cbRemoveClientCtxt(void *data) { - wmClientCtxt *ctxt = (wmClientCtxt *)data; + WMClientCtxt *ctxt = (WMClientCtxt *)data; if (ctxt == nullptr) { return; @@ -232,7 +232,7 @@ void windowmanager_requestsurface(afb_req req) noexcept bool isFirstReq = checkFirstReq(req); if (!isFirstReq) { - wmClientCtxt *ctxt = (wmClientCtxt *)afb_req_context_get(req); + WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req); HMI_DEBUG("wm", "You're %s.", ctxt->name.c_str()); if (ctxt->name != std::string(a_drawing_name)) { @@ -247,7 +247,7 @@ void windowmanager_requestsurface(afb_req req) noexcept if (isFirstReq) { - wmClientCtxt *ctxt = new wmClientCtxt(afb_req_get_application_id(req), a_drawing_name); + WMClientCtxt *ctxt = new WMClientCtxt(afb_req_get_application_id(req), a_drawing_name); HMI_DEBUG("wm", "create session for %s", ctxt->name.c_str()); afb_req_session_set_LOA(req, 1); afb_req_context_set(req, ctxt, cbRemoveClientCtxt);