core,hyprctl: clang, clang-tidy, typo fixes and dtors changes (#9233)

* declare dtor once + DMABBUF typo fix

* dup include + clang moment

* linux-dmabuf: last minute nit change

8 files changed, 20 insertions, 44 deletions

diff --git a/src/protocols/FocusGrab.cpp b/src/protocols/FocusGrab.cpp
index ab9d22ef..bef69f62 100644
--- a/src/protocols/FocusGrab.cpp
+++ b/src/protocols/FocusGrab.cpp
@@ -11,10 +11,6 @@ CFocusGrabSurfaceState::CFocusGrabSurfaceState(CFocusGrab* grab, SP<CWLSurfaceRe
     listeners.destroy = surface->events.destroy.registerListener([=](std::any d) { grab->eraseSurface(surface); });
 }
 
-CFocusGrabSurfaceState::~CFocusGrabSurfaceState() {
-    ;
-}
-
 CFocusGrab::CFocusGrab(SP<CHyprlandFocusGrabV1> resource_) : resource(resource_) {
     if UNLIKELY (!resource->resource())
         return;
diff --git a/src/protocols/FocusGrab.hpp b/src/protocols/FocusGrab.hpp
index 3c907ed0..1445a24c 100644
--- a/src/protocols/FocusGrab.hpp
+++ b/src/protocols/FocusGrab.hpp
@@ -15,7 +15,7 @@ class CWLSurfaceResource;
 class CFocusGrabSurfaceState {
   public:
     CFocusGrabSurfaceState(CFocusGrab* grab, SP<CWLSurfaceResource> surface);
-    ~CFocusGrabSurfaceState();
+    ~CFocusGrabSurfaceState() = default;
 
     enum State {
         PendingAddition,
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
index 82d31c84..d3135da0 100644
--- a/src/protocols/LinuxDMABUF.cpp
+++ b/src/protocols/LinuxDMABUF.cpp
@@ -125,7 +125,7 @@ bool CLinuxDMABuffer::good() {
     return buffer && buffer->good();
 }
 
-CLinuxDMABBUFParamsResource::CLinuxDMABBUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_) : resource(resource_) {
+CLinuxDMABUFParamsResource::CLinuxDMABUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_) : resource(resource_) {
     if UNLIKELY (!good())
         return;
 
@@ -197,15 +197,11 @@ CLinuxDMABBUFParamsResource::CLinuxDMABBUFParamsResource(SP<CZwpLinuxBufferParam
     });
 }
 
-CLinuxDMABBUFParamsResource::~CLinuxDMABBUFParamsResource() {
-    ;
-}
-
-bool CLinuxDMABBUFParamsResource::good() {
+bool CLinuxDMABUFParamsResource::good() {
     return resource->resource();
 }
 
-void CLinuxDMABBUFParamsResource::create(uint32_t id) {
+void CLinuxDMABUFParamsResource::create(uint32_t id) {
     used = true;
 
     if UNLIKELY (!verify()) {
@@ -237,7 +233,7 @@ void CLinuxDMABBUFParamsResource::create(uint32_t id) {
     createdBuffer = buf;
 }
 
-bool CLinuxDMABBUFParamsResource::commence() {
+bool CLinuxDMABUFParamsResource::commence() {
     if (PROTO::linuxDma->mainDeviceFD < 0)
         return true;
 
@@ -258,7 +254,7 @@ bool CLinuxDMABBUFParamsResource::commence() {
     return true;
 }
 
-bool CLinuxDMABBUFParamsResource::verify() {
+bool CLinuxDMABUFParamsResource::verify() {
     if UNLIKELY (attrs->planes <= 0) {
         resource->error(ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE, "No planes added");
         return false;
@@ -311,10 +307,6 @@ CLinuxDMABUFFeedbackResource::CLinuxDMABUFFeedbackResource(SP<CZwpLinuxDmabufFee
     sendDefaultFeedback();
 }
 
-CLinuxDMABUFFeedbackResource::~CLinuxDMABUFFeedbackResource() {
-    ;
-}
-
 bool CLinuxDMABUFFeedbackResource::good() {
     return resource->resource();
 }
@@ -384,7 +376,7 @@ CLinuxDMABUFResource::CLinuxDMABUFResource(SP<CZwpLinuxDmabufV1> resource_) : re
     });
 
     resource->setCreateParams([](CZwpLinuxDmabufV1* r, uint32_t id) {
-        const auto RESOURCE = PROTO::linuxDma->m_vParams.emplace_back(makeShared<CLinuxDMABBUFParamsResource>(makeShared<CZwpLinuxBufferParamsV1>(r->client(), r->version(), id)));
+        const auto RESOURCE = PROTO::linuxDma->m_vParams.emplace_back(makeShared<CLinuxDMABUFParamsResource>(makeShared<CZwpLinuxBufferParamsV1>(r->client(), r->version(), id)));
 
         if UNLIKELY (!RESOURCE->good()) {
             r->noMemory();
@@ -550,7 +542,7 @@ void CLinuxDMABufV1Protocol::destroyResource(CLinuxDMABUFFeedbackResource* resou
     std::erase_if(m_vFeedbacks, [&](const auto& other) { return other.get() == resource; });
 }
 
-void CLinuxDMABufV1Protocol::destroyResource(CLinuxDMABBUFParamsResource* resource) {
+void CLinuxDMABufV1Protocol::destroyResource(CLinuxDMABUFParamsResource* resource) {
     std::erase_if(m_vParams, [&](const auto& other) { return other.get() == resource; });
 }
 
diff --git a/src/protocols/LinuxDMABUF.hpp b/src/protocols/LinuxDMABUF.hpp
index 8c574dbc..91cf3283 100644
--- a/src/protocols/LinuxDMABUF.hpp
+++ b/src/protocols/LinuxDMABUF.hpp
@@ -27,7 +27,7 @@ class CLinuxDMABuffer {
         CHyprSignalListener bufferResourceDestroy;
     } listeners;
 
-    friend class CLinuxDMABBUFParamsResource;
+    friend class CLinuxDMABUFParamsResource;
 };
 
 #pragma pack(push, 1)
@@ -56,10 +56,10 @@ class CDMABUFFormatTable {
     std::vector<std::pair<PHLMONITORREF, SDMABUFTranche>> monitorTranches;
 };
 
-class CLinuxDMABBUFParamsResource {
+class CLinuxDMABUFParamsResource {
   public:
-    CLinuxDMABBUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_);
-    ~CLinuxDMABBUFParamsResource();
+    CLinuxDMABUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_);
+    ~CLinuxDMABUFParamsResource() = default;
 
     bool                         good();
     void                         create(uint32_t id); // 0 means not immed
@@ -78,7 +78,7 @@ class CLinuxDMABBUFParamsResource {
 class CLinuxDMABUFFeedbackResource {
   public:
     CLinuxDMABUFFeedbackResource(SP<CZwpLinuxDmabufFeedbackV1> resource_, SP<CWLSurfaceResource> surface_);
-    ~CLinuxDMABUFFeedbackResource();
+    ~CLinuxDMABUFFeedbackResource() = default;
 
     bool                   good();
     void                   sendDefaultFeedback();
@@ -115,7 +115,7 @@ class CLinuxDMABufV1Protocol : public IWaylandProtocol {
   private:
     void destroyResource(CLinuxDMABUFResource* resource);
     void destroyResource(CLinuxDMABUFFeedbackResource* resource);
-    void destroyResource(CLinuxDMABBUFParamsResource* resource);
+    void destroyResource(CLinuxDMABUFParamsResource* resource);
     void destroyResource(CLinuxDMABuffer* resource);
 
     void resetFormatTable();
@@ -123,7 +123,7 @@ class CLinuxDMABufV1Protocol : public IWaylandProtocol {
     //
     std::vector<SP<CLinuxDMABUFResource>>         m_vManagers;
     std::vector<SP<CLinuxDMABUFFeedbackResource>> m_vFeedbacks;
-    std::vector<SP<CLinuxDMABBUFParamsResource>>  m_vParams;
+    std::vector<SP<CLinuxDMABUFParamsResource>>   m_vParams;
     std::vector<SP<CLinuxDMABuffer>>              m_vBuffers;
 
     UP<CDMABUFFormatTable>                        formatTable;
@@ -132,7 +132,7 @@ class CLinuxDMABufV1Protocol : public IWaylandProtocol {
 
     friend class CLinuxDMABUFResource;
     friend class CLinuxDMABUFFeedbackResource;
-    friend class CLinuxDMABBUFParamsResource;
+    friend class CLinuxDMABUFParamsResource;
     friend class CLinuxDMABuffer;
 };
 
diff --git a/src/protocols/SinglePixel.cpp b/src/protocols/SinglePixel.cpp
index 2fbfc93d..4d643a53 100644
--- a/src/protocols/SinglePixel.cpp
+++ b/src/protocols/SinglePixel.cpp
@@ -24,10 +24,6 @@ CSinglePixelBuffer::CSinglePixelBuffer(uint32_t id, wl_client* client, CHyprColo
         Debug::log(ERR, "Failed creating a single pixel texture: null texture id");
 }
 
-CSinglePixelBuffer::~CSinglePixelBuffer() {
-    ;
-}
-
 Aquamarine::eBufferCapability CSinglePixelBuffer::caps() {
     return Aquamarine::eBufferCapability::BUFFER_CAPABILITY_DATAPTR;
 }
@@ -74,10 +70,6 @@ CSinglePixelBufferResource::CSinglePixelBufferResource(uint32_t id, wl_client* c
     });
 }
 
-CSinglePixelBufferResource::~CSinglePixelBufferResource() {
-    ;
-}
-
 bool CSinglePixelBufferResource::good() {
     return buffer->good();
 }
diff --git a/src/protocols/SinglePixel.hpp b/src/protocols/SinglePixel.hpp
index 2a86d050..bd0607d6 100644
--- a/src/protocols/SinglePixel.hpp
+++ b/src/protocols/SinglePixel.hpp
@@ -9,7 +9,7 @@
 class CSinglePixelBuffer : public IHLBuffer {
   public:
     CSinglePixelBuffer(uint32_t id, wl_client* client, CHyprColor col);
-    virtual ~CSinglePixelBuffer();
+    virtual ~CSinglePixelBuffer() = default;
 
     virtual Aquamarine::eBufferCapability          caps();
     virtual Aquamarine::eBufferType                type();
@@ -33,7 +33,7 @@ class CSinglePixelBuffer : public IHLBuffer {
 class CSinglePixelBufferResource {
   public:
     CSinglePixelBufferResource(uint32_t id, wl_client* client, CHyprColor color);
-    ~CSinglePixelBufferResource();
+    ~CSinglePixelBufferResource() = default;
 
     bool good();
 
@@ -75,4 +75,4 @@ class CSinglePixelProtocol : public IWaylandProtocol {
 
 namespace PROTO {
     inline UP<CSinglePixelProtocol> singlePixel;
-};
\ No newline at end of file
+};
diff --git a/src/protocols/core/Shm.cpp b/src/protocols/core/Shm.cpp
index 28585aeb..1649f82f 100644
--- a/src/protocols/core/Shm.cpp
+++ b/src/protocols/core/Shm.cpp
@@ -36,10 +36,6 @@ CWLSHMBuffer::CWLSHMBuffer(SP<CWLSHMPoolResource> pool_, uint32_t id, int32_t of
         Debug::log(ERR, "Failed creating a shm texture: null texture id");
 }
 
-CWLSHMBuffer::~CWLSHMBuffer() {
-    ;
-}
-
 Aquamarine::eBufferCapability CWLSHMBuffer::caps() {
     return Aquamarine::eBufferCapability::BUFFER_CAPABILITY_DATAPTR;
 }
diff --git a/src/protocols/core/Shm.hpp b/src/protocols/core/Shm.hpp
index 23a465fb..d7e81367 100644
--- a/src/protocols/core/Shm.hpp
+++ b/src/protocols/core/Shm.hpp
@@ -31,7 +31,7 @@ class CSHMPool {
 class CWLSHMBuffer : public IHLBuffer {
   public:
     CWLSHMBuffer(SP<CWLSHMPoolResource> pool, uint32_t id, int32_t offset, const Vector2D& size, int32_t stride, uint32_t fmt);
-    virtual ~CWLSHMBuffer();
+    virtual ~CWLSHMBuffer() = default;
 
     virtual Aquamarine::eBufferCapability          caps();
     virtual Aquamarine::eBufferType                type();