X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=97783fb679263ac283763a319ee3eb7a5d568c05;hp=bf270f9dbe356e487699bc3466368f7884d823d0;hb=5b686746c880e5cda6d5de3e08180ea4332ff222;hpb=2b1fcb466b3694a900aab579d60d8e61456844f7

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index bf270f9d..97783fb6 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -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.         *
  ***************************************************************************/
 
 #include <QFile>
@@ -29,85 +29,89 @@
 #include "logger.h"
 #include "quassel.h"
 
-Logger::~Logger() {
-  log();
+Logger::~Logger()
+{
+    log();
 }
 
-void Logger::log() {
-  if(_logLevel < Quassel::logLevel())
-    return;
 
-  switch(_logLevel) {
-  case Quassel::DebugLevel:
-    _buffer.prepend("Debug: ");
-    break;
-  case Quassel::InfoLevel:
-    _buffer.prepend("Info: ");
-    break;
-    case Quassel::WarningLevel:
-    _buffer.prepend("Warning: ");
-    break;
-  case Quassel::ErrorLevel:
-    _buffer.prepend("Error: ");
-    break;
-  default:
-    break;
-  }
+void Logger::log()
+{
+    if (_logLevel < Quassel::logLevel())
+        return;
 
-#ifdef HAVE_SYSLOG
-  if(Quassel::logToSyslog()) {
-    int prio;
-    switch(_logLevel) {
+    switch (_logLevel) {
     case Quassel::DebugLevel:
-      prio = LOG_DEBUG;
-      break;
+        _buffer.prepend("Debug: ");
+        break;
     case Quassel::InfoLevel:
-      prio = LOG_INFO;
-      break;
+        _buffer.prepend("Info: ");
+        break;
     case Quassel::WarningLevel:
-      prio = LOG_WARNING;
-      break;
+        _buffer.prepend("Warning: ");
+        break;
     case Quassel::ErrorLevel:
-      prio = LOG_ERR;
-      break;
+        _buffer.prepend("Error: ");
+        break;
     default:
-      prio = LOG_INFO;
-      break;
+        break;
+    }
+
+#ifdef HAVE_SYSLOG
+    if (Quassel::logToSyslog()) {
+        int prio;
+        switch (_logLevel) {
+        case Quassel::DebugLevel:
+            prio = LOG_DEBUG;
+            break;
+        case Quassel::InfoLevel:
+            prio = LOG_INFO;
+            break;
+        case Quassel::WarningLevel:
+            prio = LOG_WARNING;
+            break;
+        case Quassel::ErrorLevel:
+            prio = LOG_ERR;
+            break;
+        default:
+            prio = LOG_INFO;
+            break;
+        }
+        syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
     }
-    syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
-  }
 #endif
 
-  // if we neither use syslog nor have a logfile we log to stdout
+    // if we neither use syslog nor have a logfile we log to stdout
 
-  if(Quassel::logFile() || !Quassel::logToSyslog()) {
-    _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss "));
+    if (Quassel::logFile() || !Quassel::logToSyslog()) {
+        _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss "));
 
-    QTextStream out(stdout);
-    if(Quassel::logFile() && Quassel::logFile()->isOpen()) {
-      _buffer.remove(QChar('\n'));
-      out.setDevice(Quassel::logFile());
-    }
+        QTextStream out(stdout);
+        if (Quassel::logFile() && Quassel::logFile()->isOpen()) {
+            _buffer.remove(QChar('\n'));
+            out.setDevice(Quassel::logFile());
+        }
 
-    out << _buffer << endl;
-  }
+        out << _buffer << endl;
+    }
 }
 
 
-void Logger::logMessage(QtMsgType type, const char *msg) {
-  switch (type) {
-  case QtDebugMsg:
-    Logger(Quassel::DebugLevel) << msg;
-    break;
-  case QtWarningMsg:
-    Logger(Quassel::WarningLevel) << msg;
-    break;
-  case QtCriticalMsg:
-    Logger(Quassel::ErrorLevel) << msg;
-    break;
-  case QtFatalMsg:
-    Logger(Quassel::ErrorLevel) << msg;
-    Quassel::logFatalMessage(msg);
-    return;
-  }
+void Logger::logMessage(QtMsgType type, const char *msg)
+{
+    switch (type) {
+    case QtDebugMsg:
+        Logger(Quassel::DebugLevel) << msg;
+        break;
+    case QtWarningMsg:
+        Logger(Quassel::WarningLevel) << msg;
+        break;
+    case QtCriticalMsg:
+        Logger(Quassel::ErrorLevel) << msg;
+        break;
+    case QtFatalMsg:
+        Logger(Quassel::ErrorLevel) << msg;
+        Quassel::logFatalMessage(msg);
+        return;
+    }
 }