summaryrefslogtreecommitdiff
path: root/src/protocols/WaylandProtocol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocols/WaylandProtocol.cpp')
-rw-r--r--src/protocols/WaylandProtocol.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/protocols/WaylandProtocol.cpp b/src/protocols/WaylandProtocol.cpp
index 8eff80b0..8aa2c896 100644
--- a/src/protocols/WaylandProtocol.cpp
+++ b/src/protocols/WaylandProtocol.cpp
@@ -14,17 +14,17 @@ static void displayDestroyInternal(struct wl_listener* listener, void* data) {
void IWaylandProtocol::onDisplayDestroy() {
wl_list_remove(&m_liDisplayDestroy.listener.link);
wl_list_init(&m_liDisplayDestroy.listener.link);
- if (m_pGlobal) {
- wl_global_destroy(m_pGlobal);
- m_pGlobal = nullptr;
+ if (m_global) {
+ wl_global_destroy(m_global);
+ m_global = nullptr;
}
}
IWaylandProtocol::IWaylandProtocol(const wl_interface* iface, const int& ver, const std::string& name) :
- m_szName(name), m_pGlobal(wl_global_create(g_pCompositor->m_wlDisplay, iface, ver, this, &bindManagerInternal)) {
+ m_name(name), m_global(wl_global_create(g_pCompositor->m_wlDisplay, iface, ver, this, &bindManagerInternal)) {
- if UNLIKELY (!m_pGlobal) {
- LOGM(ERR, "could not create a global [{}]", m_szName);
+ if UNLIKELY (!m_global) {
+ LOGM(ERR, "could not create a global [{}]", m_name);
return;
}
@@ -33,7 +33,7 @@ IWaylandProtocol::IWaylandProtocol(const wl_interface* iface, const int& ver, co
m_liDisplayDestroy.parent = this;
wl_display_add_destroy_listener(g_pCompositor->m_wlDisplay, &m_liDisplayDestroy.listener);
- LOGM(LOG, "Registered global [{}]", m_szName);
+ LOGM(LOG, "Registered global [{}]", m_name);
}
IWaylandProtocol::~IWaylandProtocol() {
@@ -41,10 +41,10 @@ IWaylandProtocol::~IWaylandProtocol() {
}
void IWaylandProtocol::removeGlobal() {
- if (m_pGlobal)
- wl_global_remove(m_pGlobal);
+ if (m_global)
+ wl_global_remove(m_global);
}
wl_global* IWaylandProtocol::getGlobal() {
- return m_pGlobal;
+ return m_global;
}