From 1c8faec60853260865bb3e9dbbc3afa2ec86cb8a Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Tue, 16 Nov 2010 21:42:22 +0000 Subject: more logging unification --- src/QXmppStun.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/QXmppStun.cpp') diff --git a/src/QXmppStun.cpp b/src/QXmppStun.cpp index 276cbcba..7e6cab73 100644 --- a/src/QXmppStun.cpp +++ b/src/QXmppStun.cpp @@ -821,8 +821,7 @@ void QXmppStunSocket::checkCandidates() msg.setType(Binding | Request); msg.setId(m_stunId); #ifdef QXMPP_DEBUG_STUN - emit logMessage(QXmppLogger::SentMessage, - QString("Sent to %1 %2\n%3").arg(m_stunHost.toString(), + logSent(QString("Sent to %1 %2\n%3").arg(m_stunHost.toString(), QString::number(m_stunPort), msg.toString())); #endif socket->writeDatagram(msg.encode(), m_stunHost, m_stunPort); @@ -999,7 +998,7 @@ void QXmppStunSocket::readyRead() return; } #ifdef QXMPP_DEBUG_STUN - emit logMessage(QXmppLogger::ReceivedMessage, QString("Received from %1 port %2\n%3").arg(remoteHost.toString(), + logReceived(QString("Received from %1 port %2\n%3").arg(remoteHost.toString(), QString::number(remotePort), message.toString())); #endif @@ -1148,11 +1147,7 @@ qint64 QXmppStunSocket::writeStun(const QXmppStunMessage &message, QXmppStunSock const QString messagePassword = (message.type() & 0xFF00) ? m_localPassword : m_remotePassword; qint64 ret = pair->socket->writeDatagram(message.encode(messagePassword), pair->remote.host(), pair->remote.port()); #ifdef QXMPP_DEBUG_STUN - if (ret < 0) - warning(QString("Could not send to %1\n%2").arg(pair->toString(), pair->socket->errorString())); - else - emit logMessage(QXmppLogger::SentMessage, QString("Sent to %1\n%2").arg(pair->toString(), - message.toString())); + logSent(QString("Sent to %1\n%2").arg(pair->toString(), message.toString())); #endif return ret; } -- cgit v1.2.3