From 911fd9491396c837d0a21451aede2adb3e707209 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 19 Jan 2012 08:33:55 +0100 Subject: Fix compiler warnings in Qt Network. - Missing return value - Wrong format for qint64 Change-Id: Id0de58c85b7c8ed2a62f7237fd23e6c5a5ac92ec Reviewed-by: Peter Hartmann --- src/network/access/qnetworkreplyhttpimpl.cpp | 2 +- src/network/bearer/qnetworkconfiguration.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 2c1ad95ea8..a6eae79a58 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1964,7 +1964,7 @@ void QNetworkReplyHttpImplPrivate::setCachingEnabled(bool enable) if (enable) { if (bytesDownloaded) { - qDebug("setCachingEnabled: %d bytesDownloaded", bytesDownloaded); + qDebug("setCachingEnabled: %lld bytesDownloaded", bytesDownloaded); // refuse to enable in this case qCritical("QNetworkReplyImpl: backend error: caching was enabled after some bytes had been written"); return; diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index a2ed38bb35..e78b8bb430 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -475,8 +475,6 @@ QString QNetworkConfiguration::bearerTypeName() const return QString(); switch (d->bearerType) { - case BearerUnknown: - return QStringLiteral("Unknown"); case BearerEthernet: return QStringLiteral("Ethernet"); case BearerWLAN: @@ -493,7 +491,10 @@ QString QNetworkConfiguration::bearerTypeName() const return QStringLiteral("Bluetooth"); case BearerWiMAX: return QStringLiteral("WiMAX"); + case BearerUnknown: + break; } + return QStringLiteral("Unknown"); } QT_END_NAMESPACE -- cgit v1.2.3