Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ie6da3938b82f5ebe96dd12bd65a3ccc4180d2fba

1 files changed, 29 insertions, 6 deletions

diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 418d3f529..825965b92 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -31,6 +31,7 @@
 #include <abstractmetalang.h>
 #include <messages.h>
 #include "overloaddata.h"
+#include "propertyspec.h"
 #include <reporthandler.h>
 #include <typedatabase.h>
 #include <abstractmetabuilder.h>
@@ -452,14 +453,38 @@ QString ShibokenGenerator::cpythonGetattroFunctionName(const AbstractMetaClass *
     return cpythonBaseName(metaClass) + QLatin1String("_getattro");
 }
 
+QString ShibokenGenerator::cpythonGetterFunctionName(const QString &name,
+                                                     const AbstractMetaClass *enclosingClass)
+{
+    return cpythonBaseName(enclosingClass) + QStringLiteral("_get_") + name;
+}
+
+QString ShibokenGenerator::cpythonSetterFunctionName(const QString &name,
+                                                     const AbstractMetaClass *enclosingClass)
+{
+    return cpythonBaseName(enclosingClass) + QStringLiteral("_set_") + name;
+}
+
 QString ShibokenGenerator::cpythonGetterFunctionName(const AbstractMetaField *metaField)
 {
-    return QStringLiteral("%1_get_%2").arg(cpythonBaseName(metaField->enclosingClass()), metaField->name());
+    return cpythonGetterFunctionName(metaField->name(), metaField->enclosingClass());
 }
 
 QString ShibokenGenerator::cpythonSetterFunctionName(const AbstractMetaField *metaField)
 {
-    return QStringLiteral("%1_set_%2").arg(cpythonBaseName(metaField->enclosingClass()), metaField->name());
+    return cpythonSetterFunctionName(metaField->name(), metaField->enclosingClass());
+}
+
+QString ShibokenGenerator::cpythonGetterFunctionName(const QPropertySpec *property,
+                                                     const AbstractMetaClass *metaClass)
+{
+    return cpythonGetterFunctionName(property->name(), metaClass);
+}
+
+QString ShibokenGenerator::cpythonSetterFunctionName(const QPropertySpec *property,
+                                                     const AbstractMetaClass *metaClass)
+{
+    return cpythonSetterFunctionName(property->name(), metaClass);
 }
 
 static QString cpythonEnumFlagsName(const QString &moduleName,
@@ -1590,8 +1615,7 @@ AbstractMetaFunctionList ShibokenGenerator::filterFunctions(const AbstractMetaCl
 ShibokenGenerator::ExtendedConverterData ShibokenGenerator::getExtendedConverters() const
 {
     ExtendedConverterData extConvs;
-    const AbstractMetaClassList &classList = classes();
-    for (const AbstractMetaClass *metaClass : classList) {
+    for (const AbstractMetaClass *metaClass : classes()) {
         // Use only the classes for the current module.
         if (!shouldGenerate(metaClass))
             continue;
@@ -2622,8 +2646,7 @@ bool ShibokenGenerator::doSetup()
     const ContainerTypeEntryList &containerTypeList = containerTypes();
     for (const ContainerTypeEntry *type : containerTypeList)
         getCode(snips, type);
-    const AbstractMetaClassList &classList = classes();
-    for (const AbstractMetaClass *metaClass : classList)
+    for (const AbstractMetaClass *metaClass : classes())
         getCode(snips, metaClass->typeEntry());
 
     const TypeSystemTypeEntry *moduleEntry = TypeDatabase::instance()->defaultTypeSystemType();