diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-07 00:55:31 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-07 00:55:31 (GMT) |
| commit | 723eea029f98b802563c0bc06ba82ff741e1ac73 (patch) | |
| tree | 230f2dc688e5769aa342e23b69fe958bbc032713 | |
| parent | 3b68e5157e103dec536d5aaff508c1751f20c62e (diff) | |
| download | Qt-723eea029f98b802563c0bc06ba82ff741e1ac73.zip Qt-723eea029f98b802563c0bc06ba82ff741e1ac73.tar.gz Qt-723eea029f98b802563c0bc06ba82ff741e1ac73.tar.bz2 | |
Move QT_BEGIN_NAMESPACE to after the usual Qt header includes
QT_BEGIN_NAMESPACE is not defined until qglobal.h is included,
but some of the QtNetwork headers were listing it before.
Reviewed-by: Ian Walters
| -rw-r--r-- | src/network/access/qhttpnetworkheader_p.h | 4 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 6 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkrequest_p.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/network/access/qhttpnetworkheader_p.h b/src/network/access/qhttpnetworkheader_p.h index 306ae85..3052309 100644 --- a/src/network/access/qhttpnetworkheader_p.h +++ b/src/network/access/qhttpnetworkheader_p.h @@ -54,11 +54,11 @@ // #ifndef QT_NO_HTTP -QT_BEGIN_NAMESPACE - #include <qshareddata.h> #include <qurl.h> +QT_BEGIN_NAMESPACE + class Q_AUTOTEST_EXPORT QHttpNetworkHeader { public: diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 9881bb3..21f4116 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -54,8 +54,6 @@ // #ifndef QT_NO_HTTP -QT_BEGIN_NAMESPACE - #ifndef QT_NO_COMPRESS # include <zlib.h> static const unsigned char gz_magic[2] = {0x1f, 0x8b}; // gzip magic header @@ -84,6 +82,8 @@ static const unsigned char gz_magic[2] = {0x1f, 0x8b}; // gzip magic header #include <private/qhttpnetworkrequest_p.h> #include <private/qauthenticator_p.h> +QT_BEGIN_NAMESPACE + class QHttpNetworkConnection; class QHttpNetworkRequest; class QHttpNetworkConnectionPrivate; @@ -223,4 +223,4 @@ QT_END_NAMESPACE #endif // QT_NO_HTTP -#endif // QHTTPNETWORKREPLY_H
\ No newline at end of file +#endif // QHTTPNETWORKREPLY_H diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index 4e64ca6..d18e116 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -54,10 +54,10 @@ // #ifndef QT_NO_HTTP -QT_BEGIN_NAMESPACE - #include <private/qhttpnetworkheader_p.h> +QT_BEGIN_NAMESPACE + class QHttpNetworkRequestPrivate; class Q_AUTOTEST_EXPORT QHttpNetworkRequest: public QHttpNetworkHeader { @@ -141,4 +141,4 @@ QT_END_NAMESPACE #endif // QT_NO_HTTP -#endif // QHTTPNETWORKREQUEST_H
\ No newline at end of file +#endif // QHTTPNETWORKREQUEST_H |