rework QXmppLogger to always use QTextStream

1 files changed, 32 insertions, 16 deletions

diff --git a/source/QXmppLogger.cpp b/source/QXmppLogger.cpp
index 18fc6d30..2bbf727e 100644
--- a/source/QXmppLogger.cpp
+++ b/source/QXmppLogger.cpp
@@ -21,28 +21,55 @@
  *
  */
 
+#include <QFile>
+#include <QTime>
 
 #include "QXmppLogger.h"
-#include <iostream>
-#include <QTime>
 
 QXmppLogger* QXmppLogger::m_logger = 0;
 
 QXmppLogger::QXmppLogger()
-    : m_loggingType(QXmppLogger::FILE), m_file("QXmppClientLog.log")
+    : m_loggingType(QXmppLogger::NONE), m_file(0)
+{
+}
+
+QXmppLogger::~QXmppLogger()
 {
+    delete m_file;
 }
 
 QXmppLogger* QXmppLogger::getLogger()
 {
     if(!m_logger)
+    {
         m_logger = new QXmppLogger();
+        m_logger->setLoggingType(QXmppLogger::FILE);
+    }
 
     return m_logger;
 }
 
 void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log)
 {
+    if (m_file)
+    {
+        delete m_file;
+        m_file = 0;
+    }
+    switch(log)
+    {
+    case QXmppLogger::FILE:
+        m_file = new QFile("QXmppClientLog.log");
+        m_file->open(QIODevice::Append);
+        break;
+    case QXmppLogger::STDOUT:
+        m_file = new QFile();
+        m_file->open(stdout, QIODevice::WriteOnly);
+        break;
+    case QXmppLogger::NONE:
+        break;
+    }
+    m_stream.setDevice(m_file);
     m_loggingType = log;
 }
 
@@ -53,22 +80,11 @@ QXmppLogger::LoggingType QXmppLogger::loggingType()
 
 QXmppLogger &QXmppLogger::operator<<(const QByteArray &str)
 {
-    switch(m_loggingType)
+    if (m_loggingType != NONE)
     {
-    case QXmppLogger::FILE:
-        m_file.open(QIODevice::Append);
-        m_stream.setDevice(&m_file);
         m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<
                 str << "\n\n";
-        m_file.close();
-        break;
-    case QXmppLogger::STDOUT:
-        std::cout<<str.constData()<<std::endl;
-        break;
-    case QXmppLogger::NONE:
-        break;
-    default:
-        break;
+        m_stream.flush();
     }
     return *this;
 }