diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-19 08:33:55 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 11:31:22 +0100 |
commit | 911fd9491396c837d0a21451aede2adb3e707209 (patch) | |
tree | e8b6b77db4406ab629f4b315bb2a3b9c10a85a2d /src | |
parent | 9d0a41b1ca32e0128a48c25e947d4e52fc4b4d3e (diff) |
Fix compiler warnings in Qt Network.
- Missing return value
- Wrong format for qint64
Change-Id: Id0de58c85b7c8ed2a62f7237fd23e6c5a5ac92ec
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 2 | ||||
-rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
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 |