projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Network::clearCaps only sync when caps removed
[quassel.git]
/
src
/
common
/
logger.h
diff --git
a/src/common/logger.h
b/src/common/logger.h
index
ea5b01b
..
1162fa4
100644
(file)
--- a/
src/common/logger.h
+++ b/
src/common/logger.h
@@
-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 *
@@
-33,7
+33,11
@@
public:
inline Logger(Quassel::LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
~Logger();
inline Logger(Quassel::LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
~Logger();
+#if QT_VERSION < 0x050000
static void logMessage(QtMsgType type, const char *msg);
static void logMessage(QtMsgType type, const char *msg);
+#else
+ static void logMessage(QtMsgType, const QMessageLogContext&, const QString&);
+#endif
template<typename T>
inline Logger &operator<<(const T &value) { _stream << value << " "; return *this; }
template<typename T>
inline Logger &operator<<(const T &value) { _stream << value << " "; return *this; }