diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-22 08:59:07 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-22 15:32:41 +0100 |
| commit | 0e055a163c8b81b74ea90180f910827f507fe10e (patch) | |
| tree | 81273ad5f43bd4f86a61b2f0dff69529657afff5 /sources/shiboken6/generator/qtdoc | |
| parent | 6d25758babd8ccad4fbc7effe561c29cbd692434 (diff) | |
shiboken6: Consolidate type name utility headers
- Rename CPython types to cPy*
- Use them where applicable
Change-Id: Iea05f7d7de5402b9de6d8a614da899b0b67811dc
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/generator/qtdoc')
| -rw-r--r-- | sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp index 74badd024..a677f3e46 100644 --- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp @@ -31,6 +31,7 @@ #include "qtxmltosphinx.h" #include "rstformat.h" #include "ctypenames.h" +#include "pytypenames.h" #include <abstractmetaenum.h> #include <abstractmetafield.h> #include <abstractmetafunction.h> @@ -650,20 +651,19 @@ QString QtDocGenerator::functionSignature(const AbstractMetaClass* cppClass, QString QtDocGenerator::translateToPythonType(const AbstractMetaType &type, const AbstractMetaClass* cppClass) const { - static const QStringList nativeTypes = {boolT(), floatT(), intT(), - QLatin1String("object"), - QLatin1String("str") - }; + static const QStringList nativeTypes = + {boolT(), floatT(), intT(), pyObjectT(), pyStrT()}; + const QString name = type.name(); if (nativeTypes.contains(name)) return name; static const QMap<QString, QString> typeMap = { - { QLatin1String("PyObject"), QLatin1String("object") }, - { QLatin1String("QString"), QLatin1String("str") }, - { QLatin1String("uchar"), QLatin1String("str") }, + { cPyObjectT(), pyObjectT() }, + { qStringT(), pyStrT() }, + { QLatin1String("uchar"), pyStrT() }, { QLatin1String("QStringList"), QLatin1String("list of strings") }, - { qVariantT(), QLatin1String("object") }, + { qVariantT(), pyObjectT() }, { QLatin1String("quint32"), intT() }, { QLatin1String("uint32_t"), intT() }, { QLatin1String("quint64"), intT() }, |