X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreapplication.h;h=216eda0ffb5a2a9651f3a66b8252c911120603ca;hb=d9e586707522241d628a90466e13722e342cc28a;hp=4c72b6bce0a4c87dbdc27066c808f3b781392dc0;hpb=b5dfd31e3d1ad7ca4bfe8262b62be259f6dc786a;p=quassel.git

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index 4c72b6bc..216eda0f 100644
--- a/src/core/coreapplication.h
+++ b/src/core/coreapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,37 +20,27 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QCoreApplication>
 
+#include "core.h"
 #include "quassel.h"
 
-/// Encapsulates CoreApplication's logic.
-/** This allows it to be reused within MonolithicApplication as well.
- */
-class CoreApplicationInternal
-{
-    Q_DECLARE_TR_FUNCTIONS(CoreApplicationInternal)
-
-public:
-    CoreApplicationInternal();
-    ~CoreApplicationInternal();
-
-    bool init();
-
-private:
-    bool _coreCreated;
-};
-
+class Core;
 
 class CoreApplication : public QCoreApplication
 {
     Q_OBJECT
+
 public:
     CoreApplication(int &argc, char **argv);
-    ~CoreApplication();
 
-    bool init();
+    void init();
+
+private slots:
+    void onShutdownComplete();
 
 private:
-    CoreApplicationInternal *_internal;
+    std::unique_ptr<Core> _core;
 };