protocols: refactor class member vars (a-m) (#10265)

1 files changed, 17 insertions, 17 deletions

diff --git a/src/protocols/IdleInhibit.cpp b/src/protocols/IdleInhibit.cpp
index b8ba01e2..f8031d22 100644
--- a/src/protocols/IdleInhibit.cpp
+++ b/src/protocols/IdleInhibit.cpp
@@ -1,25 +1,25 @@
 #include "IdleInhibit.hpp"
 #include "core/Compositor.hpp"
 
-CIdleInhibitor::CIdleInhibitor(SP<CIdleInhibitorResource> resource_, SP<CWLSurfaceResource> surf_) : resource(resource_), surface(surf_) {
+CIdleInhibitor::CIdleInhibitor(SP<CIdleInhibitorResource> resource_, SP<CWLSurfaceResource> surf_) : m_resource(resource_), m_surface(surf_) {
     ;
 }
 
-CIdleInhibitorResource::CIdleInhibitorResource(SP<CZwpIdleInhibitorV1> resource_, SP<CWLSurfaceResource> surface_) : resource(resource_), surface(surface_) {
-    listeners.destroySurface = surface->m_events.destroy.registerListener([this](std::any d) {
-        surface.reset();
-        listeners.destroySurface.reset();
-        destroySent = true;
-        events.destroy.emit();
+CIdleInhibitorResource::CIdleInhibitorResource(SP<CZwpIdleInhibitorV1> resource_, SP<CWLSurfaceResource> surface_) : m_resource(resource_), m_surface(surface_) {
+    m_listeners.destroySurface = m_surface->m_events.destroy.registerListener([this](std::any d) {
+        m_surface.reset();
+        m_listeners.destroySurface.reset();
+        m_destroySent = true;
+        m_events.destroy.emit();
     });
 
-    resource->setOnDestroy([this](CZwpIdleInhibitorV1* p) { PROTO::idleInhibit->removeInhibitor(this); });
-    resource->setDestroy([this](CZwpIdleInhibitorV1* p) { PROTO::idleInhibit->removeInhibitor(this); });
+    m_resource->setOnDestroy([this](CZwpIdleInhibitorV1* p) { PROTO::idleInhibit->removeInhibitor(this); });
+    m_resource->setDestroy([this](CZwpIdleInhibitorV1* p) { PROTO::idleInhibit->removeInhibitor(this); });
 }
 
 CIdleInhibitorResource::~CIdleInhibitorResource() {
-    if (!destroySent)
-        events.destroy.emit();
+    if (!m_destroySent)
+        m_events.destroy.emit();
 }
 
 CIdleInhibitProtocol::CIdleInhibitProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
@@ -27,11 +27,11 @@ CIdleInhibitProtocol::CIdleInhibitProtocol(const wl_interface* iface, const int&
 }
 
 void CIdleInhibitProtocol::onManagerResourceDestroy(wl_resource* res) {
-    std::erase_if(m_vManagers, [res](const auto& other) { return other->resource() == res; });
+    std::erase_if(m_managers, [res](const auto& other) { return other->resource() == res; });
 }
 
 void CIdleInhibitProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
-    const auto RESOURCE = m_vManagers.emplace_back(makeUnique<CZwpIdleInhibitManagerV1>(client, ver, id)).get();
+    const auto RESOURCE = m_managers.emplace_back(makeUnique<CZwpIdleInhibitManagerV1>(client, ver, id)).get();
     RESOURCE->setOnDestroy([this](CZwpIdleInhibitManagerV1* p) { this->onManagerResourceDestroy(p->resource()); });
 
     RESOURCE->setDestroy([this](CZwpIdleInhibitManagerV1* pMgr) { this->onManagerResourceDestroy(pMgr->resource()); });
@@ -40,13 +40,13 @@ void CIdleInhibitProtocol::bindManager(wl_client* client, void* data, uint32_t v
 }
 
 void CIdleInhibitProtocol::removeInhibitor(CIdleInhibitorResource* resource) {
-    std::erase_if(m_vInhibitors, [resource](const auto& el) { return el.get() == resource; });
+    std::erase_if(m_inhibitors, [resource](const auto& el) { return el.get() == resource; });
 }
 
 void CIdleInhibitProtocol::onCreateInhibitor(CZwpIdleInhibitManagerV1* pMgr, uint32_t id, SP<CWLSurfaceResource> surface) {
     const auto CLIENT   = pMgr->client();
-    const auto RESOURCE = m_vInhibitors.emplace_back(makeShared<CIdleInhibitorResource>(makeShared<CZwpIdleInhibitorV1>(CLIENT, pMgr->version(), id), surface));
+    const auto RESOURCE = m_inhibitors.emplace_back(makeShared<CIdleInhibitorResource>(makeShared<CZwpIdleInhibitorV1>(CLIENT, pMgr->version(), id), surface));
 
-    RESOURCE->inhibitor = makeShared<CIdleInhibitor>(RESOURCE, surface);
-    events.newIdleInhibitor.emit(RESOURCE->inhibitor);
+    RESOURCE->m_inhibitor = makeShared<CIdleInhibitor>(RESOURCE, surface);
+    m_events.newIdleInhibitor.emit(RESOURCE->m_inhibitor);
 }
\ No newline at end of file