protocols: refactor class member vars (core) (#10259)

1 files changed, 27 insertions, 27 deletions

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<CWlCallback> resource;
+    SP<CWlCallback> m_resource;
 };
 
 class CWLRegionResource {
@@ -50,11 +50,11 @@ class CWLRegionResource {
 
     bool                         good();
 
-    CRegion                      region;
-    WP<CWLRegionResource>        self;
+    CRegion                      m_region;
+    WP<CWLRegionResource>        m_self;
 
   private:
-    SP<CWlRegion> resource;
+    SP<CWlRegion> m_resource;
 };
 
 class CWLSurfaceResource {
@@ -86,22 +86,22 @@ class CWLSurfaceResource {
         CSignal unmap;
         CSignal newSubsurface;
         CSignal destroy;
-    } events;
-
-    SSurfaceState                          current, pending;
-    std::queue<UP<SSurfaceState>>          pendingStates;
-
-    std::vector<SP<CWLCallbackResource>>   callbacks;
-    WP<CWLSurfaceResource>                 self;
-    WP<CWLSurface>                         hlSurface;
-    std::vector<PHLMONITORREF>             enteredOutputs;
-    bool                                   mapped = false;
-    std::vector<WP<CWLSubsurfaceResource>> subsurfaces;
-    SP<ISurfaceRole>                       role;
-    WP<CViewportResource>                  viewportResource;
-    WP<CDRMSyncobjSurfaceResource>         syncobj; // may not be present
-    WP<CColorManagementSurface>            colorManagement;
-    WP<CContentType>                       contentType;
+    } m_events;
+
+    SSurfaceState                          m_current;
+    SSurfaceState                          m_pending;
+    std::queue<UP<SSurfaceState>>          m_pendingStates;
+
+    std::vector<SP<CWLCallbackResource>>   m_callbacks;
+    WP<CWLSurfaceResource>                 m_self;
+    WP<CWLSurface>                         m_hlSurface;
+    std::vector<PHLMONITORREF>             m_enteredOutputs;
+    bool                                   m_mapped = false;
+    std::vector<WP<CWLSubsurfaceResource>> m_subsurfaces;
+    SP<ISurfaceRole>                       m_role;
+    WP<CDRMSyncobjSurfaceResource>         m_syncobj; // may not be present
+    WP<CColorManagementSurface>            m_colorManagement;
+    WP<CContentType>                       m_contentType;
 
     void                                   breadthfirst(std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
     SP<CWLSurfaceResource>                 findFirstPreorder(std::function<bool(SP<CWLSurfaceResource>)> fn);
@@ -113,8 +113,8 @@ class CWLSurfaceResource {
     std::pair<SP<CWLSurfaceResource>, Vector2D> at(const Vector2D& localCoords, bool allowsInput = false);
 
   private:
-    SP<CWlSurface>         resource;
-    wl_client*             pClient = nullptr;
+    SP<CWlSurface>         m_resource;
+    wl_client*             m_client = nullptr;
 
     void                   destroy();
     void                   releaseBuffers(bool onlyCurrent = true);
@@ -134,7 +134,7 @@ class CWLCompositorResource {
     bool good();
 
   private:
-    SP<CWlCompositor> resource;
+    SP<CWlCompositor> m_resource;
 };
 
 class CWLCompositorProtocol : public IWaylandProtocol {
@@ -147,7 +147,7 @@ class CWLCompositorProtocol : public IWaylandProtocol {
 
     struct {
         CSignal newSurface; // SP<CWLSurfaceResource>
-    } events;
+    } m_events;
 
   private:
     void destroyResource(CWLCompositorResource* resource);
@@ -155,9 +155,9 @@ class CWLCompositorProtocol : public IWaylandProtocol {
     void destroyResource(CWLRegionResource* resource);
 
     //
-    std::vector<SP<CWLCompositorResource>> m_vManagers;
-    std::vector<SP<CWLSurfaceResource>>    m_vSurfaces;
-    std::vector<SP<CWLRegionResource>>     m_vRegions;
+    std::vector<SP<CWLCompositorResource>> m_managers;
+    std::vector<SP<CWLSurfaceResource>>    m_surfaces;
+    std::vector<SP<CWLRegionResource>>     m_regions;
 
     friend class CWLSurfaceResource;
     friend class CWLCompositorResource;