Start SmartPointers

CHANGELOG.md

@@ -53,6 +53,7 @@ Note: The wizard will configure an APIv2 capable bridge always with Entertainmen
 - MDNSBrower - Fixed, if timeout while resolving host occurs
 - Non image updates ignored blacklisted LEDs (#1634)
 - Fixed that Windows OsEvents failed in non-GUI mode (#1671)
+- Addressed serious (#1425) and some smaller memory leaks
 
 ##### LED-Devices
 
@@ -79,6 +80,7 @@ Note: The wizard will configure an APIv2 capable bridge always with Entertainmen
 - Changed default build from Stretch to Buster
 - Support Qt 6.7, Update to Protobuf 25.1, Update mbedTLS to v3.4.0, Update flatbuffers to v23.5.26
 - Use C++17 standard as default
+- Started using SmartPointers (#981)
 - Added Pull Request (PR) installation script, allowing users to test development builds savely on Linux
 - Fixed missing include limits in QJsonSchemaChecker - Thanks @Portisch
 - Fixed dependencies for deb packages in Debian Bookworm (#1579) - Thanks @hg42, @Psirus

include/blackborder/BlackBorderProcessor.h

@@ -1,4 +1,7 @@
-#pragma once
+#ifndef BLACK_BORDER_PROCESSOR_H
+#define BLACK_BORDER_PROCESSOR_H
+
+#include <memory>
 
 // QT includes
 #include <QJsonObject>
@@ -24,7 +27,7 @@ namespace hyperion
 		Q_OBJECT
 	public:
 		BlackBorderProcessor(Hyperion* hyperion, QObject* parent);
-		~BlackBorderProcessor() override;
+
 		///
 		/// Return the current (detected) border
 		/// @return The current border
@@ -141,7 +144,7 @@ namespace hyperion
 		QString _detectionMode;
 
 		/// The black-border detector
-		BlackBorderDetector* _detector;
+		std::unique_ptr<BlackBorderDetector> _detector;
 
 		/// The current detected border
 		BlackBorder _currentBorder;
@@ -162,3 +165,5 @@ namespace hyperion
 
 	};
 } // end namespace hyperion
+
+#endif // BLACK_BORDER_PROCESSOR_H

include/events/EventHandler.h

@@ -13,10 +13,9 @@ class EventHandler : public QObject
 	Q_OBJECT
 
 public:
-	EventHandler();
 	~EventHandler() override;
 
-	static EventHandler* getInstance();
+	static QScopedPointer<EventHandler>& getInstance();
 
 public slots:
 
@@ -40,6 +39,12 @@ public slots:
 	Logger * _log {};
 
 private:
+	EventHandler();
+	EventHandler(const EventHandler&) = delete;
+	EventHandler& operator=(const EventHandler&) = delete;
+
+	static QScopedPointer<EventHandler> instance;
+
 	bool _isSuspended;
 	bool _isIdle;
 };

include/grabber/qt/QtGrabber.h

@@ -113,8 +113,8 @@ private slots:
 	int _display;
 	int _numberOfSDisplays;
 
-	int _calculatedWidth;
-	int _calculatedHeight;
+	int _screenWidth;
+	int _screenHeight;
 	int _src_x;
 	int _src_y;
 	int _src_x_max;

include/grabber/x11/X11Grabber.h

@@ -57,7 +57,7 @@ class X11Grabber : public Grabber , public QAbstractNativeEventFilter
 	///
 	/// @brief Apply new width/height values, overwrite Grabber.h implementation as X11 doesn't use width/height, just pixelDecimation to calc dimensions
 	///
-	bool setWidthHeight(int width, int height) override { return true; }
+	bool setWidthHeight(int /*width*/, int /*height*/) override { return true; }
 
 	///
 	/// @brief Apply new pixelDecimation
@@ -109,19 +109,19 @@ class X11Grabber : public Grabber , public QAbstractNativeEventFilter
 	Picture _srcPicture;
 	Picture _dstPicture;
 
-	int _XRandREventBase;
+	int _xRandREventBase;
 
 	XTransform _transform;
 
-	unsigned _calculatedWidth;
-	unsigned _calculatedHeight;
-	unsigned _src_x;
-	unsigned _src_y;
+	int _screenWidth;
+	int _screenHeight;
+	int _src_x;
+	int _src_y;
 
-	bool _XShmAvailable;
-	bool _XShmPixmapAvailable;
-	bool _XRenderAvailable;
-	bool _XRandRAvailable;
+	bool _xShmAvailable;
+	bool _xShmPixmapAvailable;
+	bool _xRenderAvailable;
+	bool _xRandRAvailable;
 	bool _isWayland;
 
 	Logger * _logger;

include/hyperion/BGEffectHandler.h

@@ -43,6 +43,16 @@ class BGEffectHandler : public QObject
 		handleSettingsUpdate(settings::BGEFFECT, _hyperion->getSetting(settings::BGEFFECT));
 	}
 
+	///
+	/// @brief Disconnect from connected signals
+	/// Disconnect should be done before other priorities invoke methods during shutdown
+	///
+	void disconnect()
+	{
+		QObject::disconnect(_prioMuxer, &PriorityMuxer::prioritiesChanged, nullptr, nullptr);
+		QObject::disconnect(_hyperion, nullptr, nullptr, nullptr);
+	}
+
 	///
 	/// @brief Check, if background effect processing is enabled.
 	/// @return True, background effect processing is enabled.

include/hyperion/ColorAdjustment.h

@@ -16,21 +16,21 @@ class ColorAdjustment
 	QString _id;
 
 	/// The BLACK (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbBlackAdjustment;
+	RgbChannelAdjustment _rgbBlackAdjustment {0, 0, 0, "black"};
 	/// The WHITE (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbWhiteAdjustment;
+	RgbChannelAdjustment _rgbWhiteAdjustment{255, 255, 255, "white"};
 	/// The RED (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbRedAdjustment;
+	RgbChannelAdjustment _rgbRedAdjustment {255, 0, 0 , "red"};
 	/// The GREEN (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbGreenAdjustment;
+	RgbChannelAdjustment _rgbGreenAdjustment {0, 255, 0, "green"};
 	/// The BLUE (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbBlueAdjustment;
+	RgbChannelAdjustment _rgbBlueAdjustment {0, 0, 255, "blue"};
 	/// The CYAN (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbCyanAdjustment;
+	RgbChannelAdjustment _rgbCyanAdjustment {0, 255, 255, "cyan"};
 	/// The MAGENTA (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbMagentaAdjustment;
+	RgbChannelAdjustment _rgbMagentaAdjustment {255, 0, 255, "magenta"};
 	/// The YELLOW (RGB-Channel) adjustment
-	RgbChannelAdjustment _rgbYellowAdjustment;
+	RgbChannelAdjustment _rgbYellowAdjustment {255, 255, 0, "yellow"};
 
 	RgbTransform _rgbTransform;
 	OkhsvTransform _okhsvTransform;

include/hyperion/GrabberWrapper.h

@@ -6,6 +6,7 @@
 #include <QString>
 #include <QStringList>
 #include <QMultiMap>
+#include <QScopedPointer>
 
 #include <utils/Logger.h>
 #include <utils/Components.h>
@@ -91,8 +92,8 @@ class GrabberWrapper : public QObject
 	template <typename Grabber_T>
 	bool transferFrame(Grabber_T &grabber)
 	{
-		unsigned w = grabber.getImageWidth();
-		unsigned h = grabber.getImageHeight();
+		int w = grabber.getImageWidth();
+		int h = grabber.getImageHeight();
 		if ( _image.width() != w || _image.height() != h)
 		{
 			_image.resize(w, h);
@@ -185,7 +186,7 @@ private slots:
 	Logger * _log;
 
 	/// The timer for generating events with the specified update rate
-	QTimer* _timer;
+	QScopedPointer<QTimer> _timer;
 
 	/// The calculated update rate [ms]
 	int _updateInterval_ms;

include/mdns/MdnsBrowser.h

@@ -2,7 +2,6 @@
 #define MDNS_BROWSER_H
 
 #include <chrono>
-#include <type_traits>
 
 #include <qmdnsengine/server.h>
 #include <qmdnsengine/service.h>
@@ -16,6 +15,10 @@
 // Qt includes
 #include <QObject>
 #include <QByteArray>
+#include <QMap>
+#include <QJsonArray>
+#include <QScopedPointer>
+#include <QSharedPointer>
 
 // Utility includes
 #include <utils/Logger.h>
@@ -24,41 +27,33 @@
 namespace {
 	constexpr std::chrono::milliseconds DEFAULT_DISCOVER_TIMEOUT{ 500 };
 	constexpr std::chrono::milliseconds DEFAULT_ADDRESS_RESOLVE_TIMEOUT{ 1000 };
-
-} //End of constants
+} // End of constants
 
 class MdnsBrowser : public QObject
 {
 	Q_OBJECT
 
-		// Run MdnsBrowser as singleton
-
 private:
 	///
 	/// @brief Browse for hyperion services in bonjour, constructed from HyperionDaemon
 	///        Searching for hyperion http service by default
 	///
 	// Run MdnsBrowser as singleton
 	MdnsBrowser(QObject* parent = nullptr);
-	~MdnsBrowser() override;
-
-public:
-
-	static MdnsBrowser& getInstance()
-	{
-		static MdnsBrowser* instance = new MdnsBrowser();
-		return *instance;
-	}
-
 	MdnsBrowser(const MdnsBrowser&) = delete;
 	MdnsBrowser(MdnsBrowser&&) = delete;
 	MdnsBrowser& operator=(const MdnsBrowser&) = delete;
 	MdnsBrowser& operator=(MdnsBrowser&&) = delete;
 
+	static QScopedPointer<MdnsBrowser> instance;
+
+public:
+	~MdnsBrowser() override;
+	 static QScopedPointer<MdnsBrowser>& getInstance();
+
 	QMdnsEngine::Service getFirstService(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = DEFAULT_DISCOVER_TIMEOUT) const;
 	QJsonArray getServicesDiscoveredJson(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = std::chrono::milliseconds{ 0 }) const;
 
-
 	void printCache(const QByteArray& name = QByteArray(), quint16 type = QMdnsEngine::ANY) const;
 
 public slots:
@@ -109,8 +104,9 @@ private slots:
 
 	QMdnsEngine::Server _server;
 	QMdnsEngine::Cache  _cache;
+	QSharedPointer<QMdnsEngine::Resolver> _resolver;
 
-	QMap<QByteArray, QMdnsEngine::Browser*> _browsedServiceTypes;
+	QMap<QByteArray, QSharedPointer<QMdnsEngine::Browser>> _browsedServiceTypes;
 };
 
 #endif // MDNSBROWSER_H

include/mdns/MdnsProvider.h

@@ -9,6 +9,7 @@
 // Qt includes
 #include <QObject>
 #include <QByteArray>
+#include <QScopedPointer>
 
 // Utility includes
 #include <utils/Logger.h>
@@ -41,11 +42,11 @@ private slots:
 	/// The logger instance for mDNS-Service
 	Logger* _log;
 
-	QMdnsEngine::Server* _server;
-	QMdnsEngine::Hostname* _hostname;
+	QScopedPointer<QMdnsEngine::Server> _server;
+	QScopedPointer<QMdnsEngine::Hostname> _hostname;
 
 	/// map of services provided
-	QMap<QByteArray, QMdnsEngine::Provider*> _providedServiceTypes;
+	QMap<QByteArray, QSharedPointer<QMdnsEngine::Provider>> _providedServiceTypes;
 };
 
 #endif // MDNSPROVIDER_H

include/utils/Image.h

@@ -15,9 +15,8 @@ class Image
 	{
 	}
 
-	Image(unsigned width, unsigned height) :
+	Image(int width, int height) :
 		Image(width, height, Pixel_T())
-
 	{
 	}
 
@@ -28,7 +27,7 @@ class Image
 	/// @param height The height of the image
 	/// @param background The color of the image
 	///
-	Image(unsigned width, unsigned height, const Pixel_T background) :
+	Image(int width, int height, const Pixel_T background) :
 		_d_ptr(new ImageData<Pixel_T>(width, height, background))
 	{
 	}
@@ -78,7 +77,7 @@ class Image
 	///
 	/// @return The width of the image
 	///
-	inline unsigned width() const
+	inline int width() const
 	{
 		return _d_ptr->width();
 	}
@@ -88,7 +87,7 @@ class Image
 	///
 	/// @return The height of the image
 	///
-	inline unsigned height() const
+	inline int height() const
 	{
 		return _d_ptr->height();
 	}
@@ -111,7 +110,7 @@ class Image
 	///
 	/// @return const reference to specified pixel
 	///
-	uint8_t blue(unsigned pixel) const
+	uint8_t blue(int pixel) const
 	{
 		return _d_ptr->blue(pixel);
 	}
@@ -121,23 +120,23 @@ class Image
 	///
 	/// @param x The x index
 	/// @param y The y index
-	const Pixel_T& operator()(unsigned x, unsigned y) const
+	const Pixel_T& operator()(int x, int y) const
 	{
 		return _d_ptr->operator()(x, y);
 	}
 
 	///
 	/// @return reference to specified pixel
 	///
-	Pixel_T& operator()(unsigned x, unsigned y)
+	Pixel_T& operator()(int x, int y)
 	{
 		return _d_ptr->operator()(x, y);
 	}
 
 	/// Resize the image
 	/// @param width The width of the image
 	/// @param height The height of the image
-	void resize(unsigned width, unsigned height)
+	void resize(int width, int height)
 	{
 		_d_ptr->resize(width, height);
 	}
@@ -198,12 +197,11 @@ class Image
 	///
 	/// @return The index into the underlying data-vector
 	///
-	inline unsigned toIndex(unsigned x, unsigned y) const
+	inline int toIndex(int x, int y) const
 	{
 		return _d_ptr->toIndex(x, y);
 	}
 
-private:
 	QSharedDataPointer<ImageData<Pixel_T>>  _d_ptr;
 };