From b070f6e3f7bd50f8e4a2664dda24affb6d4f4dd1 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Wed, 17 Jan 2024 01:02:51 +0100
Subject: [PATCH] Use a reference for the singleton

This is a bit nicer to work with than a pointer and doesn't require a
heap allocation.
---
 envmanager/main.cpp     | 2 +-
 envmanager/settings.cpp | 4 ++--
 envmanager/settings.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/envmanager/main.cpp b/envmanager/main.cpp
index fec1bac8..56eb0a19 100644
--- a/envmanager/main.cpp
+++ b/envmanager/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 
     // apply configuration
     if (parser->isSet(QStringLiteral("apply-settings"))) {
-        Settings::self()->applyConfiguration();
+        Settings::self().applyConfiguration();
     } else {
         parser->showHelp();
     }
diff --git a/envmanager/settings.cpp b/envmanager/settings.cpp
index 3ae36330..42330917 100644
--- a/envmanager/settings.cpp
+++ b/envmanager/settings.cpp
@@ -27,9 +27,9 @@ Settings::Settings(QObject *parent)
 {
 }
 
-Settings *Settings::self()
+Settings &Settings::self()
 {
-    static Settings *settings = new Settings;
+    static Settings settings;
     return settings;
 }
 
diff --git a/envmanager/settings.h b/envmanager/settings.h
index effc62e2..1f062dee 100644
--- a/envmanager/settings.h
+++ b/envmanager/settings.h
@@ -15,7 +15,7 @@ class Settings : public QObject
 
 public:
     Settings(QObject *parent = nullptr);
-    static Settings *self();
+    static Settings &self();
 
     // apply the configuration
     void applyConfiguration();