/***************************************************************************
- * 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 *
* 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 "coreapplication.h"
Core::instance(); // create and init the core
_coreCreated = true;
+ Quassel::registerReloadHandler([]() {
+ // Currently, only reloading SSL certificates is supported
+ return Core::reloadCerts();
+ });
+
if (!Quassel::isOptionSet("norestore"))
Core::restoreState();
/*****************************************************************************/
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);
+ Quassel::setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
}
CoreApplication::~CoreApplication()
{
delete _internal;
+ Quassel::destroy();
}
bool CoreApplication::init()
{
if (Quassel::init() && _internal->init()) {
+#if QT_VERSION < 0x050000
qInstallMsgHandler(Logger::logMessage);
+#else
+ qInstallMessageHandler(Logger::logMessage);
+#endif
return true;
}
return false;