From 4b8ceb41aed352f10d36db5284453f425dbc5f3f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 30 Dec 2011 12:00:09 +0100 Subject: Store the is-a QObject fact with the metatype declaration. This is a source incompatible change for Q_DECLARE_METATYPE(T*), which now requires T to be fully defined. The consequences of this are: * Forward declared types can no longer be declared as a metatype. (though this is a very uncommon thing to do). There is a trivial workaround where necessary. Change-Id: Id74c40088b8c0b466fcd7c55abd616f69acc82c8 Reviewed-by: Lars Knoll --- dist/changes-5.0.0 | 5 +++ src/corelib/io/qtextstream.h | 7 ++++ src/corelib/kernel/qmetatype.cpp | 6 ++- src/corelib/kernel/qmetatype.h | 47 ++++++++++++++++++++-- src/sql/drivers/psql/qsql_psql.cpp | 11 +++++ src/sql/drivers/sqlite/qsql_sqlite.cpp | 11 +++++ src/sql/drivers/tds/qsql_tds.cpp | 12 ++++++ .../corelib/kernel/qmetatype/tst_qmetatype.cpp | 39 ++++++++++++++++-- .../auto/corelib/kernel/qvariant/tst_qvariant.cpp | 5 +++ .../tst_exceptionsafety_objects.cpp | 5 +++ tests/benchmarks/corelib/tools/qstring/main.cpp | 15 +++++++ 11 files changed, 154 insertions(+), 9 deletions(-) diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 1c1255bc52..1b67f878be 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -117,6 +117,11 @@ information about a particular change. * QWidget *widget() has been removed and is replaced by QObject *target() in order to avoid QWidget dependencies. +- QMetaType + + * It is no longer possible to use Q_DECLARE_METATYPE(Foo*) where Foo is only + forward declared - it must be fully defined. + - QWindowSystemInterface: * The signature of all handleTouchEvent() variants have changed, diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index 329dc4b644..ba25a2b6f2 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -208,6 +208,13 @@ typedef QTextStream & (*QTextStreamFunction)(QTextStream &);// manipulator funct typedef void (QTextStream::*QTSMFI)(int); // manipulator w/int argument typedef void (QTextStream::*QTSMFC)(QChar); // manipulator w/QChar argument + +namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} + class Q_CORE_EXPORT QTextStreamManipulator { public: diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 44fa450f5f..1c106f4f36 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1670,11 +1670,13 @@ class Flags template::IsAccepted> struct FlagsImpl { - static quint32 Flags(const int) + static quint32 Flags(const int type) { return (!QTypeInfo::isStatic * QMetaType::MovableType) | (QTypeInfo::isComplex * QMetaType::NeedsConstruction) - | (QTypeInfo::isComplex * QMetaType::NeedsDestruction); + | (QTypeInfo::isComplex * QMetaType::NeedsDestruction) + | (type == QMetaType::QObjectStar ? QMetaType::PointerToQObject : 0) + | (type == QMetaType::QWidgetStar ? QMetaType::PointerToQObject : 0); } }; template diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e81dbb69d1..7c38d1cd13 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -207,7 +207,8 @@ public: enum TypeFlag { NeedsConstruction = 0x1, NeedsDestruction = 0x2, - MovableType = 0x4 + MovableType = 0x4, + PointerToQObject = 0x8 }; Q_DECLARE_FLAGS(TypeFlags, TypeFlag) @@ -315,6 +316,9 @@ struct QMetaTypeId2 static inline int qt_metatype_id() { return QMetaTypeId::qt_metatype_id(); } }; +class QObject; +class QWidget; + namespace QtPrivate { template ::Defined> struct QMetaTypeIdHelper { @@ -325,6 +329,43 @@ namespace QtPrivate { static inline int qt_metatype_id() { return -1; } }; + + template + struct IsPointerToTypeDerivedFromQObject + { + enum { Value = false }; + }; + + // Specialize to avoid sizeof(void) warning + template<> + struct IsPointerToTypeDerivedFromQObject + { + enum { Value = false }; + }; + template<> + struct IsPointerToTypeDerivedFromQObject + { + enum { Value = true }; + }; + template<> + struct IsPointerToTypeDerivedFromQObject + { + enum { Value = true }; + }; + + template + struct IsPointerToTypeDerivedFromQObject + { + typedef qint8 yes_type; + typedef qint64 no_type; + +#ifndef QT_NO_QOBJECT + static yes_type checkType(QObject* ); +#endif + static no_type checkType(...); + Q_STATIC_ASSERT_X(sizeof(T), "Type argument of Q_DECLARE_METATYPE(T*) must be fully defined"); + enum { Value = sizeof(checkType(static_cast(0))) == sizeof(yes_type) }; + }; } template @@ -354,6 +395,8 @@ int qRegisterMetaType(const char *typeName flags |= QMetaType::NeedsConstruction; flags |= QMetaType::NeedsDestruction; } + if (QtPrivate::IsPointerToTypeDerivedFromQObject::Value) + flags |= QMetaType::PointerToQObject; return QMetaType::registerType(typeName, reinterpret_cast(dptr), reinterpret_cast(cptr), @@ -459,8 +502,6 @@ QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER) #undef QT_FORWARD_DECLARE_STATIC_TYPES_ITER -class QWidget; -class QObject; template class QList; template class QMap; template class QHash; diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index de18178514..ba9db5f51e 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -107,7 +107,18 @@ template inline void PQfreemem(T *t, int = 0) { free(t); } +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(PGconn*) + +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(PGresult*) QT_BEGIN_NAMESPACE diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index eef9499dde..900e81f828 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -59,7 +59,18 @@ #include +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(sqlite3*) + +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(sqlite3_stmt*) QT_BEGIN_NAMESPACE diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index 6a31574ae8..c7bb964f35 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -127,6 +127,18 @@ QT_BEGIN_NAMESPACE #define CS_PUBLIC #endif +namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} + +namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} + QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, int errNo = -1) { return QSqlError(QLatin1String("QTDS: ") + err, QString(), type, errNo); diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 3107fe49d9..de93c21d43 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -596,21 +596,50 @@ Q_DECLARE_TYPEINFO(CustomMovable, Q_MOVABLE_TYPE); QT_END_NAMESPACE Q_DECLARE_METATYPE(CustomMovable); +class CustomObject : public QObject +{ + Q_OBJECT +public: + CustomObject(QObject *parent = 0) + : QObject(parent) + { + + } +}; +Q_DECLARE_METATYPE(CustomObject*); + +struct SecondBase {}; + +class CustomMultiInheritanceObject : public QObject, SecondBase +{ + Q_OBJECT +public: + CustomMultiInheritanceObject(QObject *parent = 0) + : QObject(parent) + { + + } +}; +Q_DECLARE_METATYPE(CustomMultiInheritanceObject*); + void tst_QMetaType::flags_data() { QTest::addColumn("type"); QTest::addColumn("isMovable"); QTest::addColumn("isComplex"); + QTest::addColumn("isPointerToQObject"); #define ADD_METATYPE_TEST_ROW(MetaTypeName, MetaTypeId, RealType) \ - QTest::newRow(#RealType) << MetaTypeId << bool(!QTypeInfo::isStatic) << bool(QTypeInfo::isComplex); + QTest::newRow(#RealType) << MetaTypeId << bool(!QTypeInfo::isStatic) << bool(QTypeInfo::isComplex) << bool(QtPrivate::IsPointerToTypeDerivedFromQObject::Value); QT_FOR_EACH_STATIC_CORE_CLASS(ADD_METATYPE_TEST_ROW) QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(ADD_METATYPE_TEST_ROW) QT_FOR_EACH_STATIC_CORE_POINTER(ADD_METATYPE_TEST_ROW) #undef ADD_METATYPE_TEST_ROW - QTest::newRow("TestSpace::Foo") << ::qMetaTypeId() << false << true; - QTest::newRow("Whity") << ::qMetaTypeId >() << false << true; - QTest::newRow("CustomMovable") << ::qMetaTypeId() << true << true; + QTest::newRow("TestSpace::Foo") << ::qMetaTypeId() << false << true << false; + QTest::newRow("Whity") << ::qMetaTypeId >() << false << true << false; + QTest::newRow("CustomMovable") << ::qMetaTypeId() << true << true << false; + QTest::newRow("CustomObject*") << ::qMetaTypeId() << true << false << true; + QTest::newRow("CustomMultiInheritanceObject*") << ::qMetaTypeId() << true << false << true; } void tst_QMetaType::flags() @@ -618,10 +647,12 @@ void tst_QMetaType::flags() QFETCH(int, type); QFETCH(bool, isMovable); QFETCH(bool, isComplex); + QFETCH(bool, isPointerToQObject); QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::NeedsConstruction), isComplex); QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::NeedsDestruction), isComplex); QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::MovableType), isMovable); + QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::PointerToQObject), isPointerToQObject); } void tst_QMetaType::construct_data() diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index f8fa92e244..f40b1eae0b 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3324,6 +3324,11 @@ void tst_QVariant::colorInteger() } class Forward; +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(Forward*); void tst_QVariant::forwardDeclare() diff --git a/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index 49516b7c9b..65ac276704 100644 --- a/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -99,6 +99,11 @@ struct AbstractTester Q_DECLARE_METATYPE(AbstractTester *) typedef void (*TestFunction)(QObject*); +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(TestFunction) template diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index be2abe5c51..5ab53e3394 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -1298,6 +1298,11 @@ static int ucstrncmp_ssse3_aligning2(const ushort *a, const ushort *b, int len) #endif typedef int (* UcstrncmpFunction)(const ushort *, const ushort *, int); +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(UcstrncmpFunction) void tst_QString::ucstrncmp_data() const @@ -1457,6 +1462,11 @@ void tst_QString::fromLatin1() const } typedef void (* FromLatin1Function)(ushort *, const char *, int); +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(FromLatin1Function) void fromLatin1_regular(ushort *dst, const char *str, int size) @@ -1907,6 +1917,11 @@ void tst_QString::fromLatin1Alternatives() const } typedef int (* FromUtf8Function)(ushort *, const char *, int); +QT_BEGIN_NAMESPACE namespace QtPrivate { +template <> struct IsPointerToTypeDerivedFromQObject { + enum { Value = false }; +}; +} QT_END_NAMESPACE Q_DECLARE_METATYPE(FromUtf8Function) extern QTextCodec::ConverterState *state; -- cgit v1.2.3