Move main non Thread Objects to Smart Pointers

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 @@ protected:
 	Logger * _log {};
 
 private:
+	EventHandler();
+	EventHandler(const EventHandler&) = delete;
+	EventHandler& operator=(const EventHandler&) = delete;
+
+	static QScopedPointer<EventHandler> instance;
+
 	bool _isSuspended;
 	bool _isIdle;
 };

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 @@ public:
 	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 @@ protected:
 	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;