diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-12 09:23:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-28 09:08:41 +0000 |
| commit | fb1c0f204e09ba29fa3d360d72231d4ed468c1e4 (patch) | |
| tree | f44b20666e01425aa5e99d710ea3a06ac9697ef0 /sources | |
| parent | 5de0db2391c719ef6c484813cc4aee61da355160 (diff) | |
shiboken2: Add location to error messages about added functions
Change-Id: I39210642a96e98328d193f4e81ecad82b496d6c9
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 6 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/messages.cpp | 10 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/messages.h | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index dd3e3fac0..b6e68bfde 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -1537,7 +1537,8 @@ AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFu qCWarning(lcShiboken, "%s", qPrintable(msgAddedFunctionInvalidReturnType(addedFunc->name(), addedFunc->returnType().name, - errorMessage))); + errorMessage, + metaClass))); return nullptr; } @@ -1553,7 +1554,8 @@ AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFu qCWarning(lcShiboken, "%s", qPrintable(msgAddedFunctionInvalidArgType(addedFunc->name(), typeInfo.name, i + 1, - errorMessage))); + errorMessage, + metaClass))); delete metaFunction; return nullptr; } diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken2/ApiExtractor/messages.cpp index a660f7e76..ab03a0102 100644 --- a/sources/shiboken2/ApiExtractor/messages.cpp +++ b/sources/shiboken2/ApiExtractor/messages.cpp @@ -112,20 +112,26 @@ static void msgFormatEnumType(Stream &str, QString msgAddedFunctionInvalidArgType(const QString &addedFuncName, const QString &typeName, - int pos, const QString &why) + int pos, const QString &why, + const AbstractMetaClass *context) { QString result; QTextStream str(&result); + if (context) + str << context->typeEntry()->sourceLocation(); str << "Unable to translate type \"" << typeName << "\" of argument " << pos << " of added function \"" << addedFuncName << "\": " << why; return result; } QString msgAddedFunctionInvalidReturnType(const QString &addedFuncName, - const QString &typeName, const QString &why) + const QString &typeName, const QString &why, + const AbstractMetaClass *context) { QString result; QTextStream str(&result); + if (context) + str << context->typeEntry()->sourceLocation(); str << "Unable to translate return type \"" << typeName << "\" of added function \"" << addedFuncName << "\": " << why; diff --git a/sources/shiboken2/ApiExtractor/messages.h b/sources/shiboken2/ApiExtractor/messages.h index 55481270c..1e58a7fad 100644 --- a/sources/shiboken2/ApiExtractor/messages.h +++ b/sources/shiboken2/ApiExtractor/messages.h @@ -49,10 +49,12 @@ QT_FORWARD_DECLARE_CLASS(QXmlStreamReader) QString msgAddedFunctionInvalidArgType(const QString &addedFuncName, const QString &typeName, - int pos, const QString &why); + int pos, const QString &why, + const AbstractMetaClass *context = nullptr); QString msgAddedFunctionInvalidReturnType(const QString &addedFuncName, - const QString &typeName, const QString &why); + const QString &typeName, const QString &why, + const AbstractMetaClass *context = nullptr); QString msgNoFunctionForModification(const AbstractMetaClass *klass, const QString &signature, |