cleanup error/logger accessors

4 files changed, 16 insertions, 24 deletions

diff --git a/source/server/QXmppClientServer.cpp b/source/server/QXmppClientServer.cpp
index 9afb463b..6e0c4dd4 100644
--- a/source/server/QXmppClientServer.cpp
+++ b/source/server/QXmppClientServer.cpp
@@ -49,12 +49,10 @@
 QXmppClientServer::QXmppClientServer(QSslSocket *socket,
     const QByteArray &data, QObject *parent)
 : QObject(parent)
-, m_logger(0)
 , m_stream(0)
 {
     Q_ASSERT( socket->state() == QAbstractSocket::ConnectedState );
 
-    m_logger = QXmppLogger::getLogger();
     //m_stream = new QXmppStream(this);
     //m_stream->setSocket( socket );
 
@@ -118,9 +116,9 @@ void QXmppClientServer::disconnect()
 /// \return QAbstractSocket::SocketError
 ///
 
-QAbstractSocket::SocketError QXmppClientServer::getSocketError()
+QAbstractSocket::SocketError QXmppClientServer::socketError()
 {
-    return m_stream->getSocketError();
+    return m_stream->socketError();
 }
 
 /// Returns the XMPP stream error if QXmppClientServer::Error is QXmppClientServer::XmppStreamError.
@@ -128,20 +126,20 @@ QAbstractSocket::SocketError QXmppClientServer::getSocketError()
 /// \return QXmppClientServer::Error::Condition
 ///
 
-QXmppStanza::Error::Condition QXmppClientServer::getXmppStreamError()
+QXmppStanza::Error::Condition QXmppClientServer::xmppStreamError()
 {
-    return m_stream->getXmppStreamError();
+    return m_stream->xmppStreamError();
 }
 
 /// Return the QXmppLogger associated with the client.
 
 QXmppLogger *QXmppClientServer::logger()
 {
-    return m_logger;
+    return m_stream->logger();
 }
 
 void QXmppClientServer::setLogger(QXmppLogger *logger)
 {
-    m_logger = logger;
+    m_stream->setLogger(logger);
 }
 
diff --git a/source/server/QXmppClientServer.h b/source/server/QXmppClientServer.h
index ba2b8df8..3c5fd884 100644
--- a/source/server/QXmppClientServer.h
+++ b/source/server/QXmppClientServer.h
@@ -65,9 +65,8 @@ signals:
     void messageReceived(const QXmppMessage&);
 
 public:
-    QAbstractSocket::SocketError getSocketError();
-
-    QXmppStanza::Error::Condition getXmppStreamError();
+    QAbstractSocket::SocketError socketError();
+    QXmppStanza::Error::Condition xmppStreamError();
 
     QXmppLogger *logger();
     void setLogger(QXmppLogger *logger);
@@ -76,7 +75,6 @@ public slots:
     void sendPacket(const QXmppPacket&);
 
 private:
-    QXmppLogger* m_logger;
     QXmppStream* m_stream;  ///< Pointer to QXmppStream object, a wrapper over
                             ///< TCP socket and XMPP protocol
 };
diff --git a/source/server/QXmppServerConnection.cpp b/source/server/QXmppServerConnection.cpp
index 2a688482..1a0cf828 100644
--- a/source/server/QXmppServerConnection.cpp
+++ b/source/server/QXmppServerConnection.cpp
@@ -50,12 +50,10 @@
 QXmppServerConnection::QXmppServerConnection(QSslSocket *socket,
     const QByteArray &data, QObject *parent)
 : QObject(parent)
-, m_logger(0)
 , m_stream(0)
 {
     Q_ASSERT( socket == 0 || socket->state() == QAbstractSocket::ConnectedState );
 
-    m_logger = QXmppLogger::getLogger();
     //m_stream = new QXmppStream(this);
     //m_stream->setSocket( socket );
 
@@ -136,9 +134,9 @@ void QXmppServerConnection::disconnect()
 /// \return QAbstractSocket::SocketError
 ///
 
-QAbstractSocket::SocketError QXmppServerConnection::getSocketError()
+QAbstractSocket::SocketError QXmppServerConnection::socketError()
 {
-    return m_stream->getSocketError();
+    return m_stream->socketError();
 }
 
 /// Returns the XMPP stream error if QXmppServerConnection::Error is QXmppServerConnection::XmppStreamError.
@@ -146,20 +144,20 @@ QAbstractSocket::SocketError QXmppServerConnection::getSocketError()
 /// \return QXmppServerConnection::Error::Condition
 ///
 
-QXmppStanza::Error::Condition QXmppServerConnection::getXmppStreamError()
+QXmppStanza::Error::Condition QXmppServerConnection::xmppStreamError()
 {
-    return m_stream->getXmppStreamError();
+    return m_stream->xmppStreamError();
 }
 
 /// Return the QXmppLogger associated with the client.
 
 QXmppLogger *QXmppServerConnection::logger()
 {
-    return m_logger;
+    return m_stream->logger();
 }
 
 void QXmppServerConnection::setLogger(QXmppLogger *logger)
 {
-    m_logger = logger;
+    m_stream->setLogger(logger);
 }
 
diff --git a/source/server/QXmppServerConnection.h b/source/server/QXmppServerConnection.h
index c948064f..2a7d4a66 100644
--- a/source/server/QXmppServerConnection.h
+++ b/source/server/QXmppServerConnection.h
@@ -96,9 +96,8 @@ signals:
     void messageReceived(const QXmppMessage&);
 
 public:
-    QAbstractSocket::SocketError getSocketError();
-
-    QXmppStanza::Error::Condition getXmppStreamError();
+    QAbstractSocket::SocketError socketError();
+    QXmppStanza::Error::Condition xmppStreamError();
 
     QXmppLogger *logger();
     void setLogger(QXmppLogger *logger);
@@ -107,7 +106,6 @@ public slots:
     void sendPacket(const QXmppPacket&);
 
 private:
-    QXmppLogger* m_logger;
     QXmppStream* m_stream;  ///< Pointer to QXmppStream object, a wrapper over
                             ///< TCP socket and XMPP protocol
 };