From 241a4935a244f403fa7108259075b04c81ed258f Mon Sep 17 00:00:00 2001 From: davc0n Date: Tue, 22 Apr 2025 15:23:29 +0200 Subject: compositor: refactor class member vars (#10141) --- src/protocols/OutputManagement.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/protocols/OutputManagement.cpp') diff --git a/src/protocols/OutputManagement.cpp b/src/protocols/OutputManagement.cpp index 49922b39..1e3835a6 100644 --- a/src/protocols/OutputManagement.cpp +++ b/src/protocols/OutputManagement.cpp @@ -31,8 +31,8 @@ COutputManager::COutputManager(SP resource_) : resource(re }); // send all heads at start - for (auto const& m : g_pCompositor->m_vRealMonitors) { - if (m == g_pCompositor->m_pUnsafeOutput) + for (auto const& m : g_pCompositor->m_realMonitors) { + if (m == g_pCompositor->m_unsafeOutput) continue; LOGM(LOG, " | sending output head for {}", m->szName); @@ -67,7 +67,7 @@ void COutputManager::makeAndSendNewHead(PHLMONITOR pMonitor) { } void COutputManager::ensureMonitorSent(PHLMONITOR pMonitor) { - if (pMonitor == g_pCompositor->m_pUnsafeOutput) + if (pMonitor == g_pCompositor->m_unsafeOutput) return; for (auto const& hw : heads) { @@ -86,7 +86,7 @@ void COutputManager::ensureMonitorSent(PHLMONITOR pMonitor) { } void COutputManager::sendDone() { - resource->sendDone(wl_display_next_serial(g_pCompositor->m_sWLDisplay)); + resource->sendDone(wl_display_next_serial(g_pCompositor->m_wlDisplay)); } COutputHead::COutputHead(SP resource_, PHLMONITOR pMonitor_) : resource(resource_), pMonitor(pMonitor_) { @@ -611,7 +611,7 @@ void COutputManagementProtocol::destroyResource(COutputConfigurationHead* resour } void COutputManagementProtocol::updateAllOutputs() { - for (auto const& m : g_pCompositor->m_vRealMonitors) { + for (auto const& m : g_pCompositor->m_realMonitors) { for (auto const& mgr : m_vManagers) { mgr->ensureMonitorSent(m); } -- cgit v1.2.3