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

diff --git a/src/common/logger.h b/src/common/logger.h
index 07ae0156..33375fef 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,71 +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_
+#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(new Stream(level)) {}
+class Logger
+{
+public:
+    inline Logger(Quassel::LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
     ~Logger();
 
-    inline Logger &operator<<(const char* t) { _stream->internalStream << QString::fromAscii(t); return *this; }
-    inline Logger &operator<<(QChar t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(bool t) { _stream->internalStream << (t ? "true" : "false"); return *this; }
-    inline Logger &operator<<(char t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(signed short t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(unsigned short t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(signed int t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(unsigned int t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(signed long t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(unsigned long t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(qint64 t) { _stream->internalStream << QString::number(t); return *this; }
-    inline Logger &operator<<(quint64 t) { _stream->internalStream << QString::number(t); return *this; }
-    inline Logger &operator<<(float t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(double t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(const QString & t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(const QLatin1String &t) { _stream->internalStream << t.latin1(); return *this; }
-    inline Logger &operator<<(const QByteArray & t) { _stream->internalStream << t ; return *this; }
-    inline Logger &operator<<(const void * t) { _stream->internalStream << t; return *this; }
-    inline Logger &operator<<(const QStringList & t) { _stream->internalStream << t.join(" "); return *this; }
-    inline Logger &operator<<(const BufferId & t) { _stream->internalStream << QVariant::fromValue(t).toInt(); return *this; }
-    inline Logger &operator<<(const NetworkId & t) { _stream->internalStream << QVariant::fromValue(t).toInt(); return *this; }
-    inline Logger &operator<<(const UserId & t) { _stream->internalStream << QVariant::fromValue(t).toInt(); return *this; }
-    inline Logger &operator<<(const MsgId & t) { _stream->internalStream << QVariant::fromValue(t).toInt(); return *this; }
-    inline Logger &operator<<(const IdentityId & t) { _stream->internalStream << QVariant::fromValue(t).toInt(); return *this; }
-    inline Logger &operator<<(const AccountId & t) { _stream->internalStream << QVariant::fromValue(t).toInt(); return *this; }
+#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; }
+
+private:
     void log();
-  private:
-    struct Stream {
-      Stream(LogLevel level)
-      : internalStream(&buffer, QIODevice::WriteOnly),
-        logLevel(level) {}
-      QTextStream internalStream;
-      QString buffer;
-      LogLevel logLevel;
-    } *_stream;
+    QTextStream _stream;
+    QString _buffer;
+    Quassel::LogLevel _logLevel;
+};
+
+
+class quInfo : public Logger
+{
+public:
+    inline quInfo() : Logger(Quassel::InfoLevel) {}
+};
+
+
+class quWarning : public Logger
+{
+public:
+    inline quWarning() : Logger(Quassel::WarningLevel) {}
+};
+
+
+class quError : public Logger
+{
+public:
+    inline quError() : Logger(Quassel::ErrorLevel) {}
 };
 
-inline Logger quDebug() { return Logger(Logger::DebugLevel); }
-inline Logger quInfo() { return Logger(Logger::InfoLevel); }
-inline Logger quWarning() { return Logger(Logger::WarningLevel); }
-inline Logger quError() { return Logger(Logger::ErrorLevel); }
 
 #endif