X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.h;h=f157b5486a08ac3c10369e0a9d7813434f6a4cce;hb=cdc6091a2e02b84a48937cda287a0769ceb8726a;hp=11ba7bc46cf77ceeb16eb2bc6c007d4ea2a63600;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3;p=quassel.git

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index 11ba7bc4..f157b548 100644
--- a/src/core/coreapplication.h
+++ b/src/core/coreapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -18,43 +18,25 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREAPPLICATION_H_
-#define COREAPPLICATION_H_
+#pragma once
+
+#include <memory>
 
 #include <QCoreApplication>
 
 #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();
+class Core;
 
-private:
-    bool _coreCreated;
-};
-
-
-class CoreApplication : public QCoreApplication, public Quassel
+class CoreApplication : public QCoreApplication
 {
     Q_OBJECT
 public:
     CoreApplication(int &argc, char **argv);
-    ~CoreApplication();
+    ~CoreApplication() override;
 
-    bool init();
+    void init();
 
 private:
-    CoreApplicationInternal *_internal;
+    std::unique_ptr<Core> _core;
 };
-
-
-#endif