diff options
| author | Matt Broadstone <mbroadst@gmail.com> | 2012-11-15 18:58:52 -0500 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-11-16 07:31:16 +0100 |
| commit | bf537e01032f2f0bb013fb45e4a9c13113f77a6f (patch) | |
| tree | 204a8d6fa700e3ebcb44cf65712cf63764202d9f /src | |
| parent | 1ba3b087975e523bb05b0703a5b0fa8392b7429b (diff) | |
| download | qxmpp-bf537e01032f2f0bb013fb45e4a9c13113f77a6f.tar.gz | |
move from toAscii() to toLatin1()
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/QXmppCodec.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppNonSASLAuth.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppPresence.cpp | 4 | ||||
| -rw-r--r-- | src/base/QXmppSasl.cpp | 6 | ||||
| -rw-r--r-- | src/base/QXmppSocks.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppVCardIq.cpp | 2 | ||||
| -rw-r--r-- | src/client/QXmppTransferManager.cpp | 4 | ||||
| -rw-r--r-- | src/server/QXmppIncomingClient.cpp | 4 | ||||
| -rw-r--r-- | src/server/QXmppIncomingServer.cpp | 2 | ||||
| -rw-r--r-- | src/server/QXmppServer.cpp | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp index e54f4f9f..43cb9a97 100644 --- a/src/base/QXmppCodec.cpp +++ b/src/base/QXmppCodec.cpp @@ -588,7 +588,7 @@ QList<QXmppVideoFrame> QXmppTheoraDecoder::handlePacket(const QXmppRtpPacket &pa bool QXmppTheoraDecoder::setParameters(const QMap<QString, QString> ¶meters) { - QByteArray config = QByteArray::fromBase64(parameters.value("configuration").toAscii()); + QByteArray config = QByteArray::fromBase64(parameters.value("configuration").toLatin1()); QDataStream stream(config); const QIODevice *device = stream.device(); diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp index 66e97af2..671f0a82 100644 --- a/src/base/QXmppNonSASLAuth.cpp +++ b/src/base/QXmppNonSASLAuth.cpp @@ -86,7 +86,7 @@ void QXmppNonSASLAuthIq::parseElementFromChild(const QDomElement &element) QDomElement queryElement = element.firstChildElement("query"); m_username = queryElement.firstChildElement("username").text(); m_password = queryElement.firstChildElement("password").text(); - m_digest = QByteArray::fromHex(queryElement.firstChildElement("digest").text().toAscii()); + m_digest = QByteArray::fromHex(queryElement.firstChildElement("digest").text().toLatin1()); m_resource = queryElement.firstChildElement("resource").text(); } diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp index a720a0e4..5934c491 100644 --- a/src/base/QXmppPresence.cpp +++ b/src/base/QXmppPresence.cpp @@ -222,7 +222,7 @@ void QXmppPresence::parse(const QDomElement &element) QDomElement photoElement = xElement.firstChildElement("photo"); if(!photoElement.isNull()) { - d->photoHash = QByteArray::fromHex(photoElement.text().toAscii()); + d->photoHash = QByteArray::fromHex(photoElement.text().toLatin1()); if(d->photoHash.isEmpty()) d->vCardUpdateType = VCardUpdateNoPhoto; else @@ -238,7 +238,7 @@ void QXmppPresence::parse(const QDomElement &element) else if(xElement.tagName() == "c" && xElement.namespaceURI() == ns_capabilities) { d->capabilityNode = xElement.attribute("node"); - d->capabilityVer = QByteArray::fromBase64(xElement.attribute("ver").toAscii()); + d->capabilityVer = QByteArray::fromBase64(xElement.attribute("ver").toLatin1()); d->capabilityHash = xElement.attribute("hash"); d->capabilityExt = xElement.attribute("ext").split(" ", QString::SkipEmptyParts); } diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp index bf50eaa6..8b3c734c 100644 --- a/src/base/QXmppSasl.cpp +++ b/src/base/QXmppSasl.cpp @@ -90,7 +90,7 @@ void QXmppSaslAuth::setValue(const QByteArray &value) void QXmppSaslAuth::parse(const QDomElement &element) { m_mechanism = element.attribute("mechanism"); - m_value = QByteArray::fromBase64(element.text().toAscii()); + m_value = QByteArray::fromBase64(element.text().toLatin1()); } void QXmppSaslAuth::toXml(QXmlStreamWriter *writer) const @@ -120,7 +120,7 @@ void QXmppSaslChallenge::setValue(const QByteArray &value) void QXmppSaslChallenge::parse(const QDomElement &element) { - m_value = QByteArray::fromBase64(element.text().toAscii()); + m_value = QByteArray::fromBase64(element.text().toLatin1()); } void QXmppSaslChallenge::toXml(QXmlStreamWriter *writer) const @@ -178,7 +178,7 @@ void QXmppSaslResponse::setValue(const QByteArray &value) void QXmppSaslResponse::parse(const QDomElement &element) { - m_value = QByteArray::fromBase64(element.text().toAscii()); + m_value = QByteArray::fromBase64(element.text().toLatin1()); } void QXmppSaslResponse::toXml(QXmlStreamWriter *writer) const diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp index 72a6e97b..1815e19c 100644 --- a/src/base/QXmppSocks.cpp +++ b/src/base/QXmppSocks.cpp @@ -157,7 +157,7 @@ void QXmppSocksClient::slotReadyRead() buffer[2] = 0x00; // reserved buffer.append(encodeHostAndPort( DomainName, - m_hostName.toAscii(), + m_hostName.toLatin1(), m_hostPort)); write(buffer); diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp index a21e887e..11e34e2c 100644 --- a/src/base/QXmppVCardIq.cpp +++ b/src/base/QXmppVCardIq.cpp @@ -753,7 +753,7 @@ void QXmppVCardIq::parseElementFromChild(const QDomElement& nodeRecv) d->url = cardElement.firstChildElement("URL").text(); QDomElement photoElement = cardElement.firstChildElement("PHOTO"); QByteArray base64data = photoElement. - firstChildElement("BINVAL").text().toAscii(); + firstChildElement("BINVAL").text().toLatin1(); d->photo = QByteArray::fromBase64(base64data); d->photoType = photoElement.firstChildElement("TYPE").text(); diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp index 1fc6d7b2..e27dafde 100644 --- a/src/client/QXmppTransferManager.cpp +++ b/src/client/QXmppTransferManager.cpp @@ -50,7 +50,7 @@ static QString streamHash(const QString &sid, const QString &initiatorJid, const { QCryptographicHash hash(QCryptographicHash::Sha1); QString str = sid + initiatorJid + targetJid; - hash.addData(str.toAscii()); + hash.addData(str.toLatin1()); return hash.result().toHex(); } @@ -160,7 +160,7 @@ bool QXmppTransferFileInfo::operator==(const QXmppTransferFileInfo &other) const void QXmppTransferFileInfo::parse(const QDomElement &element) { d->date = QXmppUtils::datetimeFromString(element.attribute("date")); - d->hash = QByteArray::fromHex(element.attribute("hash").toAscii()); + d->hash = QByteArray::fromHex(element.attribute("hash").toLatin1()); d->name = element.attribute("name"); d->size = element.attribute("size").toLongLong(); d->description = element.firstChildElement("desc").text(); 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); |
