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/DataDevice.hpp | 56 +++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 29 deletions(-) (limited to 'src/protocols/core/DataDevice.hpp') diff --git a/src/protocols/core/DataDevice.hpp b/src/protocols/core/DataDevice.hpp index 0c53111b..d54927d2 100644 --- a/src/protocols/core/DataDevice.hpp +++ b/src/protocols/core/DataDevice.hpp @@ -40,17 +40,15 @@ class CWLDataOfferResource : public IDataOffer { virtual SP getX11(); virtual SP getSource(); - WP source; - WP self; + WP m_source; + WP m_self; - bool dead = false; - bool accepted = false; - bool recvd = false; - - uint32_t actions = 0; + bool m_dead = false; + bool m_accepted = false; + bool m_recvd = false; private: - SP resource; + SP m_resource; friend class CWLDataDeviceResource; }; @@ -76,19 +74,19 @@ class CWLDataSourceResource : public IDataSource { virtual void sendDndDropPerformed(); virtual void sendDndAction(wl_data_device_manager_dnd_action a); - bool used = false; - bool dnd = false; - bool dndSuccess = false; - bool dropped = false; + bool m_used = false; + bool m_dnd = false; + bool m_dndSuccess = false; + bool m_dropped = false; - WP device; - WP self; + WP m_device; + WP m_self; - std::vector mimeTypes; - uint32_t supportedActions = 0; + std::vector m_mimeTypes; + uint32_t m_supportedActions = 0; private: - SP resource; + SP m_resource; friend class CWLDataDeviceProtocol; }; @@ -110,11 +108,11 @@ class CWLDataDeviceResource : public IDataDevice { virtual void sendSelection(SP offer); virtual eDataSourceType type(); - WP self; + WP m_self; private: - SP resource; - wl_client* pClient = nullptr; + SP m_resource; + wl_client* m_client = nullptr; friend class CWLDataDeviceProtocol; }; @@ -125,11 +123,11 @@ class CWLDataDeviceManagerResource { bool good(); - WP device; - std::vector> sources; + WP m_device; + std::vector> m_sources; private: - SP resource; + SP m_resource; }; class CWLDataDeviceProtocol : public IWaylandProtocol { @@ -154,10 +152,10 @@ class CWLDataDeviceProtocol : public IWaylandProtocol { void destroyResource(CWLDataOfferResource* resource); // - std::vector> m_vManagers; - std::vector> m_vDevices; - std::vector> m_vSources; - std::vector> m_vOffers; + std::vector> m_managers; + std::vector> m_devices; + std::vector> m_sources; + std::vector> m_offers; // @@ -182,7 +180,7 @@ class CWLDataDeviceProtocol : public IWaylandProtocol { SP mouseButton; SP touchUp; SP touchMove; - } dnd; + } m_dnd; void abortDrag(); void initiateDrag(WP currentSource, SP dragSurface, SP origin); @@ -204,7 +202,7 @@ class CWLDataDeviceProtocol : public IWaylandProtocol { struct { CHyprSignalListener onKeyboardFocusChange; CHyprSignalListener onDndPointerFocusChange; - } listeners; + } m_listeners; }; namespace PROTO { -- cgit v1.2.3