From 330ad41b7d3a5c65e57bd88f7e659fc466279b1b Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Thu, 3 Jan 2013 10:44:24 +0100
Subject: [PATCH] Network: Remove declaration of built-in and automatic
 metatypes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.

Change-Id: Ifdce72af844901665c4ebab11507216ba5f00fc1
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 4 ----
 .../network/access/qnetworkrequest/tst_qnetworkrequest.cpp    | 2 --
 .../socket/qsocks5socketengine/tst_qsocks5socketengine.cpp    | 2 --
 tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp       | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 240a459fe4..79193de051 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -92,12 +92,8 @@ Q_DECLARE_METATYPE(QSharedPointer<char>)
 
 #include "../../../network-settings.h"
 
-Q_DECLARE_METATYPE(QNetworkReply*)
 Q_DECLARE_METATYPE(QAuthenticator*)
 Q_DECLARE_METATYPE(QNetworkProxyQuery)
-Q_DECLARE_METATYPE(QBuffer*)
-Q_DECLARE_METATYPE(QHttpMultiPart *)
-Q_DECLARE_METATYPE(QList<QFile*>) // for multiparts
 
 typedef QSharedPointer<QNetworkReply> QNetworkReplyPtr;
 
diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
index 2c114d7a59..bed8d6fc80 100644
--- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -45,9 +45,7 @@
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkCookie>
 
-Q_DECLARE_METATYPE(QList<QByteArray>)
 Q_DECLARE_METATYPE(QNetworkRequest::KnownHeaders)
-Q_DECLARE_METATYPE(QVariant)
 
 class tst_QNetworkRequest: public QObject
 {
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 1fae59d6f0..a064f0efee 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -61,8 +61,6 @@
 
 #include "../../../network-settings.h"
 
-Q_DECLARE_METATYPE(QQueue<QByteArray>)
-
 class tst_QSocks5SocketEngine : public QObject, public QAbstractSocketEngineReceiver
 {
     Q_OBJECT
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 60872746e6..dd8bdf58ff 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -63,9 +63,6 @@
 
 Q_DECLARE_METATYPE(QHostAddress)
 Q_DECLARE_METATYPE(QNetworkInterface)
-#ifndef QT_NO_BEARERMANAGEMENT
-Q_DECLARE_METATYPE(QSharedPointer<QNetworkSession>)
-#endif
 
 QT_FORWARD_DECLARE_CLASS(QUdpSocket)