projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qa: Remove lots of superfluous semicolons
[quassel.git]
/
src
/
common
/
logger.cpp
diff --git
a/src/common/logger.cpp
b/src/common/logger.cpp
index
ed8d802
..
c767fc6
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();
-}
;
+}
}
}
@@
-53,11
+54,7
@@
Logger::Logger(QObject *parent)
connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry)));
connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry)));
-#if QT_VERSION < 0x050000
- qInstallMsgHandler(Logger::messageHandler);
-#else
qInstallMessageHandler(Logger::messageHandler);
qInstallMessageHandler(Logger::messageHandler);
-#endif
}
}
@@
-78,7
+75,7
@@
std::vector<Logger::LogEntry> Logger::messages() const
}
}
-
bool
Logger::setup(bool keepMessages)
+
void
Logger::setup(bool keepMessages)
{
_keepMessages = keepMessages;
{
_keepMessages = keepMessages;
@@
-94,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))};
}
}
}
}
@@
-125,16
+121,10
@@
bool Logger::setup(bool keepMessages)
if (!_keepMessages) {
_messages.clear();
}
if (!_keepMessages) {
_messages.clear();
}
-
- return true;
}
}
-#if QT_VERSION < 0x050000
-void Logger::messageHandler(QtMsgType type, const char *message)
-#else
void Logger::messageHandler(QtMsgType type, const QMessageLogContext &, const QString &message)
void Logger::messageHandler(QtMsgType type, const QMessageLogContext &, const QString &message)
-#endif
{
Quassel::instance()->logger()->handleMessage(type, message);
}
{
Quassel::instance()->logger()->handleMessage(type, message);
}
@@
-146,11
+136,9
@@
void Logger::handleMessage(QtMsgType type, const QString &msg)
case QtDebugMsg:
handleMessage(LogLevel::Debug, msg);
break;
case QtDebugMsg:
handleMessage(LogLevel::Debug, msg);
break;
-#if QT_VERSION >= 0x050500
case QtInfoMsg:
handleMessage(LogLevel::Info, msg);
break;
case QtInfoMsg:
handleMessage(LogLevel::Info, msg);
break;
-#endif
case QtWarningMsg:
handleMessage(LogLevel::Warning, msg);
break;
case QtWarningMsg:
handleMessage(LogLevel::Warning, msg);
break;