X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.h;h=9185f199ce49c54ce6cc164962e45fd8be9b0e47;hp=4c72b6bce0a4c87dbdc27066c808f3b781392dc0;hb=e14649614fbbf9b386505a5d782b88b1ac313c1f;hpb=b5dfd31e3d1ad7ca4bfe8262b62be259f6dc786a

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index 4c72b6bc..9185f199 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-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,37 +20,29 @@
 
 #pragma once
 
-#include <QCoreApplication>
-
-#include "quassel.h"
+#include "core-export.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();
+#include <memory>
 
-    bool init();
+#include <QCoreApplication>
 
-private:
-    bool _coreCreated;
-};
+#include "core.h"
+#include "quassel.h"
 
+class Core;
 
-class CoreApplication : public QCoreApplication
+class CORE_EXPORT CoreApplication : public QCoreApplication
 {
     Q_OBJECT
+
 public:
-    CoreApplication(int &argc, char **argv);
-    ~CoreApplication();
+    CoreApplication(int& argc, char** argv);
+
+    void init();
 
-    bool init();
+private slots:
+    void onShutdownComplete();
 
 private:
-    CoreApplicationInternal *_internal;
+    std::unique_ptr<Core> _core;
 };