X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=e73a09fb09696b2693c1bcd645c564097a484849;hp=3e3f9d17fdedfaca80763c4d63c6eb4946a34417;hb=f88bfa81380ceb2c4afce5b15f753570a1ef063d;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 3e3f9d17..e73a09fb 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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,75 +18,34 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "coreapplication.h"
-
 #include "core.h"
-#include "logger.h"
-
-CoreApplicationInternal::CoreApplicationInternal()
-    : _coreCreated(false)
-{
-}
-
-
-CoreApplicationInternal::~CoreApplicationInternal()
-{
-    if (_coreCreated) {
-        Core::saveState();
-        Core::destroy();
-    }
-}
-
-
-bool CoreApplicationInternal::init()
-{
-    /* FIXME
-    This is an initial check if logfile is writable since the warning would spam stdout if done
-    in current Logger implementation. Can be dropped whenever the logfile is only opened once.
-    */
-    QFile logFile;
-    if (!Quassel::optionValue("logfile").isEmpty()) {
-        logFile.setFileName(Quassel::optionValue("logfile"));
-        if (!logFile.open(QIODevice::Append | QIODevice::Text))
-            qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead", qPrintable(logFile.fileName()));
-        else logFile.close();
-    }
-
-    Core::instance(); // create and init the core
-    _coreCreated = true;
-
-    if (!Quassel::isOptionSet("norestore"))
-        Core::restoreState();
-
-    return true;
-}
-
+#include "coreapplication.h"
 
-/*****************************************************************************/
 
 CoreApplication::CoreApplication(int &argc, char **argv)
-    : QCoreApplication(argc, argv), Quassel()
+    : QCoreApplication(argc, argv)
 {
 #ifdef Q_OS_MAC
-    disableCrashhandler();
+    Quassel::disableCrashHandler();
 #endif /* Q_OS_MAC */
 
-    setRunMode(Quassel::CoreOnly);
-    _internal = new CoreApplicationInternal();
+    Quassel::setRunMode(Quassel::CoreOnly);
 }
 
 
 CoreApplication::~CoreApplication()
 {
-    delete _internal;
+    _core.reset();
+    Quassel::destroy();
 }
 
 
-bool CoreApplication::init()
+void CoreApplication::init()
 {
-    if (Quassel::init() && _internal->init()) {
-        qInstallMsgHandler(Logger::logMessage);
-        return true;
+    if (!Quassel::init()) {
+        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
     }
-    return false;
+
+    _core.reset(new Core{}); // FIXME C++14: std::make_unique
+    _core->init();
 }