From ed8acbeb7c6fd137486b5c8a6eec58a3b9db862c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 30 Jul 2020 22:42:31 +0200 Subject: Automatically register data/debug stream operations in QMetaType And remove the old manual registration code for those operators. Add some special handling for long/ulong, as these types could be streamed as a QVariant so far, but are not directly streamable through QDataStream. [ChangeLog][QtCore][QMetaType] The QMetaType::registerStreamOperators() and QMetaType::registerDebugStreamOperator() methods have been removed. The streaming operators for a type are now automatically registered together with the type registration. This implies that the operators should be visible wherever the type is visible and being used. [ChangeLog][Behavior Incompatible Changes] Because the QDataStream and QDebug serialization operators are automatically registered with QMetaType, the declarations of those functions must be present at any point where the type is used with QMetaType and QVariant. Change-Id: I4a0732651b20319af4a8397ff90b848ca4580d99 Reviewed-by: Fabian Kosmale --- .../corelib/kernel/qmetatype/tst_qmetatype.cpp | 54 +++++++++++----------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp') diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 6f916372e5..6f844e2fb4 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -217,7 +217,6 @@ private slots: void isRegisteredStaticLess_data(); void isRegisteredStaticLess(); void isEnum(); - void registerStreamBuiltin(); void automaticTemplateRegistration(); void saveAndLoadBuiltin_data(); void saveAndLoadBuiltin(); @@ -351,12 +350,12 @@ static void *GadgetTypedConstructor(int type, void *where, const void *copy) return it->first->constructor(type, where, copy); } -static void GadgetSaveOperator(QDataStream & out, const void *data) +static void GadgetSaveOperator(const QtPrivate::QMetaTypeInterface *, QDataStream & out, const void *data) { reinterpret_cast(data)->saveOperator(out); } -static void GadgetLoadOperator(QDataStream &in, void *data) +static void GadgetLoadOperator(const QtPrivate::QMetaTypeInterface *, QDataStream &in, void *data) { reinterpret_cast(data)->loadOperator(in); } @@ -424,12 +423,15 @@ void tst_QMetaType::registerGadget(const char *name, const QListtypeId, ptr); }, nullptr, nullptr, - nullptr }; + nullptr, + GadgetSaveOperator, + GadgetLoadOperator, + nullptr + }; QMetaType gadgetMetaType(typeInfo); dynamicGadgetProperties->m_metatype = gadgetMetaType; int gadgetTypeId = QMetaType(typeInfo).id(); QVERIFY(gadgetTypeId > 0); - QMetaType::registerStreamOperators(gadgetTypeId, &GadgetSaveOperator, &GadgetLoadOperator); s_managedTypes[gadgetTypeId] = qMakePair(dynamicGadgetProperties, std::shared_ptr{meta, [](QMetaObject *ptr){ ::free(ptr); }}); } @@ -1326,12 +1328,17 @@ void tst_QMetaType::typedConstruct() [](const TypeInfo *self, void *where, const void *copy) { GadgetTypedConstructor(self->typeId, where, copy); }, [](const TypeInfo *self, void *where, void *copy) { GadgetTypedConstructor(self->typeId, where, copy); }, [](const TypeInfo *self, void *ptr) { GadgetTypedDestructor(self->typeId, ptr); }, - nullptr, nullptr, nullptr }; + nullptr, + nullptr, + nullptr, + GadgetSaveOperator, + GadgetLoadOperator, + nullptr + }; QMetaType metatype(typeInfo); dynamicGadgetProperties->m_metatype = metatype; int podTypeId = metatype.id(); QVERIFY(podTypeId > 0); - QMetaType::registerStreamOperators(podTypeId, &GadgetSaveOperator, &GadgetLoadOperator); s_managedTypes[podTypeId] = qMakePair(dynamicGadgetProperties, std::shared_ptr{}); // Test POD @@ -1552,13 +1559,6 @@ void tst_QMetaType::isRegisteredStaticLess() QCOMPARE(QMetaType(typeId).isRegistered(), registered); } -void tst_QMetaType::registerStreamBuiltin() -{ - //should not crash; - qRegisterMetaTypeStreamOperators("QString"); - qRegisterMetaTypeStreamOperators("QVariant"); -} - typedef QHash IntUIntHash; Q_DECLARE_METATYPE(IntUIntHash) typedef QMap IntUIntMap; @@ -2044,7 +2044,6 @@ struct CustomStreamableType { int a; }; -Q_DECLARE_METATYPE(CustomStreamableType) QDataStream &operator<<(QDataStream &out, const CustomStreamableType &t) { @@ -2059,6 +2058,7 @@ QDataStream &operator>>(QDataStream &in, CustomStreamableType &t) t.a = a; return in; } +Q_DECLARE_METATYPE(CustomStreamableType) void tst_QMetaType::saveAndLoadCustom() { @@ -2068,12 +2068,7 @@ void tst_QMetaType::saveAndLoadCustom() int id = ::qMetaTypeId(); QByteArray ba; QDataStream stream(&ba, QIODevice::ReadWrite); - QVERIFY(!QMetaType::save(stream, id, &t)); - QCOMPARE(stream.status(), QDataStream::Ok); - QVERIFY(!QMetaType::load(stream, id, &t)); - QCOMPARE(stream.status(), QDataStream::Ok); - qRegisterMetaTypeStreamOperators("CustomStreamableType"); QVERIFY(QMetaType::save(stream, id, &t)); QCOMPARE(stream.status(), QDataStream::Ok); @@ -2278,6 +2273,11 @@ struct CustomDebugStreamableType QString toString() const { return "test"; } }; +struct CustomDebugStreamableType2 +{ + QString toString() const { return "test"; } +}; + QDebug operator<<(QDebug dbg, const CustomDebugStreamableType&) { return dbg << "string-content"; @@ -2607,16 +2607,14 @@ void tst_QMetaType::customDebugStream() { MessageHandlerCustom handler(::qMetaTypeId()); QVariant v1 = QVariant::fromValue(CustomDebugStreamableType()); - handler.expectedMessage = "QVariant(CustomDebugStreamableType, )"; - qDebug() << v1; - - QMetaType::registerConverter(&CustomDebugStreamableType::toString); - handler.expectedMessage = "QVariant(CustomDebugStreamableType, \"test\")"; - qDebug() << v1; - - QMetaType::registerDebugStreamOperator(); handler.expectedMessage = "QVariant(CustomDebugStreamableType, string-content)"; qDebug() << v1; + + MessageHandlerCustom handler2(::qMetaTypeId()); + QMetaType::registerConverter(&CustomDebugStreamableType2::toString); + handler2.expectedMessage = "QVariant(CustomDebugStreamableType2, \"test\")"; + QVariant v2 = QVariant::fromValue(CustomDebugStreamableType2()); + qDebug() << v2; } void tst_QMetaType::unknownType() -- cgit v1.2.3