diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-05-22 13:20:10 +0200 |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-05-22 14:40:07 +0200 |
| commit | 8b2a16bd7f434a159e34e93dbffc983927a0a143 (patch) | |
| tree | 366d7fe340ceaa512b292f25a23d4496ac903d8f /src/network | |
| parent | a0396c8c68aca446e68434e516bd46d749093b0f (diff) | |
Fixed compilation with -qtnamespace
Task-number: 254333
Reviewed-by: Andy Shaw <qt-info@nokia.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttp.cpp | 4 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 4 | ||||
| -rw-r--r-- | src/network/kernel/qurlinfo.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 7d14ab6fbf..30befb3cc9 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -64,10 +64,10 @@ # include "qtimer.h" #endif -QT_BEGIN_NAMESPACE - #ifndef QT_NO_HTTP +QT_BEGIN_NAMESPACE + class QHttpNormalRequest; class QHttpRequest { diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 62bdfc71e4..fd3a85aa31 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1258,6 +1258,6 @@ QList<QNetworkProxy> QNetworkProxyFactory::proxyForQuery(const QNetworkProxyQuer return globalNetworkProxy()->proxyForQuery(query); } -#endif // QT_NO_NETWORKPROXY - QT_END_NAMESPACE + +#endif // QT_NO_NETWORKPROXY diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp index 255c9eaf18..d90c4803ae 100644 --- a/src/network/kernel/qurlinfo.cpp +++ b/src/network/kernel/qurlinfo.cpp @@ -726,6 +726,6 @@ bool QUrlInfo::isValid() const return d != 0; } -#endif // QT_NO_URLINFO - QT_END_NAMESPACE + +#endif // QT_NO_URLINFO diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 540c443e2f..5a2a74625b 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -768,6 +768,6 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(int, QObject return 0; } -#endif - QT_END_NAMESPACE + +#endif |