X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=5eb3a5cbb36db44b5b318e15b97fbaefc6cffb59;hp=191a32a472737556508a7bb1a2adc68ed1dc0424;hb=16f22647e6890d3eb8c3e94f7a0700e12fa29e44;hpb=64cf9f9b8a737dad5f29447805d4004cfd03c454 diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 191a32a4..5eb3a5cb 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -31,9 +31,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv) _internalInitDone(false) { _internal = new CoreApplicationInternal(); // needed for parser options -#if defined(HAVE_KDE) || defined(Q_OS_MAC) +#if defined(HAVE_KDE4) || defined(Q_OS_MAC) disableCrashhandler(); -#endif /* HAVE_KDE || Q_OS_MAC */ +#endif /* HAVE_KDE4 || Q_OS_MAC */ setRunMode(Quassel::Monolithic); } @@ -73,3 +73,13 @@ void MonolithicApplication::startInternalCore() connect(connection, SIGNAL(connectToInternalCore(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*))); connect(core, SIGNAL(sessionState(Protocol::SessionState)), connection, SLOT(internalSessionStateReceived(Protocol::SessionState))); } + + +bool MonolithicApplication::reloadConfig() +{ + if (_internal) { + return _internal->reloadConfig(); + } else { + return false; + } +}