X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.h;h=352b0ce37e2bd28d94f7f23411f59715e0ac67d2;hp=c372a11c1aa782316967613e980b6112e8b52853;hb=20b5edb626156df8c472df8250b5f2faaf37835e;hpb=c9b7f5cfe4377cc242c24212fff48aad70192b48

diff --git a/src/common/logger.h b/src/common/logger.h
index c372a11c..352b0ce3 100644
--- a/src/common/logger.h
+++ b/src/common/logger.h
@@ -28,47 +28,44 @@
 #include <QTextStream>
 
 class Logger {
-  public:
-    enum LogLevel {
-      DebugLevel,
-      InfoLevel,
-      WarningLevel,
-      ErrorLevel
-    };
+public:
+  enum LogLevel {
+    DebugLevel,
+    InfoLevel,
+    WarningLevel,
+    ErrorLevel
+  };
 
-    inline Logger(LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
-    ~Logger();
+  inline Logger(LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
+  ~Logger();
 
-    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<<(const char* t) { _stream << QString::fromLocal8Bit(t); return *this; }
-    inline Logger &operator<<(bool t) { _stream << (t ? "true" : "false"); return *this; }
+  static void logMessage(QtMsgType type, const char *msg);
 
-  private:
-    void log();
-    QTextStream _stream;
-    QString _buffer;
-    LogLevel _logLevel;
-};
+  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; }
 
-class quDebug : public Logger {
-  public:
-    inline quDebug() : Logger(Logger::DebugLevel) {}
+private:
+  void log();
+  QTextStream _stream;
+  QString _buffer;
+  LogLevel _logLevel;
 };
 
 class quInfo : public Logger {
-  public:
-    inline quInfo() : Logger(Logger::InfoLevel) {}
+public:
+  inline quInfo() : Logger(Logger::InfoLevel) {}
 };
 
 class quWarning : public Logger {
-  public:
-    inline quWarning() : Logger(Logger::WarningLevel) {}
+public:
+  inline quWarning() : Logger(Logger::WarningLevel) {}
 };
 
 class quError : public Logger {
-  public:
-    inline quError() : Logger(Logger::ErrorLevel) {}
+public:
+  inline quError() : Logger(Logger::ErrorLevel) {}
 };
+
 #endif