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

hyprctl/main.cpp

@@ -21,13 +21,10 @@
 #include <string>
 #include <print>
 #include <fstream>
-#include <string>
 #include <vector>
 #include <filesystem>
 #include <cstdarg>
-#include <sys/socket.h>
 #include <hyprutils/string/String.hpp>
-#include <cstring>
 using namespace Hyprutils::String;
 
 #include "Strings.hpp"

src/Compositor.cpp

@@ -22,7 +22,6 @@
 #include <cstring>
 #include <filesystem>
 #include <ranges>
-#include <print>
 #include <unordered_set>
 #include "debug/HyprCtl.hpp"
 #include "debug/CrashReporter.hpp"

src/config/ConfigDataValues.hpp

@@ -11,7 +11,7 @@ enum eConfigValueDataTypes : int8_t {
 
 class ICustomConfigValueData {
   public:
-    virtual ~ICustomConfigValueData() = 0;
+    virtual ~ICustomConfigValueData() = default;
 
     virtual eConfigValueDataTypes getDataType() = 0;
 

src/config/ConfigManager.cpp

@@ -1709,10 +1709,6 @@ void CConfigManager::handlePluginLoads() {
     }
 }
 
-ICustomConfigValueData::~ICustomConfigValueData() {
-    ; // empty
-}
-
 const std::unordered_map<std::string, SP<SAnimationPropertyConfig>>& CConfigManager::getAnimationConfig() {
     return m_AnimationTree.getFullConfig();
 }

src/desktop/Subsurface.cpp

@@ -31,10 +31,6 @@ CSubsurface::CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, WP<CPopup> pOwne
     initExistingSubsurfaces(pSubsurface->surface.lock());
 }
 
-CSubsurface::~CSubsurface() {
-    ;
-}
-
 void CSubsurface::initSignals() {
     if (m_pSubsurface) {
         listeners.commitSubsurface  = m_pSubsurface->surface->events.commit.registerListener([this](std::any d) { onCommit(); });

src/desktop/Subsurface.hpp

@@ -17,7 +17,7 @@ class CSubsurface {
     CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, PHLWINDOW pOwner);
     CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, WP<CPopup> pOwner);
 
-    ~CSubsurface();
+    ~CSubsurface() = default;
 
     Vector2D        coordsRelativeToParent();
     Vector2D        coordsGlobal();
@@ -62,4 +62,4 @@ class CSubsurface {
     void                         initSignals();
     void                         initExistingSubsurfaces(SP<CWLSurfaceResource> pSurface);
     void                         checkSiblingDamage();
-};
+};

src/helpers/Monitor.cpp

@@ -1434,10 +1434,6 @@ CMonitorState::CMonitorState(CMonitor* owner) : m_pOwner(owner) {
     ;
 }
 
-CMonitorState::~CMonitorState() {
-    ;
-}
-
 void CMonitorState::ensureBufferPresent() {
     const auto STATE = m_pOwner->output->state->state();
     if (!STATE.enabled) {

src/helpers/Monitor.hpp

@@ -6,7 +6,6 @@
 #include "../SharedDefs.hpp"
 #include "MiscFunctions.hpp"
 #include "WLClasses.hpp"
-#include <vector>
 #include <array>
 
 #include <xf86drmMode.h>
@@ -48,7 +47,7 @@ class CSyncTimeline;
 class CMonitorState {
   public:
     CMonitorState(CMonitor* owner);
-    ~CMonitorState();
+    ~CMonitorState() = default;
 
     bool commit();
     bool test();

src/hyprerror/HyprError.cpp

@@ -32,8 +32,6 @@ CHyprError::CHyprError() {
     m_pTexture = makeShared<CTexture>();
 }
 
-CHyprError::~CHyprError() = default;
-
 void CHyprError::queueCreate(std::string message, const CHyprColor& color) {
     m_szQueued = message;
     m_cQueued  = color;

src/hyprerror/HyprError.hpp

@@ -9,7 +9,7 @@
 class CHyprError {
   public:
     CHyprError();
-    ~CHyprError();
+    ~CHyprError() = default;
 
     void  queueCreate(std::string message, const CHyprColor& color);
     void  draw();

src/layout/IHyprLayout.cpp

@@ -950,5 +950,3 @@ Vector2D IHyprLayout::predictSizeForNewWindow(PHLWINDOW pWindow) {
 
     return sizePredicted;
 }
-
-IHyprLayout::~IHyprLayout() = default;

src/layout/IHyprLayout.hpp

@@ -43,7 +43,7 @@ enum eDirection : int8_t {
 
 class IHyprLayout {
   public:
-    virtual ~IHyprLayout()   = 0;
+    virtual ~IHyprLayout()   = default;
     virtual void onEnable()  = 0;
     virtual void onDisable() = 0;
 

src/layout/MasterLayout.hpp

@@ -5,7 +5,6 @@
 #include "../helpers/varlist/VarList.hpp"
 #include <vector>
 #include <list>
-#include <vector>
 #include <any>
 
 enum eFullscreenMode : int8_t;

src/managers/EventManager.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include <vector>
-#include <vector>
 
 #include "../defines.hpp"
 #include "../helpers/memory/Memory.hpp"

src/managers/XCursorManager.hpp

@@ -13,10 +13,10 @@ extern "C" {
 
 // gangsta bootleg XCursor impl. adidas balkanized
 struct SXCursorImage {
-    Vector2D              size;
+    Hyprutils::Math::Vector2D size;
-    Vector2D              hotspot;
+    Hyprutils::Math::Vector2D hotspot;
-    std::vector<uint32_t> pixels; // XPixel is a u32
+    std::vector<uint32_t>     pixels; // XPixel is a u32
-    uint32_t              delay;  // animation delay to next frame (ms)
+    uint32_t                  delay;  // animation delay to next frame (ms)
 };
 
 struct SXCursors {

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;

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,

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 CLinuxDMABUFParamsResource::good() {
-    ;
-}
-
-bool CLinuxDMABBUFParamsResource::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; });
 }
 

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_);
+    CLinuxDMABUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_);
-    ~CLinuxDMABBUFParamsResource();
+    ~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;
 };
 

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();
 }

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;
-};
+};

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;
 }

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();

