diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-29 15:32:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-30 17:25:16 +0200 |
| commit | 4cd7024040534c08850dffd3f4cd25989302ef5f (patch) | |
| tree | 5c5730518de081058e106115983355532a728a57 | |
| parent | 50d0c3c94ff66c104de269f09c08109eb9d0eb3a (diff) | |
shiboken6: Replace pyIntT() by pyLongT()
pyIntT() is a left-over from Python2.
Pick-to: 6.3 6.2
Task-number: PYSIDE-2065
Change-Id: I07972d7f15eb5f3b3666e8ed4d9015434b4a9d26
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/shiboken6/generator/shiboken/pytypenames.h | 1 | ||||
| -rw-r--r-- | sources/shiboken6/generator/shiboken/shibokengenerator.cpp | 25 |
2 files changed, 12 insertions, 14 deletions
diff --git a/sources/shiboken6/generator/shiboken/pytypenames.h b/sources/shiboken6/generator/shiboken/pytypenames.h index 19bfc55c0..696e0d88d 100644 --- a/sources/shiboken6/generator/shiboken/pytypenames.h +++ b/sources/shiboken6/generator/shiboken/pytypenames.h @@ -8,7 +8,6 @@ static inline QString pyBoolT() { return QStringLiteral("PyBool"); } static inline QString pyFloatT() { return QStringLiteral("PyFloat"); } -static inline QString pyIntT() { return QStringLiteral("PyLong"); } static inline QString pyLongT() { return QStringLiteral("PyLong"); } static inline QString pyObjectT() { return QStringLiteral("object"); } static inline QString pyStrT() { return QStringLiteral("str"); } diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp index cf38585de..1b9299a4f 100644 --- a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp +++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp @@ -113,17 +113,17 @@ static const QHash<QString, QString> &primitiveTypesCorrespondences() {u"char"_s, sbkCharT()}, {u"signed char"_s, sbkCharT()}, {u"unsigned char"_s, sbkCharT()}, - {intT(), pyIntT()}, - {u"signed int"_s, pyIntT()}, - {u"uint"_s, pyIntT()}, - {u"unsigned int"_s, pyIntT()}, - {shortT(), pyIntT()}, - {u"ushort"_s, pyIntT()}, - {u"signed short"_s, pyIntT()}, - {u"signed short int"_s, pyIntT()}, - {unsignedShortT(), pyIntT()}, - {u"unsigned short int"_s, pyIntT()}, - {longT(), pyIntT()}, + {intT(), pyLongT()}, + {u"signed int"_s, pyLongT()}, + {u"uint"_s, pyLongT()}, + {u"unsigned int"_s, pyLongT()}, + {shortT(), pyLongT()}, + {u"ushort"_s, pyLongT()}, + {u"signed short"_s, pyLongT()}, + {u"signed short int"_s, pyLongT()}, + {unsignedShortT(), pyLongT()}, + {u"unsigned short int"_s, pyLongT()}, + {longT(), pyLongT()}, {doubleT(), pyFloatT()}, {floatT(), pyFloatT()}, {u"unsigned long"_s, pyLongT()}, @@ -715,8 +715,7 @@ QString ShibokenGenerator::pythonOperatorFunctionName(const AbstractMetaFunction bool ShibokenGenerator::isNumber(const QString &cpythonApiName) { - return cpythonApiName == pyIntT() - || cpythonApiName == pyFloatT() || cpythonApiName == pyLongT() + return cpythonApiName == pyFloatT() || cpythonApiName == pyLongT() || cpythonApiName == pyBoolT(); } |