From d9cad5e1b63f2e1e86eb54551c72d17ee4dd070d Mon Sep 17 00:00:00 2001 From: davc0n Date: Sat, 3 May 2025 16:02:49 +0200 Subject: protocols: refactor class member vars (core) (#10259) --- src/protocols/core/Compositor.hpp | 54 +++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/protocols/core/Compositor.hpp') diff --git a/src/protocols/core/Compositor.hpp b/src/protocols/core/Compositor.hpp index 7415b4f5..90fac35d 100644 --- a/src/protocols/core/Compositor.hpp +++ b/src/protocols/core/Compositor.hpp @@ -40,7 +40,7 @@ class CWLCallbackResource { void send(const Time::steady_tp& now); private: - SP resource; + SP m_resource; }; class CWLRegionResource { @@ -50,11 +50,11 @@ class CWLRegionResource { bool good(); - CRegion region; - WP self; + CRegion m_region; + WP m_self; private: - SP resource; + SP m_resource; }; class CWLSurfaceResource { @@ -86,22 +86,22 @@ class CWLSurfaceResource { CSignal unmap; CSignal newSubsurface; CSignal destroy; - } events; - - SSurfaceState current, pending; - std::queue> pendingStates; - - std::vector> callbacks; - WP self; - WP hlSurface; - std::vector enteredOutputs; - bool mapped = false; - std::vector> subsurfaces; - SP role; - WP viewportResource; - WP syncobj; // may not be present - WP colorManagement; - WP contentType; + } m_events; + + SSurfaceState m_current; + SSurfaceState m_pending; + std::queue> m_pendingStates; + + std::vector> m_callbacks; + WP m_self; + WP m_hlSurface; + std::vector m_enteredOutputs; + bool m_mapped = false; + std::vector> m_subsurfaces; + SP m_role; + WP m_syncobj; // may not be present + WP m_colorManagement; + WP m_contentType; void breadthfirst(std::function, const Vector2D&, void*)> fn, void* data); SP findFirstPreorder(std::function)> fn); @@ -113,8 +113,8 @@ class CWLSurfaceResource { std::pair, Vector2D> at(const Vector2D& localCoords, bool allowsInput = false); private: - SP resource; - wl_client* pClient = nullptr; + SP m_resource; + wl_client* m_client = nullptr; void destroy(); void releaseBuffers(bool onlyCurrent = true); @@ -134,7 +134,7 @@ class CWLCompositorResource { bool good(); private: - SP resource; + SP m_resource; }; class CWLCompositorProtocol : public IWaylandProtocol { @@ -147,7 +147,7 @@ class CWLCompositorProtocol : public IWaylandProtocol { struct { CSignal newSurface; // SP - } events; + } m_events; private: void destroyResource(CWLCompositorResource* resource); @@ -155,9 +155,9 @@ class CWLCompositorProtocol : public IWaylandProtocol { void destroyResource(CWLRegionResource* resource); // - std::vector> m_vManagers; - std::vector> m_vSurfaces; - std::vector> m_vRegions; + std::vector> m_managers; + std::vector> m_surfaces; + std::vector> m_regions; friend class CWLSurfaceResource; friend class CWLCompositorResource; -- cgit v1.2.3