src/render/decorations/CHyprBorderDecoration.cpp

@@ -10,10 +10,6 @@ CHyprBorderDecoration::CHyprBorderDecoration(PHLWINDOW pWindow) : IHyprWindowDec
     ;
 }
 
-CHyprBorderDecoration::~CHyprBorderDecoration() {
-    ;
-}
-
 SDecorationPositioningInfo CHyprBorderDecoration::getPositioningInfo() {
     const auto BORDERSIZE = m_pWindow->getRealBorderSize();
     m_seExtents           = {{BORDERSIZE, BORDERSIZE}, {BORDERSIZE, BORDERSIZE}};

src/render/decorations/CHyprBorderDecoration.hpp

@@ -5,7 +5,7 @@
 class CHyprBorderDecoration : public IHyprWindowDecoration {
   public:
     CHyprBorderDecoration(PHLWINDOW);
-    virtual ~CHyprBorderDecoration();
+    virtual ~CHyprBorderDecoration() = default;
 
     virtual SDecorationPositioningInfo getPositioningInfo();
 

src/render/decorations/CHyprDropShadowDecoration.cpp

@@ -9,8 +9,6 @@ CHyprDropShadowDecoration::CHyprDropShadowDecoration(PHLWINDOW pWindow) : IHyprW
     ;
 }
 
-CHyprDropShadowDecoration::~CHyprDropShadowDecoration() = default;
-
 eDecorationType CHyprDropShadowDecoration::getDecorationType() {
     return DECORATION_SHADOW;
 }

src/render/decorations/CHyprDropShadowDecoration.hpp

@@ -5,7 +5,7 @@
 class CHyprDropShadowDecoration : public IHyprWindowDecoration {
   public:
     CHyprDropShadowDecoration(PHLWINDOW);
-    virtual ~CHyprDropShadowDecoration();
+    virtual ~CHyprDropShadowDecoration() = default;
 
     virtual SDecorationPositioningInfo getPositioningInfo();
 

src/render/decorations/CHyprGroupBarDecoration.cpp

@@ -29,8 +29,6 @@ CHyprGroupBarDecoration::CHyprGroupBarDecoration(PHLWINDOW pWindow) : IHyprWindo
         refreshGroupBarGradients();
 }
 
-CHyprGroupBarDecoration::~CHyprGroupBarDecoration() = default;
-
 SDecorationPositioningInfo CHyprGroupBarDecoration::getPositioningInfo() {
     static auto                PHEIGHT       = CConfigValue<Hyprlang::INT>("group:groupbar:height");
     static auto                PENABLED      = CConfigValue<Hyprlang::INT>("group:groupbar:enabled");
@@ -231,8 +229,6 @@ CTitleTex::CTitleTex(PHLWINDOW pWindow, const Vector2D& bufferSize, const float
         texSize = tex->m_vSize;
 }
 
-CTitleTex::~CTitleTex() = default;
-
 void renderGradientTo(SP<CTexture> tex, CGradientValueData* grad) {
 
     if (!g_pCompositor->m_pLastMonitor)

src/render/decorations/CHyprGroupBarDecoration.hpp

@@ -10,7 +10,7 @@
 class CTitleTex {
   public:
     CTitleTex(PHLWINDOW pWindow, const Vector2D& bufferSize, const float monitorScale);
-    ~CTitleTex();
+    ~CTitleTex() = default;
 
     SP<CTexture> tex;
     std::string  szContent;
@@ -24,7 +24,7 @@ void refreshGroupBarGradients();
 class CHyprGroupBarDecoration : public IHyprWindowDecoration {
   public:
     CHyprGroupBarDecoration(PHLWINDOW);
-    virtual ~CHyprGroupBarDecoration();
+    virtual ~CHyprGroupBarDecoration() = default;
 
     virtual SDecorationPositioningInfo getPositioningInfo();
 

src/render/decorations/IHyprWindowDecoration.cpp

@@ -6,8 +6,6 @@ IHyprWindowDecoration::IHyprWindowDecoration(PHLWINDOW pWindow) : m_pWindow(pWin
     ;
 }
 
-IHyprWindowDecoration::~IHyprWindowDecoration() = default;
-
 bool IHyprWindowDecoration::onInputOnDeco(const eInputType, const Vector2D&, std::any) {
     return false;
 }

src/render/decorations/IHyprWindowDecoration.hpp

@@ -33,7 +33,7 @@ class CDecorationPositioner;
 class IHyprWindowDecoration {
   public:
     IHyprWindowDecoration(PHLWINDOW);
-    virtual ~IHyprWindowDecoration() = 0;
+    virtual ~IHyprWindowDecoration() = default;
 
     virtual SDecorationPositioningInfo getPositioningInfo() = 0;