aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorMatt Broadstone <mbroadst@gmail.com>2012-11-15 18:58:52 -0500
committerJeremy Lainé <jeremy.laine@m4x.org>2012-11-16 07:31:16 +0100
commitbf537e01032f2f0bb013fb45e4a9c13113f77a6f (patch)
tree204a8d6fa700e3ebcb44cf65712cf63764202d9f /src/server
parent1ba3b087975e523bb05b0703a5b0fa8392b7429b (diff)
downloadqxmpp-bf537e01032f2f0bb013fb45e4a9c13113f77a6f.tar.gz
move from toAscii() to toLatin1()
Diffstat (limited to 'src/server')
-rw-r--r--src/server/QXmppIncomingClient.cpp4
-rw-r--r--src/server/QXmppIncomingServer.cpp2
-rw-r--r--src/server/QXmppServer.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index b487a777..27e109fe 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -190,14 +190,14 @@ void QXmppIncomingClient::handleStream(const QDomElement &streamElement)
}
// start stream
- const QByteArray sessionId = QXmppUtils::generateStanzaHash().toAscii();
+ const QByteArray sessionId = QXmppUtils::generateStanzaHash().toLatin1();
QString response = QString("<?xml version='1.0'?><stream:stream"
" xmlns=\"%1\" xmlns:stream=\"%2\""
" id=\"%3\" from=\"%4\" version=\"1.0\" xml:lang=\"en\">").arg(
ns_client,
ns_stream,
sessionId,
- d->domain.toAscii());
+ d->domain.toLatin1());
sendData(response.toUtf8());
// check requested domain
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index 78ba5969..dec1e515 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -111,7 +111,7 @@ void QXmppIncomingServer::handleStream(const QDomElement &streamElement)
info(QString("Incoming server stream from %1 on %2").arg(from, d->origin()));
// start stream
- d->localStreamId = QXmppUtils::generateStanzaHash().toAscii();
+ d->localStreamId = QXmppUtils::generateStanzaHash().toLatin1();
QString data = QString("<?xml version='1.0'?><stream:stream"
" xmlns='%1' xmlns:db='%2' xmlns:stream='%3'"
" id='%4' version=\"1.0\">").arg(
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index aceffe28..0d10b395 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -167,7 +167,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(QXmppUtils::generateStanzaHash().toAscii());
+ conn->setLocalStreamKey(QXmppUtils::generateStanzaHash().toLatin1());
conn->moveToThread(q->thread());
conn->setParent(q);