projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uisupport: Provide helpers for dealing with widget changes
[quassel.git]
/
src
/
common
/
logger.cpp
diff --git
a/src/common/logger.cpp
b/src/common/logger.cpp
index
a72c68f
..
97afb40
100644
(file)
--- a/
src/common/logger.cpp
+++ b/
src/common/logger.cpp
@@
-31,13
+31,14
@@
#include "logger.h"
#include "quassel.h"
#include "logger.h"
#include "quassel.h"
+#include "types.h"
namespace {
QByteArray msgWithTime(const Logger::LogEntry &msg)
{
return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + msg.message + "\n").toUtf8();
namespace {
QByteArray msgWithTime(const Logger::LogEntry &msg)
{
return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + msg.message + "\n").toUtf8();
-}
;
+}
}
}
@@
-51,7
+52,7
@@
Logger::Logger(QObject *parent)
}();
Q_UNUSED(registered)
}();
Q_UNUSED(registered)
- connect(this,
SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry))
);
+ connect(this,
&Logger::messageLogged, this, &Logger::onMessageLogged
);
qInstallMessageHandler(Logger::messageHandler);
}
qInstallMessageHandler(Logger::messageHandler);
}
@@
-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;
}
}