X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.h;h=f2f076fc012dcfe764b62e07d7a4b9a467fba8ca;hp=424545536b937b68a6849e3fcf7bf155d5a2e15a;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=965183188ee726036685fcba379c2559bd183247

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index 42454553..f2f076fc 100644
--- a/src/core/coreapplication.h
+++ b/src/core/coreapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,51 +15,34 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREAPPLICATION_H_
-#define COREAPPLICATION_H_
+#pragma once
 
-#ifdef HAVE_KDE
-#  include <KApplication>
-#else
-#  include <QCoreApplication>
-#endif
+#include "core-export.h"
 
-#include "quassel.h"
+#include <memory>
 
-/// Encapsulates CoreApplication's logic.
-/** This allows it to be reused within MonolithicApplication as well.
- */
-class CoreApplicationInternal {
-  Q_DECLARE_TR_FUNCTIONS(CoreApplicationInternal)
+#include <QCoreApplication>
 
-  public:
-    CoreApplicationInternal();
-    ~CoreApplicationInternal();
+#include "core.h"
+#include "quassel.h"
 
-    bool init();
+class Core;
 
-  private:
-    bool _coreCreated;
-};
+class CORE_EXPORT CoreApplication : public QCoreApplication
+{
+    Q_OBJECT
 
-#ifdef HAVE_KDE
-class CoreApplication : public KApplication, public Quassel {
-#else
-class CoreApplication : public QCoreApplication, public Quassel {
-#endif
+public:
+    CoreApplication(int& argc, char** argv);
 
-  Q_OBJECT
-  public:
-    CoreApplication(int &argc, char **argv);
-    ~CoreApplication();
+    void init();
 
-    bool init();
+private slots:
+    void onShutdownComplete();
 
-  private:
-    CoreApplicationInternal *_internal;
+private:
+    std::unique_ptr<Core> _core;
 };
-
-#endif