X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Flogger.h;h=910c555dc08232514c834481a95069bd2e4cc596;hb=e30092afc1803d753914a7ab9fa88bba818de559;hp=352b0ce37e2bd28d94f7f23411f59715e0ac67d2;hpb=1e8ee5e5467db6fe9795f6a6e806e310bf07ef9d;p=quassel.git

diff --git a/src/common/logger.h b/src/common/logger.h
index 352b0ce3..910c555d 100644
--- a/src/common/logger.h
+++ b/src/common/logger.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by the Quassel Project                             *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,57 +15,62 @@
  *   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
 #define LOGGER_H
 
-#include "types.h"
-
-#include <QString>
 #include <QStringList>
 #include <QTextStream>
 
-class Logger {
-public:
-  enum LogLevel {
-    DebugLevel,
-    InfoLevel,
-    WarningLevel,
-    ErrorLevel
-  };
+#include "quassel.h"
+#include "types.h"
 
-  inline Logger(LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
-  ~Logger();
+class Logger
+{
+public:
+    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;
-  LogLevel _logLevel;
+    void log();
+    QTextStream _stream;
+    QString _buffer;
+    Quassel::LogLevel _logLevel;
 };
 
-class quInfo : public Logger {
+
+class quInfo : public Logger
+{
 public:
-  inline quInfo() : Logger(Logger::InfoLevel) {}
+    inline quInfo() : Logger(Quassel::InfoLevel) {}
 };
 
-class quWarning : public Logger {
+
+class quWarning : public Logger
+{
 public:
-  inline quWarning() : Logger(Logger::WarningLevel) {}
+    inline quWarning() : Logger(Quassel::WarningLevel) {}
 };
 
-class quError : public Logger {
+
+class quError : public Logger
+{
 public:
-  inline quError() : Logger(Logger::ErrorLevel) {}
+    inline quError() : Logger(Quassel::ErrorLevel) {}
 };
 
+
 #endif