From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Mon, 9 Jan 2012 08:53:17 +0100
Subject: Remove use of QT_MODULE from library

These defines were there to aid in the commercial
licensing scheme we used long ago, and are no longer needed.

Keep a QT_MODULE(x) define so other modules continue compiling.

Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/network/access/qabstractnetworkcache.h | 1 -
 src/network/access/qftp_p.h                | 1 -
 src/network/access/qhttpmultipart.h        | 1 -
 src/network/access/qnetworkaccessmanager.h | 1 -
 src/network/access/qnetworkcookie.h        | 1 -
 src/network/access/qnetworkcookiejar.h     | 1 -
 src/network/access/qnetworkdiskcache.h     | 1 -
 src/network/access/qnetworkreply.h         | 1 -
 src/network/access/qnetworkrequest.h       | 1 -
 src/network/bearer/qbearerplugin_p.h       | 1 -
 src/network/bearer/qnetworkconfigmanager.h | 1 -
 src/network/bearer/qnetworkconfiguration.h | 1 -
 src/network/bearer/qnetworksession.h       | 1 -
 src/network/kernel/qauthenticator.h        | 1 -
 src/network/kernel/qhostaddress.h          | 1 -
 src/network/kernel/qhostinfo.h             | 1 -
 src/network/kernel/qnetworkinterface.h     | 1 -
 src/network/kernel/qnetworkproxy.h         | 1 -
 src/network/kernel/qurlinfo.h              | 1 -
 src/network/socket/qabstractsocket.h       | 1 -
 src/network/socket/qlocalserver.h          | 1 -
 src/network/socket/qlocalsocket.h          | 1 -
 src/network/socket/qtcpserver.h            | 1 -
 src/network/socket/qtcpsocket.h            | 1 -
 src/network/socket/qudpsocket.h            | 1 -
 src/network/ssl/qssl.h                     | 1 -
 src/network/ssl/qsslcertificate.h          | 1 -
 src/network/ssl/qsslcertificateextension.h | 1 -
 src/network/ssl/qsslcipher.h               | 1 -
 src/network/ssl/qsslconfiguration.h        | 1 -
 src/network/ssl/qsslerror.h                | 1 -
 src/network/ssl/qsslkey.h                  | 1 -
 src/network/ssl/qsslsocket.h               | 1 -
 33 files changed, 33 deletions(-)

(limited to 'src/network')

diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index 569c58e6cb..2fb8458b69 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QIODevice;
 class QDateTime;
diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h
index 2ec78667a2..becf936983 100644
--- a/src/network/access/qftp_p.h
+++ b/src/network/access/qftp_p.h
@@ -61,7 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_FTP
 
diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h
index 2148ab0b73..fcc5535059 100644
--- a/src/network/access/qhttpmultipart.h
+++ b/src/network/access/qhttpmultipart.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QHttpPartPrivate;
 class QHttpMultiPart;
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index daf957d25d..c0bd21a5d1 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QIODevice;
 class QAbstractNetworkCache;
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index cc222e3797..ff68797702 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QByteArray;
 class QDateTime;
diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h
index c9be31aad5..5f30f62179 100644
--- a/src/network/access/qnetworkcookiejar.h
+++ b/src/network/access/qnetworkcookiejar.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QNetworkCookie;
 
diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h
index 45c8a8fba5..4cb0b9955c 100644
--- a/src/network/access/qnetworkdiskcache.h
+++ b/src/network/access/qnetworkdiskcache.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_NETWORKDISKCACHE
 
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 19ec2ff013..2257849785 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QUrl;
 class QVariant;
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 78c24c08ed..e75f95f85b 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QSslConfiguration;
 
diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h
index b6bcf2b07e..d595fa1d88 100644
--- a/src/network/bearer/qbearerplugin_p.h
+++ b/src/network/bearer/qbearerplugin_p.h
@@ -64,7 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 struct Q_NETWORK_EXPORT QBearerEngineFactoryInterface : public QFactoryInterface
 {
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 5a7f216319..2d34b85eb5 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -50,7 +50,6 @@
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
-QT_MODULE(Network)
 
 class QNetworkConfigurationManagerPrivate;
 class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index e5087c093a..72063cbd39 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -51,7 +51,6 @@
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
-QT_MODULE(Network)
 
 class QNetworkConfigurationPrivate;
 class Q_NETWORK_EXPORT QNetworkConfiguration
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index c95464f558..ab4e8d3263 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -58,7 +58,6 @@ QT_BEGIN_HEADER
 
 #include <QtCore/qshareddata.h>
 QT_BEGIN_NAMESPACE
-QT_MODULE(Network)
 
 class QNetworkSessionPrivate;
 class Q_NETWORK_EXPORT QNetworkSession : public QObject
diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h
index 3c3b4b6e93..16e885ec42 100644
--- a/src/network/kernel/qauthenticator.h
+++ b/src/network/kernel/qauthenticator.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QAuthenticatorPrivate;
 class QUrl;
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index 212bf25de4..61a268eac9 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QHostAddressPrivate;
 
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h
index da8309285f..40cfca87cc 100644
--- a/src/network/kernel/qhostinfo.h
+++ b/src/network/kernel/qhostinfo.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QObject;
 class QHostInfoPrivate;
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index d810fc8794..95bd17580c 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 template<typename T> class QList;
 
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 23818fd90a..737dd46754 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QUrl;
 class QNetworkConfiguration;
diff --git a/src/network/kernel/qurlinfo.h b/src/network/kernel/qurlinfo.h
index d165624bc6..6dae02d71d 100644
--- a/src/network/kernel/qurlinfo.h
+++ b/src/network/kernel/qurlinfo.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_URLINFO
 
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 6d415d1997..6b85bd9c8c 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QHostAddress;
 #ifndef QT_NO_NETWORKPROXY
diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h
index 3fc5a7cc55..aa19e2c517 100644
--- a/src/network/socket/qlocalserver.h
+++ b/src/network/socket/qlocalserver.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_LOCALSERVER
 
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h
index 4a1624e96c..094cd0ee5d 100644
--- a/src/network/socket/qlocalsocket.h
+++ b/src/network/socket/qlocalsocket.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_LOCALSOCKET
 
diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h
index 9f55f050db..054633dffd 100644
--- a/src/network/socket/qtcpserver.h
+++ b/src/network/socket/qtcpserver.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QTcpServerPrivate;
 #ifndef QT_NO_NETWORKPROXY
diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h
index e8f922deb6..6a7d4d58ca 100644
--- a/src/network/socket/qtcpsocket.h
+++ b/src/network/socket/qtcpsocket.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 class QTcpSocketPrivate;
 
diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h
index d080ceaea8..6f3292c6b2 100644
--- a/src/network/socket/qudpsocket.h
+++ b/src/network/socket/qudpsocket.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_UDPSOCKET
 
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index d5fb018e70..e042b5f86d 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 namespace QSsl {
     enum KeyType {
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 660d929f1a..400bc10ed3 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h
index 3001a865e2..dd731bf0ac 100644
--- a/src/network/ssl/qsslcertificateextension.h
+++ b/src/network/ssl/qsslcertificateextension.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h
index 45ecc5468e..9b05796e20 100644
--- a/src/network/ssl/qsslcipher.h
+++ b/src/network/ssl/qsslcipher.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 8183e23ea7..e29c6b71f2 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index 11775e76f2..9427132696 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index e1cfdd3604..9dcf613054 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 8e3b84e1eb..cdd1e10217 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Network)
 
 #ifndef QT_NO_SSL
 
-- 
cgit v1.2.3