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

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index 42454553..f157b548 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,28 @@
  *   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 <memory>
 
-#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();
+#include <QCoreApplication>
 
-  private:
-    bool _coreCreated;
-};
+#include "quassel.h"
 
-#ifdef HAVE_KDE
-class CoreApplication : public KApplication, public Quassel {
-#else
-class CoreApplication : public QCoreApplication, public Quassel {
-#endif
+class Core;
 
-  Q_OBJECT
-  public:
+class CoreApplication : public QCoreApplication
+{
+    Q_OBJECT
+public:
     CoreApplication(int &argc, char **argv);
-    ~CoreApplication();
+    ~CoreApplication() override;
 
-    bool init();
+    void init();
 
-  private:
-    CoreApplicationInternal *_internal;
+private:
+    std::unique_ptr<Core> _core;
 };
-
-#endif