core: Improve handling of core initialization errors

[quassel.git] / src / core / coreapplication.cpp

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index f881d9e..e73a09f 100644 (file)
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,71 +15,37 @@
  *   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.         *
  ***************************************************************************/
 
+#include "core.h"
 #include "coreapplication.h"
 
-#include "core.h"
-#include "logger.h"
-#include <QDebug>
 
-CoreApplicationInternal::CoreApplicationInternal()
-  : _coreCreated(false)
+CoreApplication::CoreApplication(int &argc, char **argv)
+    : QCoreApplication(argc, argv)
 {
+#ifdef Q_OS_MAC
+    Quassel::disableCrashHandler();
+#endif /* Q_OS_MAC */
 
+    Quassel::setRunMode(Quassel::CoreOnly);
 }
 
-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;
+CoreApplication::~CoreApplication()
+{
+    _core.reset();
+    Quassel::destroy();
 }
 
-/*****************************************************************************/
 
-CoreApplication::CoreApplication(int &argc, char **argv)
-  : QCoreApplication(argc, argv), Quassel()
+void CoreApplication::init()
 {
-#ifdef Q_OS_MAC
-  disableCrashhandler();
-#endif /* Q_OS_MAC */
-
-  setRunMode(Quassel::CoreOnly);
-  _internal = new CoreApplicationInternal();
-}
-
-CoreApplication::~CoreApplication() {
-  delete _internal;
-}
+    if (!Quassel::init()) {
+        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
+    }
 
-bool CoreApplication::init() {
-  if(Quassel::init() && _internal->init()) {
-    qInstallMsgHandler(Logger::logMessage);
-    return true;
-  }
-  return false;
+    _core.reset(new Core{}); // FIXME C++14: std::make_unique
+    _core->init();
 }