projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Reorganize the initialization sequence
[quassel.git]
/
src
/
common
/
logger.cpp
diff --git
a/src/common/logger.cpp
b/src/common/logger.cpp
index
a72c68f
..
aabba5e
100644
(file)
--- a/
src/common/logger.cpp
+++ b/
src/common/logger.cpp
@@
-31,6
+31,7
@@
#include "logger.h"
#include "quassel.h"
#include "logger.h"
#include "quassel.h"
+#include "types.h"
namespace {
namespace {
@@
-74,7
+75,7
@@
std::vector<Logger::LogEntry> Logger::messages() const
}
}
-
bool
Logger::setup(bool keepMessages)
+
void
Logger::setup(bool keepMessages)
{
_keepMessages = keepMessages;
{
_keepMessages = keepMessages;
@@
-90,8
+91,7
@@
bool Logger::setup(bool keepMessages)
else if (level == "error")
_outputLevel = LogLevel::Error;
else {
else if (level == "error")
_outputLevel = LogLevel::Error;
else {
- qCritical() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
- return false;
+ throw ExitException{EXIT_FAILURE, qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level))};
}
}
}
}
@@
-121,8
+121,6
@@
bool Logger::setup(bool keepMessages)
if (!_keepMessages) {
_messages.clear();
}
if (!_keepMessages) {
_messages.clear();
}
-
- return true;
}
}