projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent the spelling highlighter from disabling itself
[quassel.git]
/
src
/
core
/
coreapplication.cpp
diff --git
a/src/core/coreapplication.cpp
b/src/core/coreapplication.cpp
index
3e3f9d1
..
7426f17
100644
(file)
--- a/
src/core/coreapplication.cpp
+++ b/
src/core/coreapplication.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-62,6
+62,17
@@
bool CoreApplicationInternal::init()
}
}
+bool CoreApplicationInternal::reloadConfig()
+{
+ if (_coreCreated) {
+ // Currently, only reloading SSL certificates is supported
+ return Core::reloadCerts();
+ } else {
+ return false;
+ }
+}
+
+
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
@@
-85,8
+96,22
@@
CoreApplication::~CoreApplication()
bool CoreApplication::init()
{
if (Quassel::init() && _internal->init()) {
bool CoreApplication::init()
{
if (Quassel::init() && _internal->init()) {
+#if QT_VERSION < 0x050000
qInstallMsgHandler(Logger::logMessage);
qInstallMsgHandler(Logger::logMessage);
+#else
+ qInstallMessageHandler(Logger::logMessage);
+#endif
return true;
}
return false;
}
return true;
}
return false;
}
+
+
+bool CoreApplication::reloadConfig()
+{
+ if (_internal) {
+ return _internal->reloadConfig();
+ } else {
+ return false;
+ }
+}