From 361ee29e949ebb6470739b70184202ab453fd1f2 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Fri, 26 Jun 2015 13:00:46 +0200
Subject: [PATCH] fix warnings and crash

---
 src/libsnore/snore.cpp   | 6 +++---
 src/libsnore/snore_p.cpp | 2 ++
 src/libsnore/snore_p.h   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libsnore/snore.cpp b/src/libsnore/snore.cpp
index a39e988..df2cf39 100644
--- a/src/libsnore/snore.cpp
+++ b/src/libsnore/snore.cpp
@@ -27,7 +27,7 @@
 
 #include "version.h"
 
-#include <iostream>
+#include <memory>
 
 #include <QSettings>
 #include <QThread>
@@ -48,8 +48,8 @@ SnoreCore::SnoreCore(QObject *parent):
 
 SnoreCore &SnoreCore::instance()
 {
-    static SnoreCore instance(qApp);
-    return instance;
+    static SnoreCore *instance(new SnoreCore(qApp));
+    return *instance;
 }
 
 SnoreCore::~SnoreCore()
diff --git a/src/libsnore/snore_p.cpp b/src/libsnore/snore_p.cpp
index cc22712..572616a 100644
--- a/src/libsnore/snore_p.cpp
+++ b/src/libsnore/snore_p.cpp
@@ -32,6 +32,7 @@
 using namespace Snore;
 
 SnoreCorePrivate::SnoreCorePrivate():
+    m_localSettingsPrefix(qApp->applicationName().isEmpty() ? "SnoreNotify" : qApp->applicationName()),
     m_settings(new QSettings("Snorenotify", "libsnore", this))
 {
     snoreDebug(SNORE_INFO) << "Version:" << Version::version();
@@ -45,6 +46,7 @@ SnoreCorePrivate::SnoreCorePrivate():
 
     connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(slotAboutToQuit()));
 
+
     m_defaultApp = Application("SnoreNotify", Icon(":/root/snore.png"));
 }
 
diff --git a/src/libsnore/snore_p.h b/src/libsnore/snore_p.h
index b958568..b363da4 100644
--- a/src/libsnore/snore_p.h
+++ b/src/libsnore/snore_p.h
@@ -101,7 +101,7 @@ private:
 
     Application m_defaultApp;
 
-    QString m_localSettingsPrefix = qApp->applicationName().isEmpty() ? "SnoreNotify" : qApp->applicationName();
+    QString m_localSettingsPrefix;
 
     QSettings *m_settings;