make QXmppStream inherit QXmppLoggable

4 files changed, 3 insertions, 65 deletions

diff --git a/src/QXmppIncomingServer.cpp b/src/QXmppIncomingServer.cpp
index 83e1bdd4..26d7ca4e 100644
--- a/src/QXmppIncomingServer.cpp
+++ b/src/QXmppIncomingServer.cpp
@@ -126,7 +126,6 @@ void QXmppIncomingServer::handleStanza(const QDomElement &stanza)
         {
             // establish dialback connection
             QXmppOutgoingServer *stream = new QXmppOutgoingServer(d->domain, this);
-            stream->setLogger(logger());
             stream->setObjectName("S2S-dialback-" + domain);
             bool check = connect(stream, SIGNAL(dialbackResponseReceived(QXmppDialback)),
                                  this, SLOT(slotDialbackResponseReceived(QXmppDialback)));
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index a403520f..bb5655e6 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -101,7 +101,6 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent)
 
     // initialise logger
     setObjectName("C2S-out");
-    setLogger(QXmppLogger::getLogger());
 
     bool check = connect(socket, SIGNAL(sslErrors(const QList<QSslError>&)),
                          this, SLOT(socketSslErrors(const QList<QSslError>&)));
diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index 502d538c..ea90e7db 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -47,7 +47,6 @@ public:
     QXmppStreamPrivate();
 
     QByteArray dataBuffer;
-    QXmppLogger* logger;
     QSslSocket* socket;
 
     // stream state
@@ -55,8 +54,7 @@ public:
 };
 
 QXmppStreamPrivate::QXmppStreamPrivate()
-    : logger(0),
-    socket(0)
+    : socket(0)
 {
 }
 
@@ -65,7 +63,7 @@ QXmppStreamPrivate::QXmppStreamPrivate()
 /// \param parent
 
 QXmppStream::QXmppStream(QObject *parent)
-    : QObject(parent),
+    : QXmppLoggable(parent),
     d(new QXmppStreamPrivate)
 {
     // Make sure the random number generator is seeded
@@ -100,53 +98,6 @@ void QXmppStream::handleStart()
 {
 }
 
-/// Returns the QXmppLogger associated with the current stream.
-
-QXmppLogger *QXmppStream::logger()
-{
-    return d->logger;
-}
-
-/// Sets the QXmppLogger associated with the current stream.
-
-void QXmppStream::setLogger(QXmppLogger *logger)
-{
-    if (d->logger)
-        disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)),
-                   d->logger, SLOT(log(QXmppLogger::MessageType, QString)));
-    d->logger = logger;
-    if (d->logger)
-        connect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)),
-                d->logger, SLOT(log(QXmppLogger::MessageType, QString)));
-}
-
-/// Logs a debugging message.
-///
-/// \param message
-
-void QXmppStream::debug(const QString &message)
-{
-    emit logMessage(QXmppLogger::DebugMessage, message);
-}
-
-/// Logs an informational message.
-///
-/// \param message
-
-void QXmppStream::info(const QString &message)
-{
-    emit logMessage(QXmppLogger::InformationMessage, message);
-}
-
-/// Logs a warning message.
-///
-/// \param message
-
-void QXmppStream::warning(const QString &message)
-{
-    emit logMessage(QXmppLogger::WarningMessage, message);
-}
-
 /// Returns true if the stream is connected.
 ///
 
diff --git a/src/QXmppStream.h b/src/QXmppStream.h
index 19a7ca12..525e2cb5 100644
--- a/src/QXmppStream.h
+++ b/src/QXmppStream.h
@@ -37,7 +37,7 @@ class QXmppStreamPrivate;
 /// \brief The QXmppStream class is the base class for all XMPP streams.
 ///
 
-class QXmppStream : public QObject
+class QXmppStream : public QXmppLoggable
 {
     Q_OBJECT
 
@@ -48,9 +48,6 @@ public:
     bool isConnected() const;
     void disconnectFromHost();
 
-    QXmppLogger *logger();
-    void setLogger(QXmppLogger *logger);
-
     bool sendData(const QByteArray&);
     bool sendElement(const QDomElement&);
     bool sendPacket(const QXmppPacket&);
@@ -62,15 +59,7 @@ signals:
     /// This signal is emitted when the stream is disconnected.
     void disconnected();
 
-    /// This signal is emitted to send logging messages.
-    void logMessage(QXmppLogger::MessageType type, const QString &msg);
-
 protected:
-    // Logging helpers
-    void debug(const QString&);
-    void info(const QString&);
-    void warning(const QString&);
-
     // Access to underlying socket
     QSslSocket *socket();
     void setSocket(QSslSocket *socket);