summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-05-07 19:48:52 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-23 15:54:02 +0200
commitd16b02bd17f82435a31834fa28e2418988164fc5 (patch)
tree6abcda494cf09ec61fe85eac68b9b8051725b53b /src/network
parent8633f7ac0d137cc8139e084d9caae64ab90be03c (diff)
QtNetwork: declare some classes as shared
Change-Id: Ib3eaba59836529ad0cf8e4353b54dd0cd31fd1ad Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qabstractnetworkcache.h2
-rw-r--r--src/network/access/qhttpmultipart.h2
-rw-r--r--src/network/access/qnetworkcookie.h3
-rw-r--r--src/network/access/qnetworkrequest.h2
-rw-r--r--src/network/bearer/qnetworkconfiguration.h2
-rw-r--r--src/network/kernel/qdnslookup.h10
-rw-r--r--src/network/kernel/qnetworkinterface.h4
-rw-r--r--src/network/kernel/qnetworkproxy.h5
-rw-r--r--src/network/ssl/qsslcertificate.h1
-rw-r--r--src/network/ssl/qsslcertificateextension.h2
-rw-r--r--src/network/ssl/qsslcipher.h2
-rw-r--r--src/network/ssl/qsslconfiguration.h2
-rw-r--r--src/network/ssl/qsslerror.h1
-rw-r--r--src/network/ssl/qsslkey.h2
14 files changed, 38 insertions, 2 deletions
diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index a27d0fb4f0..adaa52ad55 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -104,6 +104,8 @@ private:
QSharedDataPointer<QNetworkCacheMetaDataPrivate> d;
};
+Q_DECLARE_SHARED(QNetworkCacheMetaData)
+
Q_NETWORK_EXPORT QDataStream &operator<<(QDataStream &, const QNetworkCacheMetaData &);
Q_NETWORK_EXPORT QDataStream &operator>>(QDataStream &, QNetworkCacheMetaData &);
diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h
index 993cb9a987..865c640328 100644
--- a/src/network/access/qhttpmultipart.h
+++ b/src/network/access/qhttpmultipart.h
@@ -81,6 +81,8 @@ private:
friend class QHttpMultiPartIODevice;
};
+Q_DECLARE_SHARED(QHttpPart)
+
class QHttpMultiPartPrivate;
class Q_NETWORK_EXPORT QHttpMultiPart : public QObject
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 6be6ca6262..ca759be4a1 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -109,7 +109,8 @@ private:
QSharedDataPointer<QNetworkCookiePrivate> d;
friend class QNetworkCookiePrivate;
};
-Q_DECLARE_TYPEINFO(QNetworkCookie, Q_MOVABLE_TYPE);
+
+Q_DECLARE_SHARED(QNetworkCookie)
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 6aa365dc08..ffbf46ac5d 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -153,6 +153,8 @@ private:
friend class QNetworkRequestPrivate;
};
+Q_DECLARE_SHARED(QNetworkRequest)
+
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QNetworkRequest)
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 207b50379b..983e38cdce 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -124,6 +124,8 @@ private:
QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d;
};
+Q_DECLARE_SHARED(QNetworkConfiguration)
+
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QNetworkConfiguration)
diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h
index f9f7261cbe..ce4169b66b 100644
--- a/src/network/kernel/qdnslookup.h
+++ b/src/network/kernel/qdnslookup.h
@@ -82,6 +82,8 @@ private:
friend class QDnsLookupRunnable;
};
+Q_DECLARE_SHARED(QDnsDomainNameRecord)
+
class Q_NETWORK_EXPORT QDnsHostAddressRecord
{
public:
@@ -102,6 +104,8 @@ private:
friend class QDnsLookupRunnable;
};
+Q_DECLARE_SHARED(QDnsHostAddressRecord)
+
class Q_NETWORK_EXPORT QDnsMailExchangeRecord
{
public:
@@ -123,6 +127,8 @@ private:
friend class QDnsLookupRunnable;
};
+Q_DECLARE_SHARED(QDnsMailExchangeRecord)
+
class Q_NETWORK_EXPORT QDnsServiceRecord
{
public:
@@ -146,6 +152,8 @@ private:
friend class QDnsLookupRunnable;
};
+Q_DECLARE_SHARED(QDnsServiceRecord)
+
class Q_NETWORK_EXPORT QDnsTextRecord
{
public:
@@ -166,6 +174,8 @@ private:
friend class QDnsLookupRunnable;
};
+Q_DECLARE_SHARED(QDnsTextRecord)
+
class Q_NETWORK_EXPORT QDnsLookup : public QObject
{
Q_OBJECT
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index 6ce5a9126a..445c5e5281 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -85,6 +85,8 @@ private:
QScopedPointer<QNetworkAddressEntryPrivate> d;
};
+Q_DECLARE_SHARED(QNetworkAddressEntry)
+
class QNetworkInterfacePrivate;
class Q_NETWORK_EXPORT QNetworkInterface
{
@@ -125,6 +127,8 @@ private:
QSharedDataPointer<QNetworkInterfacePrivate> d;
};
+Q_DECLARE_SHARED(QNetworkInterface)
+
Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkInterface::InterfaceFlags)
#ifndef QT_NO_DEBUG_STREAM
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 2954ad3d71..c27c5fe318 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -119,7 +119,8 @@ public:
private:
QSharedDataPointer<QNetworkProxyQueryPrivate> d;
};
-Q_DECLARE_TYPEINFO(QNetworkProxyQuery, Q_MOVABLE_TYPE);
+
+Q_DECLARE_SHARED(QNetworkProxyQuery)
class QNetworkProxyPrivate;
@@ -193,6 +194,8 @@ public:
private:
QSharedDataPointer<QNetworkProxyPrivate> d;
};
+
+Q_DECLARE_SHARED(QNetworkProxy)
Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkProxy::Capabilities)
class Q_NETWORK_EXPORT QNetworkProxyFactory
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 4b8a211aa8..040dad3fcb 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -146,6 +146,7 @@ private:
friend class QSslCertificatePrivate;
friend class QSslSocketBackendPrivate;
};
+Q_DECLARE_SHARED(QSslCertificate)
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h
index 3ba90cefe3..1516b0ca47 100644
--- a/src/network/ssl/qsslcertificateextension.h
+++ b/src/network/ssl/qsslcertificateextension.h
@@ -79,6 +79,8 @@ private:
QSharedDataPointer<QSslCertificateExtensionPrivate> d;
};
+Q_DECLARE_SHARED(QSslCertificateExtension)
+
#endif // QT_NO_SSL
QT_END_NAMESPACE
diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h
index 48b9d13615..91fa848663 100644
--- a/src/network/ssl/qsslcipher.h
+++ b/src/network/ssl/qsslcipher.h
@@ -86,6 +86,8 @@ private:
friend class QSslSocketBackendPrivate;
};
+Q_DECLARE_SHARED(QSslCipher)
+
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslCipher &cipher);
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index ebfd57ff23..bb553ff53b 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -133,6 +133,8 @@ private:
QSharedDataPointer<QSslConfigurationPrivate> d;
};
+Q_DECLARE_SHARED(QSslConfiguration)
+
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QSslConfiguration)
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index fe9a8ece5e..99c7f4cedd 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -110,6 +110,7 @@ public:
private:
QScopedPointer<QSslErrorPrivate> d;
};
+Q_DECLARE_SHARED(QSslError)
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h
index 3a1a8cd696..aecd2c4278 100644
--- a/src/network/ssl/qsslkey.h
+++ b/src/network/ssl/qsslkey.h
@@ -99,6 +99,8 @@ private:
friend class QSslCertificate;
};
+Q_DECLARE_SHARED(QSslKey)
+
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslKey &key);