diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-10 11:23:05 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-10 16:27:45 +0100 |
commit | 133b91abb330f8e496f3a82920e000ab079f358e (patch) | |
tree | fbc5364ab608e3e91a47d9e74d30f1eecf9612f6 /sources/shiboken6/ApiExtractor/messages.h | |
parent | fd575256dacbc96074a7793385da7a3b404aafda (diff) |
Fix documentation generation
The fuzzy checking introduced by 87efa57c6ddc1a8364b2ea4d9f909372d0af5cfc
actually produced ambiguous matches like
QStandardItemModel::insertRow(QStandardItem *),
QStandardItemModel::insertRow(constd QList<QStandardItem *> &).
Change this to be a 3 step process: First, try an exact type match. If
that fails and there are arguments using const ref qualifications, try
a fuzzy match. Check whether this produces a single match. Finally,
try matching by argument count.
As a drive-by, format qualifiers of template parameters like
QList<QStandardItem *> correctly.
Change the messages to report "Fallback used" instead of "Cannot find"
if a fallback is found to make it easier to spot failures.
Amends 87efa57c6ddc1a8364b2ea4d9f909372d0af5cfc.
Pick-to: 6.2
Change-Id: I5b133274ae0f056e6901b0a66d385a270cabb9c9
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/messages.h')
-rw-r--r-- | sources/shiboken6/ApiExtractor/messages.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sources/shiboken6/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h index 008556f2b..b66221792 100644 --- a/sources/shiboken6/ApiExtractor/messages.h +++ b/sources/shiboken6/ApiExtractor/messages.h @@ -169,11 +169,18 @@ QString msgCannotFindDocumentation(const QString &fileName, const char *what, const QString &name, const QString &query); +QString msgFallbackForDocumentation(const QString &fileName, + const char *what, const QString &name, + const QString &query); + QString msgCannotFindDocumentation(const QString &fileName, - const AbstractMetaClass *metaClass, const AbstractMetaFunction *function, const QString &query); +QString msgFallbackForDocumentation(const QString &fileName, + const AbstractMetaFunction *function, + const QString &query); + QString msgCannotFindDocumentation(const QString &fileName, const AbstractMetaClass *metaClass, const AbstractMetaEnum &e, |