Skip to content

Qt decided to change the interface for QVariant init #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davens wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Qt decided to change the interface for QVariant init #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe2b116
Qt decided to change the interface for QVariant init
davens Dec 20, 2022
f8d8262
Fixes for linter
davens Jul 26, 2023
45b45d9
Revert "Fixes for linter"
davens Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions QuickPropertyMap/QuickPropertyMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "QuickPropertyMap.h"
#include <private/qmetaobjectbuilder_p.h>

QuickPropertyMap::QuickPropertyMap(QObject *parent)
: QuickPropertyMapBase(parent)
QuickPropertyMap::QuickPropertyMap(QObject* parent) :
QuickPropertyMapBase(parent)
{
buildMetaObject(); // NOTE: build an empty valid QMetaObject
}
Expand All @@ -15,7 +15,7 @@ QuickPropertyMap::~QuickPropertyMap()
void QuickPropertyMap::addProperty(const QByteArray& name, const QVariant& value, int type)
{
if (!m_finalized)
m_propertyList.append(DynamicProperty{name, value, type});
m_propertyList.append(DynamicProperty { name, value, type });
}

void QuickPropertyMap::build()
Expand Down Expand Up @@ -57,10 +57,10 @@ void QuickPropertyMap::buildMetaObject()
builder.setClassName("QuickPropertyMap");
builder.setSuperClass(&QuickPropertyMapBase::staticMetaObject);

for (const DynamicProperty& dynamicProperty: m_propertyList)
for (const DynamicProperty& dynamicProperty : m_propertyList)
{
QMetaPropertyBuilder propertyBuilder = builder.addProperty(dynamicProperty.name, QMetaType::typeName(dynamicProperty.typeId));
QMetaMethodBuilder signalBuilder = builder.addSignal(dynamicProperty.name + "сhanged()");
QMetaMethodBuilder signalBuilder = builder.addSignal(dynamicProperty.name + "сhanged()");

propertyBuilder.setWritable(true);
propertyBuilder.setNotifySignal(signalBuilder);
Expand All @@ -82,29 +82,34 @@ int QuickPropertyMap::my_metacall(QMetaObject::Call call, int id, void** argv)
{
switch (call)
{
case QMetaObject::ReadProperty:
{
const DynamicProperty& property = m_propertyList[id];
QMetaType::construct(property.typeId, argv[0], property.value.data());
}
break;
case QMetaObject::ReadProperty:
{
const DynamicProperty& property = m_propertyList[id];
QMetaType::construct(property.typeId, argv[0], property.value.data());
}
break;

case QMetaObject::WriteProperty:
{
DynamicProperty& p = m_propertyList[id];
QVariant value(p.typeId, argv[0]);
case QMetaObject::WriteProperty:
{
DynamicProperty& p = m_propertyList[id];
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QVariant value(p.typeId, argv[0]);
#else
QVariant value(QMetaType(p.typeId), argv[0]);
#endif

if (p.value != value)
{
writeValue(p.value, value);
QMetaObject::activate(this, m_metaObject, id, nullptr);
if (p.value != value)
{
writeValue(p.value, value);
QMetaObject::activate(this, m_metaObject, id, nullptr);

emit valueChanged(p.name, p.value);
}
emit valueChanged(p.name, p.value);
}
break;
}
break;

default: break;
default:
break;
}

return -1;
Expand Down