diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-11 16:35:43 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-15 16:21:25 +0000 |
| commit | 50725c9ae5de2c14e781458d1233b6259543f07d (patch) | |
| tree | 80b6113b3a95901efee3fdd4229a85fa7592071b /sources | |
| parent | fb167af4e2509975aaaf44fe932c06aa06075144 (diff) | |
shiboken6: Use QScopedPointer for the doc parser in QtDocGenerator
Change-Id: I0dbf8ac3b5cd7c6135ac6a4564a6cfe288c327b7
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit b18e4576ee297b956331f8de189f87c5a9d497b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp | 13 | ||||
| -rw-r--r-- | sources/shiboken6/generator/qtdoc/qtdocgenerator.h | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp index 750aa19a9..06fc7aa42 100644 --- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp @@ -148,14 +148,11 @@ static QString getFuncName(const AbstractMetaFunctionCPtr& cppFunc) return result; } -QtDocGenerator::QtDocGenerator() : m_docParser(nullptr) +QtDocGenerator::QtDocGenerator() { } -QtDocGenerator::~QtDocGenerator() -{ - delete m_docParser; -} +QtDocGenerator::~QtDocGenerator() = default; QString QtDocGenerator::fileNameSuffix() const { @@ -1003,8 +1000,8 @@ bool QtDocGenerator::doSetup() if (m_codeSnippetDirs.isEmpty()) m_codeSnippetDirs = m_libSourceDir.split(QLatin1Char(PATH_SEP)); - if (!m_docParser) - m_docParser = new QtDocParser; + if (m_docParser.isNull()) + m_docParser.reset(new QtDocParser); if (m_libSourceDir.isEmpty() || m_docDataDir.isEmpty()) { qCWarning(lcShibokenDoc) << "Documentation data dir and/or Qt source dir not informed, " @@ -1058,7 +1055,7 @@ bool QtDocGenerator::handleOption(const QString &key, const QString &value) if (key == QLatin1String("doc-parser")) { qCDebug(lcShibokenDoc).noquote().nospace() << "doc-parser: " << value; if (value == QLatin1String("doxygen")) - m_docParser = new DoxygenParser; + m_docParser.reset(new DoxygenParser); return true; } if (key == additionalDocumentationOption()) { diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h index e68a5f451..673dc9104 100644 --- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h +++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h @@ -30,6 +30,7 @@ #include <QtCore/QStringList> #include <QtCore/QMap> +#include <QtCore/QScopedPointer> #include "generator.h" #include "documentation.h" @@ -113,7 +114,7 @@ private: QString m_extraSectionDir; QStringList m_functionList; QMap<QString, QStringList> m_packages; - DocParser* m_docParser; + QScopedPointer<DocParser> m_docParser; QString m_additionalDocumentationList; }; |