AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete or commented use of Q_DECLARE_METATYPE.

Browse Source 
Change-Id: I15bc845801b9f84a9252a0092fbd69f0e1b3f4ea
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Stephen Kelly 2012-07-24 09:23:20 +02:00 committed by Qt by Nokia
parent 35a5f7f661
commit 94c2745074
9 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus/qdbusextratypes.h
View File

@ -175,9 +175,7 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDBusVariant)
Q_DECLARE_METATYPE(QDBusObjectPath)
Q_DECLARE_METATYPE(QList<QDBusObjectPath>)
Q_DECLARE_METATYPE(QDBusSignature)
Q_DECLARE_METATYPE(QList<QDBusSignature>)
QT_END_HEADER

9
src/dbus/qdbusmetatype.cpp
View File

@ -64,15 +64,6 @@
# define DBUS_TYPE_UNIX_FD_AS_STRING "h"
#endif
Q_DECLARE_METATYPE(QList<bool>)
Q_DECLARE_METATYPE(QList<short>)
Q_DECLARE_METATYPE(QList<ushort>)
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QList<uint>)
Q_DECLARE_METATYPE(QList<qlonglong>)
Q_DECLARE_METATYPE(QList<qulonglong>)
Q_DECLARE_METATYPE(QList<double>)
QT_BEGIN_NAMESPACE
class QDBusCustomTypeInfo

1
src/dbus/qdbusunixfiledescriptor.h
View File

@ -96,7 +96,6 @@ Q_DECLARE_SHARED(QDBusUnixFileDescriptor)
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDBusUnixFileDescriptor)
Q_DECLARE_METATYPE(QList<QDBusUnixFileDescriptor>)
QT_END_HEADER

2
src/network/access/qhttpnetworkreply_p.h
View File

@ -249,8 +249,6 @@ public:
QT_END_NAMESPACE
//Q_DECLARE_METATYPE(QHttpNetworkReply)
#endif // QT_NO_HTTP

2
src/network/access/qhttpnetworkrequest_p.h
View File

@ -155,8 +155,6 @@ public:
QT_END_NAMESPACE
//Q_DECLARE_METATYPE(QHttpNetworkRequest)
#endif // QT_NO_HTTP

1
src/network/access/qnetworkcookie.h
View File

@ -119,7 +119,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QNetworkCookie &);
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QNetworkCookie)
Q_DECLARE_METATYPE(QList<QNetworkCookie>)
QT_END_HEADER

2
src/network/bearer/qnetworksession_p.h
View File

@ -153,8 +153,6 @@ protected:
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QSharedPointer<QNetworkSession>)
#endif // QT_NO_BEARERMANAGEMENT
#endif // QNETWORKSESSIONPRIVATE_H

2
src/widgets/graphicsview/qgraphicsscene.h
View File

@ -324,8 +324,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsScene::SceneLayers)
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QGraphicsScene *)
QT_END_HEADER
#endif

5
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
View File

@ -3192,15 +3192,10 @@ QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QList<QSize>)
Q_DECLARE_METATYPE(MyPrimitive)
Q_DECLARE_METATYPE(MyData)
Q_DECLARE_METATYPE(MyMovable)
Q_DECLARE_METATYPE(MyNotMovable)
Q_DECLARE_METATYPE(QList<MyPrimitive>)
Q_DECLARE_METATYPE(QList<MyData>)
Q_DECLARE_METATYPE(QList<MyMovable>)
Q_DECLARE_METATYPE(QList<MyNotMovable>)
Q_DECLARE_METATYPE(MyPrimitive *)
Q_DECLARE_METATYPE(MyData *)
Q_DECLARE_METATYPE(MyMovable *)