managers: refactor class member vars (#10242)

1 files changed, 19 insertions, 19 deletions

diff --git a/src/managers/EventManager.cpp b/src/managers/EventManager.cpp
index d7535dc7..651bf436 100644
--- a/src/managers/EventManager.cpp
+++ b/src/managers/EventManager.cpp
@@ -11,8 +11,8 @@
 #include <cstring>
 using namespace Hyprutils::OS;
 
-CEventManager::CEventManager() : m_iSocketFD(socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) {
-    if (!m_iSocketFD.isValid()) {
+CEventManager::CEventManager() : m_socketFD(socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) {
+    if (!m_socketFD.isValid()) {
         Debug::log(ERR, "Couldn't start the Hyprland Socket 2. (1) IPC will not work.");
         return;
     }
@@ -26,27 +26,27 @@ CEventManager::CEventManager() : m_iSocketFD(socket(AF_UNIX, SOCK_STREAM | SOCK_
 
     strncpy(SERVERADDRESS.sun_path, PATH.c_str(), sizeof(SERVERADDRESS.sun_path) - 1);
 
-    if (bind(m_iSocketFD.get(), (sockaddr*)&SERVERADDRESS, SUN_LEN(&SERVERADDRESS)) < 0) {
+    if (bind(m_socketFD.get(), (sockaddr*)&SERVERADDRESS, SUN_LEN(&SERVERADDRESS)) < 0) {
         Debug::log(ERR, "Couldn't bind the Hyprland Socket 2. (3) IPC will not work.");
         return;
     }
 
     // 10 max queued.
-    if (listen(m_iSocketFD.get(), 10) < 0) {
+    if (listen(m_socketFD.get(), 10) < 0) {
         Debug::log(ERR, "Couldn't listen on the Hyprland Socket 2. (4) IPC will not work.");
         return;
     }
 
-    m_pEventSource = wl_event_loop_add_fd(g_pCompositor->m_wlEventLoop, m_iSocketFD.get(), WL_EVENT_READABLE, onClientEvent, nullptr);
+    m_eventSource = wl_event_loop_add_fd(g_pCompositor->m_wlEventLoop, m_socketFD.get(), WL_EVENT_READABLE, onClientEvent, nullptr);
 }
 
 CEventManager::~CEventManager() {
-    for (const auto& client : m_vClients) {
+    for (const auto& client : m_clients) {
         wl_event_source_remove(client.eventSource);
     }
 
-    if (m_pEventSource != nullptr)
-        wl_event_source_remove(m_pEventSource);
+    if (m_eventSource != nullptr)
+        wl_event_source_remove(m_eventSource);
 }
 
 int CEventManager::onServerEvent(int fd, uint32_t mask, void* data) {
@@ -61,22 +61,22 @@ int CEventManager::onServerEvent(int fd, uint32_t mask) {
     if (mask & WL_EVENT_ERROR || mask & WL_EVENT_HANGUP) {
         Debug::log(ERR, "Socket2 hangup?? IPC broke");
 
-        wl_event_source_remove(m_pEventSource);
-        m_pEventSource = nullptr;
-        m_iSocketFD.reset();
+        wl_event_source_remove(m_eventSource);
+        m_eventSource = nullptr;
+        m_socketFD.reset();
 
         return 0;
     }
 
     sockaddr_in     clientAddress;
     socklen_t       clientSize = sizeof(clientAddress);
-    CFileDescriptor ACCEPTEDCONNECTION{accept4(m_iSocketFD.get(), (sockaddr*)&clientAddress, &clientSize, SOCK_CLOEXEC | SOCK_NONBLOCK)};
+    CFileDescriptor ACCEPTEDCONNECTION{accept4(m_socketFD.get(), (sockaddr*)&clientAddress, &clientSize, SOCK_CLOEXEC | SOCK_NONBLOCK)};
     if (!ACCEPTEDCONNECTION.isValid()) {
         if (errno != EAGAIN) {
             Debug::log(ERR, "Socket2 failed receiving connection, errno: {}", errno);
-            wl_event_source_remove(m_pEventSource);
-            m_pEventSource = nullptr;
-            m_iSocketFD.reset();
+            wl_event_source_remove(m_eventSource);
+            m_eventSource = nullptr;
+            m_socketFD.reset();
         }
 
         return 0;
@@ -86,7 +86,7 @@ int CEventManager::onServerEvent(int fd, uint32_t mask) {
 
     // add to event loop so we can close it when we need to
     auto* eventSource = wl_event_loop_add_fd(g_pCompositor->m_wlEventLoop, ACCEPTEDCONNECTION.get(), 0, onServerEvent, nullptr);
-    m_vClients.emplace_back(SClient{
+    m_clients.emplace_back(SClient{
         std::move(ACCEPTEDCONNECTION),
         {},
         eventSource,
@@ -123,14 +123,14 @@ int CEventManager::onClientEvent(int fd, uint32_t mask) {
 }
 
 std::vector<CEventManager::SClient>::iterator CEventManager::findClientByFD(int fd) {
-    return std::find_if(m_vClients.begin(), m_vClients.end(), [fd](const auto& client) { return client.fd.get() == fd; });
+    return std::find_if(m_clients.begin(), m_clients.end(), [fd](const auto& client) { return client.fd.get() == fd; });
 }
 
 std::vector<CEventManager::SClient>::iterator CEventManager::removeClientByFD(int fd) {
     const auto CLIENTIT = findClientByFD(fd);
     wl_event_source_remove(CLIENTIT->eventSource);
 
-    return m_vClients.erase(CLIENTIT);
+    return m_clients.erase(CLIENTIT);
 }
 
 std::string CEventManager::formatEvent(const SHyprIPCEvent& event) const {
@@ -148,7 +148,7 @@ void CEventManager::postEvent(const SHyprIPCEvent& event) {
 
     const size_t MAX_QUEUED_EVENTS = 64;
     auto         sharedEvent       = makeShared<std::string>(formatEvent(event));
-    for (auto it = m_vClients.begin(); it != m_vClients.end();) {
+    for (auto it = m_clients.begin(); it != m_clients.end();) {
         // try to send the event immediately if the queue is empty
         const auto QUEUESIZE = it->events.size();
         if (QUEUESIZE > 0 || write(it->fd.get(), sharedEvent->c_str(), sharedEvent->length()) < 0) {