diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 15:18:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:17:51 +0200 |
| commit | 36850d5cecd37d00d296428739a9e01f00228421 (patch) | |
| tree | 17ffebf94f98911bee55984a99326903306baf1d /src/network | |
| parent | e918598e2d525af1709045ff172e01075bbec662 (diff) | |
Fix compiler warnings.
Change-Id: I6b6d86097074a12c9c4e3d22fe61a6b962ffa21e
Reviewed-on: http://codereview.qt-project.org/5627
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 9 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 2 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index c368785226..8f8367a97c 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -84,9 +84,9 @@ const int QHttpNetworkConnectionPrivate::defaultRePipelineLength = 2; QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt) : state(RunningState), + networkLayerState(Unknown), hostName(hostName), port(port), encrypt(encrypt), - channelCount(defaultChannelCount), - networkLayerState(Unknown) + channelCount(defaultChannelCount) #ifndef QT_NO_NETWORKPROXY , networkProxy(QNetworkProxy::NoProxy) #endif @@ -95,10 +95,9 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host } QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt) -: state(RunningState), +: state(RunningState), networkLayerState(Unknown), hostName(hostName), port(port), encrypt(encrypt), - channelCount(channelCount), - networkLayerState(Unknown) + channelCount(channelCount) #ifndef QT_NO_NETWORKPROXY , networkProxy(QNetworkProxy::NoProxy) #endif diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 0652436b35..70b9cf3754 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -151,7 +151,7 @@ public: enum ConnectionState { RunningState = 0, - PausedState = 1, + PausedState = 1 }; enum NetworkLayerPreferenceState { diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index b1630c7b2b..f2450f5662 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -79,8 +79,8 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel() , ignoreAllSslErrors(false) #endif , pipeliningSupported(PipeliningSupportUnknown) - , connection(0) , networkLayerPreference(QAbstractSocket::AnyIPProtocol) + , connection(0) { // Inlining this function in the header leads to compiler error on // release-armv5, on at least timebox 9.2 and 10.1. diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 3b777f9a68..d66d471206 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -1138,6 +1138,7 @@ QDataStream &operator<<(QDataStream &out, const QHostAddress &address) out << prot; switch (address.protocol()) { case QAbstractSocket::UnknownNetworkLayerProtocol: + case QAbstractSocket::AnyIPProtocol: break; case QAbstractSocket::IPv4Protocol: out << address.toIPv4Address(); |