From 0cd3820e4d62d91c006a807f04c77166b2dbc7f5 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 7 Jul 2020 16:54:44 +0200 Subject: moc: Allow out-of-line storage for Q_PRIVATE_QPROPERTY If you pass "STORED false" the name is interpreted as function to be invoked in order to access the property. This allows storage of a property in a lazily allocated data type. Change-Id: I4d3a9cac6985c6419ce687868cb74b91921595a6 Reviewed-by: Lars Knoll Reviewed-by: Fabian Kosmale --- src/tools/moc/generator.cpp | 18 +++++++++--------- src/tools/moc/moc.cpp | 16 +++++++++++----- src/tools/moc/moc.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-) (limited to 'src/tools') diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 39640b6f68..4f420b8467 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1555,7 +1555,7 @@ void Generator::generateQPropertyApi() cdef->qualified.constData(), property.name.constData()); printAccessor(/*const*/true); - fprintf(out, " return thisPtr->%s->%s.value();\n", property.accessor.constData(), property.name.constData()); + fprintf(out, " return thisPtr->%s->%s.value();\n", property.accessor.constData(), property.storage.constData()); fprintf(out, "}\n"); // property value setter @@ -1564,7 +1564,7 @@ void Generator::generateQPropertyApi() property.name.constData(), property.type.name.constData()); printAccessor(); - fprintf(out, " return thisPtr->%s->%s.setValue(thisPtr->%s, value);\n", property.accessor.constData(), property.name.constData(), property.accessor.constData()); + fprintf(out, " return thisPtr->%s->%s.setValue(thisPtr->%s, value);\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData()); fprintf(out, "}\n"); // property value move setter @@ -1573,7 +1573,7 @@ void Generator::generateQPropertyApi() property.name.constData(), property.type.name.constData()); printAccessor(); - fprintf(out, " return thisPtr->%s->%s.setValue(thisPtr->%s, std::move(value));\n", property.accessor.constData(), property.name.constData(), property.accessor.constData()); + fprintf(out, " return thisPtr->%s->%s.setValue(thisPtr->%s, std::move(value));\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData()); fprintf(out, "}\n"); // binding setter @@ -1583,7 +1583,7 @@ void Generator::generateQPropertyApi() property.name.constData(), property.type.name.constData()); printAccessor(); - fprintf(out, " return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.name.constData(), property.accessor.constData()); + fprintf(out, " return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData()); fprintf(out, "}\n"); // binding move setter @@ -1593,7 +1593,7 @@ void Generator::generateQPropertyApi() property.name.constData(), property.type.name.constData()); printAccessor(); - fprintf(out, " return thisPtr->%s->%s.setBinding(thisPtr->%s, std::move(binding));\n", property.accessor.constData(), property.name.constData(), property.accessor.constData()); + fprintf(out, " return thisPtr->%s->%s.setBinding(thisPtr->%s, std::move(binding));\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData()); fprintf(out, "}\n"); // untyped binding setter @@ -1601,7 +1601,7 @@ void Generator::generateQPropertyApi() cdef->qualified.constData(), property.name.constData()); printAccessor(); - fprintf(out, " return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.name.constData(), property.accessor.constData()); + fprintf(out, " return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData()); fprintf(out, "}\n"); // binding bool getter @@ -1609,7 +1609,7 @@ void Generator::generateQPropertyApi() cdef->qualified.constData(), property.name.constData()); printAccessor(/*const*/true); - fprintf(out, " return thisPtr->%s->%s.hasBinding();\n", property.accessor.constData(), property.name.constData()); + fprintf(out, " return thisPtr->%s->%s.hasBinding();\n", property.accessor.constData(), property.storage.constData()); fprintf(out, "}\n"); // binding getter @@ -1618,7 +1618,7 @@ void Generator::generateQPropertyApi() cdef->qualified.constData(), property.name.constData()); printAccessor(/*const*/true); - fprintf(out, " return thisPtr->%s->%s.binding();\n", property.accessor.constData(), property.name.constData()); + fprintf(out, " return thisPtr->%s->%s.binding();\n", property.accessor.constData(), property.storage.constData()); fprintf(out, "}\n"); // binding taker @@ -1627,7 +1627,7 @@ void Generator::generateQPropertyApi() cdef->qualified.constData(), property.name.constData()); printAccessor(); - fprintf(out, " return thisPtr->%s->%s.takeBinding();\n", property.accessor.constData(), property.name.constData()); + fprintf(out, " return thisPtr->%s->%s.takeBinding();\n", property.accessor.constData(), property.storage.constData()); fprintf(out, "}\n"); // property setter function diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index e31bdfbb15..44e669a664 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1527,14 +1527,9 @@ void Moc::parsePrivateQProperty(ClassDef *def) next(IDENTIFIER); const QByteArray setter = lexem(); - def->privateQProperties += PrivateQPropertyDef{type, name, setter, accessor}; - PropertyDef propDef; propDef.name = name; - propDef.qpropertyname = name; propDef.type = type.name; - propDef.read = name + ".value"; - propDef.write = name + ".setValue"; propDef.isQProperty = true; propDef.isQPropertyWithNotifier = true; propDef.inPrivateClass = accessor; @@ -1544,6 +1539,17 @@ void Moc::parsePrivateQProperty(ClassDef *def) if (test(COMMA)) parsePropertyAttributes(propDef); + propDef.qpropertyname = (propDef.stored == "true") ? name : (name + "()"); + + def->privateQProperties += PrivateQPropertyDef { + type, name, setter, accessor, propDef.qpropertyname + }; + + if (propDef.read.isEmpty()) + propDef.read = propDef.qpropertyname + ".value"; + if (propDef.write.isEmpty()) + propDef.write = propDef.qpropertyname + ".setValue"; + next(RPAREN); def->propertyList += propDef; diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 549b3cdd39..b4bb105601 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -155,6 +155,7 @@ struct PrivateQPropertyDef QByteArray name; QByteArray setter; QByteArray accessor; + QByteArray storage; }; Q_DECLARE_TYPEINFO(PrivateQPropertyDef, Q_MOVABLE_TYPE); -- cgit v1.2.3