X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.h;h=33375fefb85b6426901b77a4fd958ade3fa6d65d;hp=744c980037798aac5b02b4943ec8fd29536c48d8;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=98bec7bab038a8e656f90617c59fe1e8c0907f71

diff --git a/src/common/logger.h b/src/common/logger.h
index 744c9800..33375fef 100644
--- a/src/common/logger.h
+++ b/src/common/logger.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef LOGGER_H
@@ -27,38 +27,50 @@
 #include "quassel.h"
 #include "types.h"
 
-class Logger {
+class Logger
+{
 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();
 
-  static void logMessage(QtMsgType type, const char *msg);
+#if QT_VERSION < 0x050000
+    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; }
-  inline Logger &operator<<(const QStringList & t) { _stream << t.join(" ") << " "; return *this; }
-  inline Logger &operator<<(bool t) { _stream << (t ? "true" : "false") << " "; return *this; }
+    template<typename T>
+    inline Logger &operator<<(const T &value) { _stream << value << " "; return *this; }
+    inline Logger &operator<<(const QStringList &t) { _stream << t.join(" ") << " "; return *this; }
+    inline Logger &operator<<(bool t) { _stream << (t ? "true" : "false") << " "; return *this; }
 
 private:
-  void log();
-  QTextStream _stream;
-  QString _buffer;
-  Quassel::LogLevel _logLevel;
+    void log();
+    QTextStream _stream;
+    QString _buffer;
+    Quassel::LogLevel _logLevel;
 };
 
-class quInfo : public Logger {
+
+class quInfo : public Logger
+{
 public:
-  inline quInfo() : Logger(Quassel::InfoLevel) {}
+    inline quInfo() : Logger(Quassel::InfoLevel) {}
 };
 
-class quWarning : public Logger {
+
+class quWarning : public Logger
+{
 public:
-  inline quWarning() : Logger(Quassel::WarningLevel) {}
+    inline quWarning() : Logger(Quassel::WarningLevel) {}
 };
 
-class quError : public Logger {
+
+class quError : public Logger
+{
 public:
-  inline quError() : Logger(Quassel::ErrorLevel) {}
+    inline quError() : Logger(Quassel::ErrorLevel) {}
 };
 
+
 #endif