diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-06-23 13:22:55 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-06-23 13:22:55 +0000 |
| commit | 1c1d11b4134d39a8acb1ef20fa1b0554b1be3cc2 (patch) | |
| tree | ccdd563ae29d615b5e392a1ac471ad8276db4eba /source | |
| parent | a79cd2c9fb888bddedbe7189dc55fe26062747a2 (diff) | |
| download | qxmpp-1c1d11b4134d39a8acb1ef20fa1b0554b1be3cc2.tar.gz | |
more logging cleanup
Diffstat (limited to 'source')
| -rw-r--r-- | source/QXmppClient.cpp | 8 | ||||
| -rw-r--r-- | source/QXmppClient.h | 5 | ||||
| -rw-r--r-- | source/QXmppStream.cpp | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp index 1e62fdbe..bdd91cfa 100644 --- a/source/QXmppClient.cpp +++ b/source/QXmppClient.cpp @@ -92,6 +92,11 @@ QXmppClient::QXmppClient(QObject *parent) this, SLOT(invokeInterfaceMethod(QXmppRpcInvokeIq))); Q_ASSERT(check); + // logging + check = connect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), + m_stream, SIGNAL(logMessage(QXmppLogger::MessageType, QString))); + Q_ASSERT(check); + // create managers m_roster = new QXmppRoster(m_stream, this); m_archiveManager = new QXmppArchiveManager(m_stream, this); @@ -206,8 +211,7 @@ void QXmppClient::connectToServer(const QString& host, } else { - qWarning("QXmppClient::connectToServer: Invalid bareJid"); - logger()->log(QXmppLogger::WarningMessage, "Invalid bareJid"); + emit logMessage(QXmppLogger::WarningMessage, "Invalid bareJid"); } } diff --git a/source/QXmppClient.h b/source/QXmppClient.h index 131f2dd8..9a367f90 100644 --- a/source/QXmppClient.h +++ b/source/QXmppClient.h @@ -30,9 +30,9 @@ #include <QVariant> #include "QXmppConfiguration.h" +#include "QXmppLogger.h" #include "QXmppPresence.h" -class QXmppLogger; class QXmppStream; class QXmppPresence; class QXmppMessage; @@ -183,6 +183,9 @@ signals: /// Notifies that an XMPP service discovery iq stanza is received. void discoveryIqReceived(const QXmppDiscoveryIq&); + /// This signal is emitted to send logging messages. + void logMessage(QXmppLogger::MessageType type, const QString &msg); + public: QAbstractSocket::SocketError getSocketError(); diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index a46130ca..f311284f 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -467,7 +467,7 @@ void QXmppStream::parser(const QByteArray& data) QString from = nodeRecv.attribute("from"); QString type = nodeRecv.attribute("type"); if(type.isEmpty()) - qWarning("QXmppStream: iq type can't be empty"); + warning("QXmppStream: iq type can't be empty"); if( QXmppRpcInvokeIq::isRpcInvokeIq( nodeRecv ) ) { |