diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-08-07 20:37:57 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-08-08 07:23:16 +0200 |
commit | 455bda44cb83b622fddd5954bf27c61a99bf2eba (patch) | |
tree | 6df4dd58025ba85e6baa39fa3bb819dba3aa1eca /src/qdoc/cppcodeparser.cpp | |
parent | 000f678697fcc8c5512f4ae96c2a49eea9ba8066 (diff) | |
download | qttools-455bda44cb83b622fddd5954bf27c61a99bf2eba.tar.gz |
QDoc: Clean up whitespace
Ensure that QDoc conforms to Qt style, whitespace edition.
For the most part, the change involves moving the pointer operators.
Also remove whitespace following an opening parenthesis, or
immediately preceding a closing one. In some cases, adjust the
following line accordingly in methods that span multiple lines.
Change-Id: I56ae125a2acf09c669c0a73dc814d05f13575f39
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
-rw-r--r-- | src/qdoc/cppcodeparser.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index a5e498f07..af0d9bd9b 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -207,7 +207,7 @@ QStringList CppCodeParser::sourceFileNameFilter() /*! Returns the set of strings reopresenting the topic commands. */ -const QSet<QString>& CppCodeParser::topicCommands() +const QSet<QString> &CppCodeParser::topicCommands() { return topicCommands_; } @@ -215,9 +215,9 @@ const QSet<QString>& CppCodeParser::topicCommands() /*! Process the topic \a command found in the \a doc with argument \a arg. */ -Node* CppCodeParser::processTopicCommand(const Doc& doc, - const QString& command, - const ArgLocPair& arg) +Node *CppCodeParser::processTopicCommand(const Doc &doc, + const QString &command, + const ArgLocPair &arg) { ExtraFuncData extra; if (command == COMMAND_FN) { @@ -253,7 +253,7 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc, } else if (node->isAggregate()) { if (type == Node::Namespace) { - NamespaceNode* ns = static_cast<NamespaceNode*>(node); + NamespaceNode *ns = static_cast<NamespaceNode *>(node); ns->markSeen(); ns->setWhereDocumented(ns->tree()->camelCaseModuleName()); } @@ -275,37 +275,37 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc, } else if (command == COMMAND_EXAMPLE) { if (Config::generateExamples) { - ExampleNode* en = new ExampleNode(qdb_->primaryTreeRoot(), arg.first); + ExampleNode *en = new ExampleNode(qdb_->primaryTreeRoot(), arg.first); en->setLocation(doc.startLocation()); setExampleFileLists(en); return en; } } else if (command == COMMAND_EXTERNALPAGE) { - ExternalPageNode* epn = new ExternalPageNode(qdb_->primaryTreeRoot(), arg.first); + ExternalPageNode *epn = new ExternalPageNode(qdb_->primaryTreeRoot(), arg.first); epn->setLocation(doc.startLocation()); return epn; } else if (command == COMMAND_HEADERFILE) { - HeaderNode* hn = new HeaderNode(qdb_->primaryTreeRoot(), arg.first); + HeaderNode *hn = new HeaderNode(qdb_->primaryTreeRoot(), arg.first); hn->setLocation(doc.startLocation()); return hn; } else if (command == COMMAND_GROUP) { - CollectionNode* cn = qdb_->addGroup(arg.first); + CollectionNode *cn = qdb_->addGroup(arg.first); cn->setLocation(doc.startLocation()); cn->markSeen(); return cn; } else if (command == COMMAND_MODULE) { - CollectionNode* cn = qdb_->addModule(arg.first); + CollectionNode *cn = qdb_->addModule(arg.first); cn->setLocation(doc.startLocation()); cn->markSeen(); return cn; } else if (command == COMMAND_QMLMODULE) { QStringList blankSplit = arg.first.split(QLatin1Char(' ')); - CollectionNode* cn = qdb_->addQmlModule(blankSplit[0]); + CollectionNode *cn = qdb_->addQmlModule(blankSplit[0]); cn->setLogicalModuleInfo(blankSplit); cn->setLocation(doc.startLocation()); cn->markSeen(); @@ -313,7 +313,7 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc, } else if (command == COMMAND_JSMODULE) { QStringList blankSplit = arg.first.split(QLatin1Char(' ')); - CollectionNode* cn = qdb_->addJsModule(blankSplit[0]); + CollectionNode *cn = qdb_->addJsModule(blankSplit[0]); cn->setLogicalModuleInfo(blankSplit); cn->setLocation(doc.startLocation()); cn->markSeen(); @@ -339,14 +339,14 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc, else if (t == "attribution") ptype = Node::AttributionPage; } - PageNode* pn = new PageNode(qdb_->primaryTreeRoot(), args[0], ptype); + PageNode *pn = new PageNode(qdb_->primaryTreeRoot(), args[0], ptype); pn->setLocation(doc.startLocation()); return pn; } else if (command == COMMAND_QMLTYPE) { QmlTypeNode *qcn = nullptr; Node *candidate = qdb_->primaryTreeRoot()->findChildNode(arg.first, Node::QML); if (candidate != nullptr && candidate->isQmlType()) - qcn = static_cast<QmlTypeNode*>(candidate); + qcn = static_cast<QmlTypeNode *>(candidate); else qcn = new QmlTypeNode(qdb_->primaryTreeRoot(), arg.first); qcn->setLocation(doc.startLocation()); @@ -355,17 +355,17 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc, QmlTypeNode *qcn = nullptr; Node *candidate = qdb_->primaryTreeRoot()->findChildNode(arg.first, Node::JS); if (candidate != nullptr && candidate->isJsType()) - qcn = static_cast<QmlTypeNode*>(candidate); + qcn = static_cast<QmlTypeNode *>(candidate); else qcn = new QmlTypeNode(qdb_->primaryTreeRoot(), arg.first, Node::JsType); qcn->setLocation(doc.startLocation()); return qcn; } else if (command == COMMAND_QMLBASICTYPE) { - QmlBasicTypeNode* n = new QmlBasicTypeNode(qdb_->primaryTreeRoot(), arg.first); + QmlBasicTypeNode *n = new QmlBasicTypeNode(qdb_->primaryTreeRoot(), arg.first); n->setLocation(doc.startLocation()); return n; } else if (command == COMMAND_JSBASICTYPE) { - QmlBasicTypeNode* n = new QmlBasicTypeNode(qdb_->primaryTreeRoot(), arg.first, Node::JsBasicType); + QmlBasicTypeNode *n = new QmlBasicTypeNode(qdb_->primaryTreeRoot(), arg.first, Node::JsBasicType); n->setLocation(doc.startLocation()); return n; } @@ -401,11 +401,11 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc, \note The two QML types \e{Component} and \e{QtObject} never have a module qualifier. */ -bool CppCodeParser::splitQmlPropertyArg(const QString& arg, - QString& type, - QString& module, - QString& qmlTypeName, - QString& name, +bool CppCodeParser::splitQmlPropertyArg(const QString &arg, + QString &type, + QString &module, + QString &qmlTypeName, + QString &name, const Location &location) { QStringList blankSplit = arg.split(QLatin1Char(' ')); @@ -438,7 +438,7 @@ bool CppCodeParser::splitQmlPropertyArg(const QString& arg, */ void CppCodeParser::processQmlProperties(const Doc &doc, NodeList &nodes, DocList &docs) { - const TopicList& topics = doc.topicsUsed(); + const TopicList &topics = doc.topicsUsed(); if (topics.isEmpty()) return; @@ -458,11 +458,11 @@ void CppCodeParser::processQmlProperties(const Doc &doc, NodeList &nodes, DocLis group = property.left(i); } - QmlTypeNode* qmlType = qdb_->findQmlType(module, qmlTypeName); + QmlTypeNode *qmlType = qdb_->findQmlType(module, qmlTypeName); if (qmlType == nullptr) qmlType = new QmlTypeNode(qdb_->primaryTreeRoot(), qmlTypeName); - SharedCommentNode* scn = nullptr; + SharedCommentNode *scn = nullptr; if (topics.size() > 1) { scn = new SharedCommentNode(qmlType, topics.size(), group); scn->setLocation(doc.startLocation()); @@ -491,7 +491,7 @@ void CppCodeParser::processQmlProperties(const Doc &doc, NodeList &nodes, DocLis doc.startLocation().warning(msg); continue; } - QmlPropertyNode* qpn = new QmlPropertyNode(qmlType, property, type, attached); + QmlPropertyNode *qpn = new QmlPropertyNode(qmlType, property, type, attached); if (scn != nullptr) qpn->setSharedCommentNode(scn); qpn->setLocation(doc.startLocation()); @@ -512,7 +512,7 @@ void CppCodeParser::processQmlProperties(const Doc &doc, NodeList &nodes, DocLis Returns the set of strings representing the common metacommands plus some other metacommands. */ -const QSet<QString>& CppCodeParser::metaCommands() +const QSet<QString> &CppCodeParser::metaCommands() { return metaCommands_; } @@ -532,7 +532,7 @@ void CppCodeParser::processMetaCommand(const Doc &doc, QString arg = argLocPair.first; if (command == COMMAND_INHEADERFILE) { if (node->isAggregate()) - static_cast<Aggregate*>(node)->addIncludeFile(arg); + static_cast<Aggregate *>(node)->addIncludeFile(arg); else doc.location().warning(tr("Ignored '\\%1'").arg(COMMAND_INHEADERFILE)); } @@ -544,16 +544,16 @@ void CppCodeParser::processMetaCommand(const Doc &doc, in Aggregate::normalizeOverloads(). */ if (node->isFunction()) - static_cast<FunctionNode*>(node)->setOverloadFlag(); + static_cast<FunctionNode *>(node)->setOverloadFlag(); else if (node->isSharedCommentNode()) - static_cast<SharedCommentNode*>(node)->setOverloadFlags(); + static_cast<SharedCommentNode *>(node)->setOverloadFlags(); else doc.location().warning(tr("Ignored '\\%1'").arg(COMMAND_OVERLOAD)); } else if (command == COMMAND_REIMP) { if (node->parent() && !node->parent()->isInternal()) { if (node->isFunction()) { - FunctionNode *fn = static_cast<FunctionNode*>(node); + FunctionNode *fn = static_cast<FunctionNode *>(node); // The clang visitor class will have set the // qualified name of the ovverridden function. // If the name of the overridden function isn't @@ -628,13 +628,13 @@ void CppCodeParser::processMetaCommand(const Doc &doc, if (node->name() == arg) doc.location().warning(tr("%1 tries to inherit itself").arg(arg)); else if (node->isQmlType() || node->isJsType()) { - QmlTypeNode* qmlType = static_cast<QmlTypeNode*>(node); + QmlTypeNode *qmlType = static_cast<QmlTypeNode *>(node); qmlType->setQmlBaseName(arg); } } else if (command == COMMAND_QMLINSTANTIATES) { if (node->isQmlType() || node->isJsType()) { - ClassNode* classNode = qdb_->findClassNode(arg.split("::")); + ClassNode *classNode = qdb_->findClassNode(arg.split("::")); if (classNode) node->setClassNode(classNode); else @@ -690,7 +690,7 @@ void CppCodeParser::processMetaCommand(const Doc &doc, if (!node->setTitle(arg)) doc.location().warning(tr("Ignored '\\%1'").arg(COMMAND_TITLE)); else if (node->isExample()) - qdb_->addExampleNode(static_cast<ExampleNode*>(node)); + qdb_->addExampleNode(static_cast<ExampleNode *>(node)); } else if (command == COMMAND_SUBTITLE) { if (!node->setSubtitle(arg)) doc.location().warning(tr("Ignored '\\%1'").arg(COMMAND_SUBTITLE)); @@ -797,7 +797,7 @@ FunctionNode *CppCodeParser::parseMacroArg(const Location &location, const QStri if (leftParenSplit.isEmpty()) return nullptr; QString macroName; - FunctionNode* oldMacroNode = nullptr; + FunctionNode *oldMacroNode = nullptr; QStringList blankSplit = leftParenSplit[0].split(' '); if (blankSplit.size() > 0) { macroName = blankSplit.last(); @@ -825,7 +825,7 @@ FunctionNode *CppCodeParser::parseMacroArg(const Location &location, const QStri FunctionNode::Metaness metaness = FunctionNode::MacroWithParams; if (params.isEmpty()) metaness = FunctionNode::MacroWithoutParams; - FunctionNode* macro = new FunctionNode(metaness, qdb_->primaryTreeRoot(), macroName); + FunctionNode *macro = new FunctionNode(metaness, qdb_->primaryTreeRoot(), macroName); macro->setAccess(Node::Public); macro->setLocation(location); macro->setReturnType(returnType); @@ -917,7 +917,7 @@ void CppCodeParser::setExampleFileLists(PageNode *pn) i = 0; foreach (const QString &imageFile, imageFiles) imageFiles[i++] = imageFile.mid(sizeOfBoringPartOfName); - ExampleNode* en = static_cast<ExampleNode*>(pn); + ExampleNode *en = static_cast<ExampleNode *>(pn); en->setFiles(exampleFiles); en->setImages(imageFiles); } @@ -989,7 +989,7 @@ void CppCodeParser::processTopicArgs(const Doc &doc, const QString &topic, NodeL docs.append(doc); } } else if (args.size() > 1) { - QVector<SharedCommentNode*> sharedCommentNodes; + QVector<SharedCommentNode *> sharedCommentNodes; ArgList::ConstIterator arg = args.constBegin(); while (arg != args.constEnd()) { node = nullptr; |