diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-03 14:00:50 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-05 17:32:06 +0100 |
| commit | 1e3ec1ba2a29e59b580fbd9a5cf6e4e91c8994e2 (patch) | |
| tree | edfaa3333c7599db8d4fc2b4c753aae384dcb6ca /sources/shiboken6/ApiExtractor/qtdocparser.cpp | |
| parent | b8acf6d995a5d84e464476a2718a0921165c3163 (diff) | |
shiboken6: Port from QSharedPointer to std::shared_ptr
Task-number: QTBUG-109570
Change-Id: Iabdafb0a5ab211e32c1bbf7face78fd5102a49b9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/qtdocparser.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/qtdocparser.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/shiboken6/ApiExtractor/qtdocparser.cpp b/sources/shiboken6/ApiExtractor/qtdocparser.cpp index 9c375edc6..badf6b7af 100644 --- a/sources/shiboken6/ApiExtractor/qtdocparser.cpp +++ b/sources/shiboken6/ApiExtractor/qtdocparser.cpp @@ -57,7 +57,7 @@ static void formatFunctionUnqualifiedArgTypeQuery(QTextStream &str, case AbstractMetaType::FlagsPattern: { // Modify qualified name "QFlags<Qt::AlignmentFlag>" with name "Alignment" // to "Qt::Alignment" as seen by qdoc. - const auto flagsEntry = qSharedPointerCast<const FlagsTypeEntry>(metaType.typeEntry()); + const auto flagsEntry = std::static_pointer_cast<const FlagsTypeEntry>(metaType.typeEntry()); QString name = flagsEntry->qualifiedCppName(); if (name.endsWith(u'>') && name.startsWith(u"QFlags<")) { const int lastColon = name.lastIndexOf(u':'); @@ -127,7 +127,7 @@ QString QtDocParser::queryFunctionDocumentation(const QString &sourceFileName, FunctionDocumentationList candidates = classDocumentation.findFunctionCandidates(func->name(), func->isConstant()); if (candidates.isEmpty()) { - *errorMessage = msgCannotFindDocumentation(sourceFileName, func.data()) + *errorMessage = msgCannotFindDocumentation(sourceFileName, func.get()) + u" (no matches)"_s; return {}; } @@ -172,13 +172,13 @@ QString QtDocParser::queryFunctionDocumentation(const QString &sourceFileName, candidates.erase(pend, candidates.end()); if (candidates.size() == 1) { const auto &match = candidates.constFirst(); - QTextStream(errorMessage) << msgFallbackForDocumentation(sourceFileName, func.data()) + QTextStream(errorMessage) << msgFallbackForDocumentation(sourceFileName, func.get()) << "\n Falling back to \"" << match.signature << "\" obtained by matching the argument count only."; return candidates.constFirst().description; } - QTextStream(errorMessage) << msgCannotFindDocumentation(sourceFileName, func.data()) + QTextStream(errorMessage) << msgCannotFindDocumentation(sourceFileName, func.get()) << " (" << candidates.size() << " candidates matching the argument count)"; return {}; } @@ -204,12 +204,12 @@ static QString extractBrief(QString *value) void QtDocParser::fillDocumentation(const AbstractMetaClassPtr &metaClass) { - if (metaClass.isNull()) + if (!metaClass) return; auto context = metaClass->enclosingClass(); - while (!context.isNull()) { - if (context->enclosingClass().isNull()) + while (context) { + if (!context->enclosingClass()) break; context = context->enclosingClass(); } @@ -267,7 +267,7 @@ void QtDocParser::fillDocumentation(const AbstractMetaClassPtr &metaClass) if (!errorMessage.isEmpty()) qCWarning(lcShibokenDoc, "%s", qPrintable(errorMessage)); const Documentation documentation(detailed, {}); - qSharedPointerConstCast<AbstractMetaFunction>(func)->setDocumentation(documentation); + std::const_pointer_cast<AbstractMetaFunction>(func)->setDocumentation(documentation); } #if 0 // Fields |