code cleanup

sources/queued-daemon/src/QueuedApplication.cpp

@@ -30,6 +30,8 @@ QueuedApplication::QueuedApplication(QObject *parent, const QVariantHash &args)
 {
     qCDebug(LOG_APP) << __PRETTY_FUNCTION__;
 
+    m_core = new QueuedCore(this);
+
     init();
     initDBus();
 }
@@ -41,30 +43,13 @@ QueuedApplication::~QueuedApplication()
 
     QDBusConnection::sessionBus().unregisterObject(
         QueuedConfig::DBUS_APPLICATION_PATH);
-    deinit();
-}
-
-
-void QueuedApplication::deinit()
-{
-    if (m_core)
-        delete m_core;
+    m_core->deleteLater();
 }
 
 
 void QueuedApplication::init()
 {
-    deinit();
-
-    initCore();
-}
-
-
-void QueuedApplication::initCore()
-{
-    m_core = new QueuedCore(this);
-    // init objects
-    m_core->init(m_configuration[QString("config")].toString());
+    m_core->init(m_configuration["config"].toString());
 }
 
 

sources/queued-daemon/src/QueuedApplication.h

@@ -30,13 +30,11 @@ class QueuedApplication : public QObject
 public:
     explicit QueuedApplication(QObject *parent, const QVariantHash &args);
     virtual ~QueuedApplication();
-    void deinit();
     void init();
 
 private:
     // backend
     void initDBus();
-    void initCore();
     // library
     QueuedCore *m_core = nullptr;
     // configuration

sources/queued-daemon/src/main.cpp

@@ -15,19 +15,17 @@
 
 
 #include <QCommandLineParser>
-#include <QCoreApplication>
 #include <QDBusConnection>
-#include <QDBusMessage>
 
 #include <queued/Queued.h>
 
+#include <csignal>
 #include <iostream>
 
 #include "QueuedApplication.h"
 #include "version.h"
 
 extern "C" {
-#include <signal.h>
 #include <unistd.h>
 }