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

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

* protocols: fix clang format

1 files changed, 28 insertions, 28 deletions

diff --git a/src/protocols/XDGActivation.cpp b/src/protocols/XDGActivation.cpp
index 4062847b..bae3acc3 100644
--- a/src/protocols/XDGActivation.cpp
+++ b/src/protocols/XDGActivation.cpp
@@ -4,43 +4,43 @@
 #include "core/Compositor.hpp"
 #include <algorithm>
 
-CXDGActivationToken::CXDGActivationToken(SP<CXdgActivationTokenV1> resource_) : resource(resource_) {
+CXDGActivationToken::CXDGActivationToken(SP<CXdgActivationTokenV1> resource_) : m_resource(resource_) {
     if UNLIKELY (!resource_->resource())
         return;
 
-    resource->setDestroy([this](CXdgActivationTokenV1* r) { PROTO::activation->destroyToken(this); });
-    resource->setOnDestroy([this](CXdgActivationTokenV1* r) { PROTO::activation->destroyToken(this); });
+    m_resource->setDestroy([this](CXdgActivationTokenV1* r) { PROTO::activation->destroyToken(this); });
+    m_resource->setOnDestroy([this](CXdgActivationTokenV1* r) { PROTO::activation->destroyToken(this); });
 
-    resource->setSetSerial([this](CXdgActivationTokenV1* r, uint32_t serial_, wl_resource* seat) { serial = serial_; });
+    m_resource->setSetSerial([this](CXdgActivationTokenV1* r, uint32_t serial_, wl_resource* seat) { m_serial = serial_; });
 
-    resource->setSetAppId([this](CXdgActivationTokenV1* r, const char* appid) { appID = appid; });
+    m_resource->setSetAppId([this](CXdgActivationTokenV1* r, const char* appid) { m_appID = appid; });
 
-    resource->setCommit([this](CXdgActivationTokenV1* r) {
+    m_resource->setCommit([this](CXdgActivationTokenV1* r) {
         // TODO: should we send a protocol error of already_used here
         // if it was used? the protocol spec doesn't say _when_ it should be sent...
-        if UNLIKELY (committed) {
+        if UNLIKELY (m_committed) {
             LOGM(WARN, "possible protocol error, two commits from one token. Ignoring.");
             return;
         }
 
-        committed = true;
+        m_committed = true;
         // send done with a new token
-        token = g_pTokenManager->registerNewToken({}, std::chrono::months{12});
+        m_token = g_pTokenManager->registerNewToken({}, std::chrono::months{12});
 
-        LOGM(LOG, "assigned new xdg-activation token {}", token);
+        LOGM(LOG, "assigned new xdg-activation token {}", m_token);
 
-        resource->sendDone(token.c_str());
+        m_resource->sendDone(m_token.c_str());
 
-        PROTO::activation->m_vSentTokens.push_back({token, resource->client()});
+        PROTO::activation->m_sentTokens.push_back({m_token, m_resource->client()});
 
-        auto count = std::count_if(PROTO::activation->m_vSentTokens.begin(), PROTO::activation->m_vSentTokens.end(),
-                                   [this](const auto& other) { return other.client == resource->client(); });
+        auto count = std::count_if(PROTO::activation->m_sentTokens.begin(), PROTO::activation->m_sentTokens.end(),
+                                   [this](const auto& other) { return other.client == m_resource->client(); });
 
         if UNLIKELY (count > 10) {
             // remove first token. Too many, dear app.
-            for (auto i = PROTO::activation->m_vSentTokens.begin(); i != PROTO::activation->m_vSentTokens.end(); ++i) {
-                if (i->client == resource->client()) {
-                    PROTO::activation->m_vSentTokens.erase(i);
+            for (auto i = PROTO::activation->m_sentTokens.begin(); i != PROTO::activation->m_sentTokens.end(); ++i) {
+                if (i->client == m_resource->client()) {
+                    PROTO::activation->m_sentTokens.erase(i);
                     break;
                 }
             }
@@ -49,12 +49,12 @@ CXDGActivationToken::CXDGActivationToken(SP<CXdgActivationTokenV1> resource_) :
 }
 
 CXDGActivationToken::~CXDGActivationToken() {
-    if (committed)
-        g_pTokenManager->removeToken(g_pTokenManager->getToken(token));
+    if (m_committed)
+        g_pTokenManager->removeToken(g_pTokenManager->getToken(m_token));
 }
 
 bool CXDGActivationToken::good() {
-    return resource->resource();
+    return m_resource->resource();
 }
 
 CXDGActivationProtocol::CXDGActivationProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
@@ -62,21 +62,21 @@ CXDGActivationProtocol::CXDGActivationProtocol(const wl_interface* iface, const
 }
 
 void CXDGActivationProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
-    const auto RESOURCE = m_vManagers.emplace_back(makeUnique<CXdgActivationV1>(client, ver, id)).get();
+    const auto RESOURCE = m_managers.emplace_back(makeUnique<CXdgActivationV1>(client, ver, id)).get();
     RESOURCE->setOnDestroy([this](CXdgActivationV1* p) { this->onManagerResourceDestroy(p->resource()); });
 
     RESOURCE->setDestroy([this](CXdgActivationV1* pMgr) { this->onManagerResourceDestroy(pMgr->resource()); });
     RESOURCE->setGetActivationToken([this](CXdgActivationV1* pMgr, uint32_t id) { this->onGetToken(pMgr, id); });
     RESOURCE->setActivate([this](CXdgActivationV1* pMgr, const char* token, wl_resource* surface) {
-        auto TOKEN = std::find_if(m_vSentTokens.begin(), m_vSentTokens.end(), [token](const auto& t) { return t.token == token; });
+        auto TOKEN = std::find_if(m_sentTokens.begin(), m_sentTokens.end(), [token](const auto& t) { return t.token == token; });
 
-        if UNLIKELY (TOKEN == m_vSentTokens.end()) {
+        if UNLIKELY (TOKEN == m_sentTokens.end()) {
             LOGM(WARN, "activate event for non-existent token {}??", token);
             return;
         }
 
         // remove token. It's been now spent.
-        m_vSentTokens.erase(TOKEN);
+        m_sentTokens.erase(TOKEN);
 
         SP<CWLSurfaceResource> surf    = CWLSurfaceResource::fromResource(surface);
         const auto             PWINDOW = g_pCompositor->getWindowFromSurface(surf);
@@ -91,20 +91,20 @@ void CXDGActivationProtocol::bindManager(wl_client* client, void* data, uint32_t
 }
 
 void CXDGActivationProtocol::onManagerResourceDestroy(wl_resource* res) {
-    std::erase_if(m_vManagers, [&](const auto& other) { return other->resource() == res; });
+    std::erase_if(m_managers, [&](const auto& other) { return other->resource() == res; });
 }
 
 void CXDGActivationProtocol::destroyToken(CXDGActivationToken* token) {
-    std::erase_if(m_vTokens, [&](const auto& other) { return other.get() == token; });
+    std::erase_if(m_tokens, [&](const auto& other) { return other.get() == token; });
 }
 
 void CXDGActivationProtocol::onGetToken(CXdgActivationV1* pMgr, uint32_t id) {
     const auto CLIENT   = pMgr->client();
-    const auto RESOURCE = m_vTokens.emplace_back(makeUnique<CXDGActivationToken>(makeShared<CXdgActivationTokenV1>(CLIENT, pMgr->version(), id))).get();
+    const auto RESOURCE = m_tokens.emplace_back(makeUnique<CXDGActivationToken>(makeShared<CXdgActivationTokenV1>(CLIENT, pMgr->version(), id))).get();
 
     if UNLIKELY (!RESOURCE->good()) {
         pMgr->noMemory();
-        m_vTokens.pop_back();
+        m_tokens.pop_back();
         return;
     }
 }
\ No newline at end of file