summaryrefslogtreecommitdiff
path: root/src/qdoc/cppcodeparser.cpp
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2019-01-31 16:43:15 +0100
committerPaul Wicking <paul.wicking@qt.io>2019-02-08 21:48:17 +0000
commit4d2903ce81b5e1cdfb18b108838f44bc8e8603de (patch)
treed1fd1177b9fa3b99c6807038d9a76c346765d33f /src/qdoc/cppcodeparser.cpp
parent439d9682de6052492431324e8c207e3cc3c02957 (diff)
downloadqttools-4d2903ce81b5e1cdfb18b108838f44bc8e8603de.tar.gz
QDoc: Code cleanup, use nullptr for nullptr constants
Replace 0 as nullptr constant with nullptr. Remove reduntant semi-colons after member function definitions. Adjust whitespace on lines otherwise touched. Change-Id: I6af218ca8377611040360e0a3da392e7cffd29e9 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
-rw-r--r--src/qdoc/cppcodeparser.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index 4f5eb9bdc..91e3b78d8 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -229,16 +229,16 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
QStringList words = arg.first.split(QLatin1Char(' '));
QStringList path;
int idx = 0;
- Node *node = 0;
+ Node *node = nullptr;
if (type == Node::Variable && words.size() > 1)
idx = words.size() - 1;
path = words[idx].split("::");
node = qdb_->findNodeInOpenNamespace(path, nodeTypeTestFuncMap_[command]);
- if (node == 0)
+ if (node == nullptr)
node = qdb_->findNodeByNameAndType(path, nodeTypeTestFuncMap_[command]);
- if (node == 0) {
+ if (node == nullptr) {
if (isWorthWarningAbout(doc)) {
doc.location().warning(tr("Cannot find '%1' specified with '\\%2' in any header file")
.arg(arg.first).arg(command));
@@ -362,7 +362,7 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
(command == COMMAND_JSATTACHEDMETHOD)) {
Q_UNREACHABLE();
}
- return 0;
+ return nullptr;
}
/*!
@@ -464,9 +464,9 @@ void CppCodeParser::processQmlProperties(const Doc& doc,
QString module;
QString qmlTypeName;
QString property;
- QmlPropertyNode* qpn = 0;
- QmlTypeNode* qmlType = 0;
- QmlPropertyGroupNode* qpgn = 0;
+ QmlPropertyNode* qpn = nullptr;
+ QmlTypeNode* qmlType = nullptr;
+ QmlPropertyGroupNode* qpgn = nullptr;
Topic qmlPropertyGroupTopic;
const TopicList& topics = doc.topicsUsed();
@@ -530,7 +530,7 @@ void CppCodeParser::processQmlProperties(const Doc& doc,
if (!aggregate)
aggregate = qdb_->findQmlBasicType(module, qmlTypeName);
if (aggregate) {
- if (aggregate->hasQmlProperty(property, attached) != 0) {
+ if (aggregate->hasQmlProperty(property, attached) != nullptr) {
QString msg = tr("QML property documented multiple times: '%1'").arg(arg);
doc.startLocation().warning(msg);
}
@@ -846,7 +846,7 @@ FunctionNode *CppCodeParser::parseMacroArg(const Location &location, const QStri
if (leftParenSplit.isEmpty())
return nullptr;
QString macroName;
- FunctionNode* oldMacroNode = 0;
+ FunctionNode* oldMacroNode = nullptr;
QStringList blankSplit = leftParenSplit[0].split(' ');
if (blankSplit.size() > 0) {
macroName = blankSplit.last();