protocols: refactor class member vars (u-z) (#10282)

* protocols: refactor class member vars (u-z)

* protocols: fix clang format

1 files changed, 18 insertions, 18 deletions

diff --git a/src/protocols/XDGDialog.cpp b/src/protocols/XDGDialog.cpp
index 675d4e78..c38a1077 100644
--- a/src/protocols/XDGDialog.cpp
+++ b/src/protocols/XDGDialog.cpp
@@ -4,29 +4,29 @@
 #include "../Compositor.hpp"
 #include <algorithm>
 
-CXDGDialogV1Resource::CXDGDialogV1Resource(SP<CXdgDialogV1> resource_, SP<CXDGToplevelResource> toplevel_) : resource(resource_), toplevel(toplevel_) {
+CXDGDialogV1Resource::CXDGDialogV1Resource(SP<CXdgDialogV1> resource_, SP<CXDGToplevelResource> toplevel_) : m_resource(resource_), m_toplevel(toplevel_) {
     if UNLIKELY (!good())
         return;
 
-    resource->setDestroy([this](CXdgDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
-    resource->setOnDestroy([this](CXdgDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
+    m_resource->setDestroy([this](CXdgDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
+    m_resource->setOnDestroy([this](CXdgDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
 
-    resource->setSetModal([this](CXdgDialogV1* r) {
+    m_resource->setSetModal([this](CXdgDialogV1* r) {
         modal = true;
         updateWindow();
     });
 
-    resource->setUnsetModal([this](CXdgDialogV1* r) {
+    m_resource->setUnsetModal([this](CXdgDialogV1* r) {
         modal = false;
         updateWindow();
     });
 }
 
 void CXDGDialogV1Resource::updateWindow() {
-    if UNLIKELY (!toplevel || !toplevel->parent || !toplevel->parent->owner)
+    if UNLIKELY (!m_toplevel || !m_toplevel->m_parent || !m_toplevel->m_parent->m_owner)
         return;
 
-    auto HLSurface = CWLSurface::fromResource(toplevel->parent->owner->surface.lock());
+    auto HLSurface = CWLSurface::fromResource(m_toplevel->m_parent->m_owner->m_surface.lock());
     if UNLIKELY (!HLSurface || !HLSurface->getWindow())
         return;
 
@@ -34,36 +34,36 @@ void CXDGDialogV1Resource::updateWindow() {
 }
 
 bool CXDGDialogV1Resource::good() {
-    return resource->resource();
+    return m_resource->resource();
 }
 
-CXDGWmDialogManagerResource::CXDGWmDialogManagerResource(SP<CXdgWmDialogV1> resource_) : resource(resource_) {
+CXDGWmDialogManagerResource::CXDGWmDialogManagerResource(SP<CXdgWmDialogV1> resource_) : m_resource(resource_) {
     if UNLIKELY (!good())
         return;
 
-    resource->setDestroy([this](CXdgWmDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
-    resource->setOnDestroy([this](CXdgWmDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
+    m_resource->setDestroy([this](CXdgWmDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
+    m_resource->setOnDestroy([this](CXdgWmDialogV1* r) { PROTO::xdgDialog->destroyResource(this); });
 
-    resource->setGetXdgDialog([](CXdgWmDialogV1* r, uint32_t id, wl_resource* toplevel) {
+    m_resource->setGetXdgDialog([](CXdgWmDialogV1* r, uint32_t id, wl_resource* toplevel) {
         auto tl = CXDGToplevelResource::fromResource(toplevel);
         if UNLIKELY (!tl) {
             r->error(-1, "Toplevel inert");
             return;
         }
 
-        const auto RESOURCE = PROTO::xdgDialog->m_vDialogs.emplace_back(makeShared<CXDGDialogV1Resource>(makeShared<CXdgDialogV1>(r->client(), r->version(), id), tl));
+        const auto RESOURCE = PROTO::xdgDialog->m_dialogs.emplace_back(makeShared<CXDGDialogV1Resource>(makeShared<CXdgDialogV1>(r->client(), r->version(), id), tl));
 
         if UNLIKELY (!RESOURCE->good()) {
             r->noMemory();
             return;
         }
 
-        tl->dialog = RESOURCE;
+        tl->m_dialog = RESOURCE;
     });
 }
 
 bool CXDGWmDialogManagerResource::good() {
-    return resource->resource();
+    return m_resource->resource();
 }
 
 CXDGDialogProtocol::CXDGDialogProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
@@ -71,7 +71,7 @@ CXDGDialogProtocol::CXDGDialogProtocol(const wl_interface* iface, const int& ver
 }
 
 void CXDGDialogProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
-    const auto RESOURCE = m_vManagers.emplace_back(makeShared<CXDGWmDialogManagerResource>(makeShared<CXdgWmDialogV1>(client, ver, id)));
+    const auto RESOURCE = m_managers.emplace_back(makeShared<CXDGWmDialogManagerResource>(makeShared<CXdgWmDialogV1>(client, ver, id)));
 
     if UNLIKELY (!RESOURCE->good()) {
         wl_client_post_no_memory(client);
@@ -80,9 +80,9 @@ void CXDGDialogProtocol::bindManager(wl_client* client, void* data, uint32_t ver
 }
 
 void CXDGDialogProtocol::destroyResource(CXDGWmDialogManagerResource* res) {
-    std::erase_if(m_vManagers, [&](const auto& other) { return other.get() == res; });
+    std::erase_if(m_managers, [&](const auto& other) { return other.get() == res; });
 }
 
 void CXDGDialogProtocol::destroyResource(CXDGDialogV1Resource* res) {
-    std::erase_if(m_vDialogs, [&](const auto& other) { return other.get() == res; });
+    std::erase_if(m_dialogs, [&](const auto& other) { return other.get() == res; });
 }