diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-04-20 15:21:56 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-04-20 15:21:56 +0000 |
| commit | 7de79b51bb991b6d237522d3d30c73127dedbfa6 (patch) | |
| tree | 8f4c38bba237fb02be1f35ad9208fef06d4e38e3 /src/server/QXmppServer.cpp | |
| parent | d648473c16ac3fe5ce4f4b79c188b9bade381425 (diff) | |
encapsulate QXmppUtils methods in a QXmppUtils class
Diffstat (limited to 'src/server/QXmppServer.cpp')
| -rw-r--r-- | src/server/QXmppServer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp index 02fbd402..ae5ff8cb 100644 --- a/src/server/QXmppServer.cpp +++ b/src/server/QXmppServer.cpp @@ -123,7 +123,7 @@ QXmppServerPrivate::QXmppServerPrivate(QXmppServer *qq) bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data) { // refuse to route packets to empty destination, own domain or sub-domains - const QString toDomain = jidToDomain(to); + const QString toDomain = QXmppUtils::jidToDomain(to); if (to.isEmpty() || to == domain || toDomain.endsWith("." + domain)) return false; @@ -131,7 +131,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data) // look for a client connection QList<QXmppIncomingClient*> found; - if (jidToResource(to).isEmpty()) { + if (QXmppUtils::jidToResource(to).isEmpty()) { foreach (QXmppIncomingClient *conn, incomingClientsByBareJid.value(to)) found << conn; } else { @@ -162,7 +162,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data) // if we did not find an outgoing server, // we need to establish the S2S connection QXmppOutgoingServer *conn = new QXmppOutgoingServer(domain, 0); - conn->setLocalStreamKey(generateStanzaHash().toAscii()); + conn->setLocalStreamKey(QXmppUtils::generateStanzaHash().toAscii()); conn->moveToThread(q->thread()); conn->setParent(q); @@ -638,7 +638,7 @@ void QXmppServer::_q_clientConnected() old->disconnectFromHost(); } d->incomingClientsByJid.insert(jid, client); - d->incomingClientsByBareJid[jidToBareJid(jid)].insert(client); + d->incomingClientsByBareJid[QXmppUtils::jidToBareJid(jid)].insert(client); // emit signal emit clientConnected(jid); @@ -658,7 +658,7 @@ void QXmppServer::_q_clientDisconnected() if (!jid.isEmpty()) { if (d->incomingClientsByJid.value(jid) == client) d->incomingClientsByJid.remove(jid); - const QString bareJid = jidToBareJid(jid); + const QString bareJid = QXmppUtils::jidToBareJid(jid); if (d->incomingClientsByBareJid.contains(bareJid)) { d->incomingClientsByBareJid[bareJid].remove(client); if (d->incomingClientsByBareJid[bareJid].isEmpty()) |
