From bf537e01032f2f0bb013fb45e4a9c13113f77a6f Mon Sep 17 00:00:00 2001 From: Matt Broadstone Date: Thu, 15 Nov 2012 18:58:52 -0500 Subject: move from toAscii() to toLatin1() --- src/server/QXmppIncomingClient.cpp | 4 ++-- src/server/QXmppIncomingServer.cpp | 2 +- src/server/QXmppServer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server') 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("").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("").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); -- cgit v1.2.3