Network: cleanliness
QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_URL_CAST_FROM_STRING Change-Id: Ic77ed8ccbdb146b7e7b26123923795f9748d3a38 Reviewed-by: Mate Barany <mate.barany@qt.io>bb10
parent
953f701799
commit
4853a52943
|
|
@ -59,6 +59,9 @@ qt_internal_add_module(Network
|
|||
QT_NO_FOREACH
|
||||
QT_NO_USING_NAMESPACE
|
||||
QT_NO_CAST_FROM_ASCII
|
||||
QT_NO_CAST_TO_ASCII
|
||||
QT_NO_CAST_FROM_BYTEARRAY
|
||||
QT_NO_URL_CAST_FROM_STRING
|
||||
INCLUDE_DIRECTORIES
|
||||
kernel
|
||||
LIBRARIES
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ void QNetworkReplyWasmImplPrivate::doSendRequest()
|
|||
QByteArray destinationPath = dPath.toUtf8();
|
||||
attr.destinationPath = destinationPath.constData();
|
||||
|
||||
m_fetch = emscripten_fetch(&attr, request.url().toString().toUtf8());
|
||||
m_fetch = emscripten_fetch(&attr, request.url().toString().toUtf8().constData());
|
||||
state = Working;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ QString QRestReply::readText()
|
|||
|
||||
if (!d->decoder) {
|
||||
const QByteArray charset = QRestReplyPrivate::contentCharset(wrapped);
|
||||
d->decoder = QStringDecoder(charset);
|
||||
d->decoder = QStringDecoder(charset.constData());
|
||||
if (!d->decoder->isValid()) { // the decoder may not support the mimetype's charset
|
||||
qCWarning(lcQrest, "readText(): Charset \"%s\" is not supported", charset.constData());
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ void QDnsLookupRunnable::query(QDnsLookupReply *reply)
|
|||
|
||||
// Prepare the DNS query.
|
||||
QueryBuffer qbuffer;
|
||||
int queryLength = prepareQueryBuffer(&state, qbuffer, requestName, ns_rcode(requestType));
|
||||
int queryLength = prepareQueryBuffer(&state, qbuffer, requestName.constData(), ns_rcode(requestType));
|
||||
if (Q_UNLIKELY(queryLength < 0))
|
||||
return reply->makeResolverSystemError();
|
||||
|
||||
|
|
|
|||
|
|
@ -69,16 +69,16 @@ static auto &ifreq_index(Req &req, std::enable_if_t<sizeof(std::declval<Req>().i
|
|||
uint QNetworkInterfaceManager::interfaceIndexFromName(const QString &name)
|
||||
{
|
||||
#if QT_CONFIG(ipv6ifname)
|
||||
return ::if_nametoindex(name.toLatin1());
|
||||
return ::if_nametoindex(name.toLatin1().constData());
|
||||
#elif defined(SIOCGIFINDEX)
|
||||
struct ifreq req;
|
||||
int socket = qt_safe_socket(AF_INET, SOCK_STREAM, 0);
|
||||
if (socket < 0)
|
||||
return 0;
|
||||
|
||||
QByteArray name8bit = name.toLatin1();
|
||||
const QByteArray name8bit = name.toLatin1();
|
||||
memset(&req, 0, sizeof(ifreq));
|
||||
memcpy(req.ifr_name, name8bit, qMin<int>(name8bit.length() + 1, sizeof(req.ifr_name) - 1));
|
||||
memcpy(req.ifr_name, name8bit.data(), qMin<int>(name8bit.length() + 1, sizeof(req.ifr_name) - 1));
|
||||
|
||||
uint id = 0;
|
||||
if (qt_safe_ioctl(socket, SIOCGIFINDEX, &req) >= 0)
|
||||
|
|
@ -235,7 +235,7 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
|
|||
for ( ; it != names.constEnd(); ++it) {
|
||||
ifreq req;
|
||||
memset(&req, 0, sizeof(ifreq));
|
||||
memcpy(req.ifr_name, *it, qMin<int>(it->length() + 1, sizeof(req.ifr_name) - 1));
|
||||
memcpy(req.ifr_name, it->constData(), qMin<int>(it->length() + 1, sizeof(req.ifr_name) - 1));
|
||||
|
||||
QNetworkInterfacePrivate *iface = findInterface(socket, interfaces, req);
|
||||
|
||||
|
|
@ -246,7 +246,7 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
|
|||
iface->name = QString::fromLatin1(req.ifr_name);
|
||||
|
||||
// reset the name:
|
||||
memcpy(req.ifr_name, oldName, qMin<int>(oldName.length() + 1, sizeof(req.ifr_name) - 1));
|
||||
memcpy(req.ifr_name, oldName.constData(), qMin<int>(oldName.length() + 1, sizeof(req.ifr_name) - 1));
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ qint64 QUdpSocket::writeDatagram(const QNetworkDatagram &datagram)
|
|||
if (state() == UnconnectedState)
|
||||
bind();
|
||||
|
||||
qint64 sent = d->socketEngine->writeDatagram(datagram.d->data,
|
||||
qint64 sent = d->socketEngine->writeDatagram(datagram.d->data.constData(),
|
||||
datagram.d->data.size(),
|
||||
datagram.d->header);
|
||||
d->cachedSocketDescriptor = d->socketEngine->socketDescriptor();
|
||||
|
|
|
|||
Loading…
Reference in New Issue