From 20e6a049fee48e876c8c6903101b58f918b5aab2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 1 Apr 2022 09:39:11 +0200 Subject: [PATCH] =?UTF-8?q?QtNetwork:=20sweep=20Q=5FDECLARE=5FMETATYPE=20?= =?UTF-8?q?=E2=86=92=20QT=5FDECL=5FMETATYPE=5FEXTERN=20[2/2]:=20private=20?= =?UTF-8?q?API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's one of our best tools to improve compile times. Can't backport to Qt 6.2 because the macros don't exist there. Pick-to: 6.3 Task-number: QTBUG-102206 Change-Id: Ic8f3870d8eec6211c4be506dc67717cc4e0ff7d6 Reviewed-by: Mårten Nordheim Reviewed-by: Timur Pocheptsov Reviewed-by: Qt CI Bot --- src/network/access/http2/http2protocol.cpp | 2 ++ src/network/access/http2/http2protocol_p.h | 2 +- src/network/access/qhttpnetworkrequest.cpp | 2 ++ src/network/access/qhttpnetworkrequest_p.h | 2 +- src/network/access/qnetworkaccesscache.cpp | 3 +++ src/network/access/qnetworkaccesscache_p.h | 3 ++- src/network/access/qnetworkreplyfileimpl.cpp | 2 ++ src/network/access/qnetworkreplyfileimpl_p.h | 4 +++- src/network/access/qnetworkreplyimpl.cpp | 2 ++ src/network/access/qnetworkreplyimpl_p.h | 3 ++- src/network/kernel/qdnslookup.cpp | 2 ++ src/network/kernel/qdnslookup_p.h | 2 +- 12 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/network/access/http2/http2protocol.cpp b/src/network/access/http2/http2protocol.cpp index baae68bc30..5a2763a0e0 100644 --- a/src/network/access/http2/http2protocol.cpp +++ b/src/network/access/http2/http2protocol.cpp @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN_TAGGED(Http2::Settings, Http2__Settings) + Q_LOGGING_CATEGORY(QT_HTTP2, "qt.network.http2") namespace Http2 diff --git a/src/network/access/http2/http2protocol_p.h b/src/network/access/http2/http2protocol_p.h index 1bec7fda61..e47d99289a 100644 --- a/src/network/access/http2/http2protocol_p.h +++ b/src/network/access/http2/http2protocol_p.h @@ -200,6 +200,6 @@ Q_DECLARE_LOGGING_CATEGORY(QT_HTTP2) QT_END_NAMESPACE -Q_DECLARE_METATYPE(Http2::Settings) +QT_DECL_METATYPE_EXTERN_TAGGED(Http2::Settings, Http2__Settings, Q_NETWORK_EXPORT) #endif diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp index cfcface0d2..d59b377ee6 100644 --- a/src/network/access/qhttpnetworkrequest.cpp +++ b/src/network/access/qhttpnetworkrequest.cpp @@ -42,6 +42,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN(QHttpNetworkRequest) + QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op, QHttpNetworkRequest::Priority pri, const QUrl &newUrl) : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(nullptr), diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index bf6db875af..aa8ef44b1b 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -195,6 +195,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QHttpNetworkRequest) +QT_DECL_METATYPE_EXTERN(QHttpNetworkRequest, Q_AUTOTEST_EXPORT) #endif // QHTTPNETWORKREQUEST_H diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp index fa53cc5a69..41515c5836 100644 --- a/src/network/access/qnetworkaccesscache.cpp +++ b/src/network/access/qnetworkaccesscache.cpp @@ -50,6 +50,9 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*, + QNetworkAccessCache__CacheableObject_ptr) + enum ExpiryTimeEnum { ExpiryTime = 120 }; diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h index 3f96c0266a..15c1586f67 100644 --- a/src/network/access/qnetworkaccesscache_p.h +++ b/src/network/access/qnetworkaccesscache_p.h @@ -123,6 +123,7 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QNetworkAccessCache::CacheableObject*) +QT_DECL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*, + QNetworkAccessCache__CacheableObject_ptr, /* not exported */) #endif diff --git a/src/network/access/qnetworkreplyfileimpl.cpp b/src/network/access/qnetworkreplyfileimpl.cpp index b6be93147a..96b340756a 100644 --- a/src/network/access/qnetworkreplyfileimpl.cpp +++ b/src/network/access/qnetworkreplyfileimpl.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkRequest::KnownHeaders, QNetworkRequest__KnownHeaders) + QNetworkReplyFileImplPrivate::QNetworkReplyFileImplPrivate() : QNetworkReplyPrivate(), managerPrivate(nullptr), realFile(nullptr) { diff --git a/src/network/access/qnetworkreplyfileimpl_p.h b/src/network/access/qnetworkreplyfileimpl_p.h index 48d82abd3f..cb50c6d8e1 100644 --- a/src/network/access/qnetworkreplyfileimpl_p.h +++ b/src/network/access/qnetworkreplyfileimpl_p.h @@ -97,6 +97,8 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QNetworkRequest::KnownHeaders) +// ### move to qnetworkrequest.h +QT_DECL_METATYPE_EXTERN_TAGGED(QNetworkRequest::KnownHeaders, + QNetworkRequest__KnownHeaders, Q_NETWORK_EXPORT) #endif // QNETWORKREPLYFILEIMPL_H diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 8915e2e543..3b717adc05 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN_TAGGED(QSharedPointer, QSharedPointer_char) + inline QNetworkReplyImplPrivate::QNetworkReplyImplPrivate() : backend(nullptr), outgoingData(nullptr), copyDevice(nullptr), diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index e390acb69d..8896081537 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -193,6 +193,7 @@ Q_DECLARE_TYPEINFO(QNetworkReplyImplPrivate::InternalNotifications, Q_PRIMITIVE_ QT_END_NAMESPACE -Q_DECLARE_METATYPE(QSharedPointer) +// ### move to qsharedpointer_impl.h +QT_DECL_METATYPE_EXTERN_TAGGED(QSharedPointer, QSharedPointer_char, Q_NETWORK_EXPORT) #endif diff --git a/src/network/kernel/qdnslookup.cpp b/src/network/kernel/qdnslookup.cpp index a2b6307dbc..977a6078d3 100644 --- a/src/network/kernel/qdnslookup.cpp +++ b/src/network/kernel/qdnslookup.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN(QDnsLookupReply) + #if QT_CONFIG(thread) Q_GLOBAL_STATIC(QDnsLookupThreadPool, theDnsLookupThreadPool); #endif diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h index 41901cffc8..9c08dc2fb9 100644 --- a/src/network/kernel/qdnslookup_p.h +++ b/src/network/kernel/qdnslookup_p.h @@ -238,6 +238,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDnsLookupReply) +QT_DECL_METATYPE_EXTERN(QDnsLookupReply, Q_NETWORK_EXPORT) #endif // QDNSLOOKUP_P_H