rework logging

4 files changed, 10 insertions, 18 deletions

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 278fab77..7ba994dd 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -527,5 +527,5 @@ bool QXmppClient::handleStreamElement(const QDomElement &element)
 
 QXmppLogger &QXmppClient::logger()
 {
-    return QXmppLogger::defaultLogger();
+    return *QXmppLogger::getLogger();
 }
diff --git a/source/QXmppLogger.cpp b/source/QXmppLogger.cpp
index dac41b19..18fc6d30 100644
--- a/source/QXmppLogger.cpp
+++ b/source/QXmppLogger.cpp
@@ -27,25 +27,18 @@
 #include <QTime>
 
 QXmppLogger* QXmppLogger::m_logger = 0;
-QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE;
-QFile QXmppLogger::m_file("QXmppClientLog.log");
-QTextStream QXmppLogger::m_stream;
 
 QXmppLogger::QXmppLogger()
+    : m_loggingType(QXmppLogger::FILE), m_file("QXmppClientLog.log")
 {
 }
 
-QXmppLogger &QXmppLogger::defaultLogger()
+QXmppLogger* QXmppLogger::getLogger()
 {
     if(!m_logger)
         m_logger = new QXmppLogger();
 
-    return *m_logger;
-}
-
-QXmppLogger* QXmppLogger::getLogger()
-{
-    return &defaultLogger();
+    return m_logger;
 }
 
 void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log)
diff --git a/source/QXmppLogger.h b/source/QXmppLogger.h
index dc964e06..a6adb253 100644
--- a/source/QXmppLogger.h
+++ b/source/QXmppLogger.h
@@ -39,7 +39,7 @@ public:
         STDOUT
     };
 
-    static QXmppLogger &defaultLogger();
+    static QXmppLogger* getLogger();
     QXmppLogger::LoggingType loggingType();
     void setLoggingType(QXmppLogger::LoggingType);
 
@@ -47,15 +47,14 @@ public:
     QXmppLogger& operator<<(const QString &str);
 
     // deprecated methods
-    static QXmppLogger* Q_DECL_DEPRECATED getLogger();
     QXmppLogger::LoggingType Q_DECL_DEPRECATED getLoggingType();
 
 private:
     QXmppLogger();
     static QXmppLogger* m_logger;
-    static QXmppLogger::LoggingType m_loggingType;
-    static QFile m_file;
-    static QTextStream m_stream;
+    QXmppLogger::LoggingType m_loggingType;
+    QFile m_file;
+    QTextStream m_stream;
 };
 
 #endif // QXMPPLOGGER_H
diff --git a/source/QXmppUtils.cpp b/source/QXmppUtils.cpp
index 820f3a13..dbd62bb8 100644
--- a/source/QXmppUtils.cpp
+++ b/source/QXmppUtils.cpp
@@ -118,12 +118,12 @@ void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,
 
 void log(const QString& str)
 {
-    QXmppLogger::defaultLogger() << str;
+    *QXmppLogger::getLogger() << str;
 }
 
 void log(const QByteArray& str)
 {
-    QXmppLogger::defaultLogger() << str;
+    *QXmppLogger::getLogger() << str;
 }
 
 QString escapeString(const QString& str)