QDoc: Format according to style

Run clang-format across QDoc, this is the result.

Change-Id: Iaabad0a07a0495990013cbf5995c65db531a7d0d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

9 files changed, 25 insertions, 29 deletions

diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index 169cfc568..89ef4f067 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -155,8 +155,7 @@ static QStringList getTemplateParameters(CXCursor cursor)
 static QString templateDecl(CXCursor cursor)
 {
     QStringList params = getTemplateParameters(cursor);
-    return QLatin1String("template <") + params.join(QLatin1String(", ")) +
-           QLatin1Char('>');
+    return QLatin1String("template <") + params.join(QLatin1String(", ")) + QLatin1Char('>');
 }
 
 /*!
@@ -690,8 +689,8 @@ CXChildVisitResult ClangVisitor::visitHeader(CXCursor cursor, CXSourceLocation l
         auto classe = static_cast<ClassNode *>(parent_);
         if (baseNode == nullptr || !baseNode->isClassNode()) {
             QString bcName = reconstructQualifiedPathForCursor(baseCursor);
-            classe->addUnresolvedBaseClass(access,
-                bcName.split(QLatin1String("::"), QString::SkipEmptyParts), bcName);
+            classe->addUnresolvedBaseClass(
+                    access, bcName.split(QLatin1String("::"), QString::SkipEmptyParts), bcName);
             return CXChildVisit_Continue;
         }
         auto baseClasse = static_cast<ClassNode *>(baseNode);
diff --git a/src/qdoc/codemarker.cpp b/src/qdoc/codemarker.cpp
index ab8b53039..070218b6e 100644
--- a/src/qdoc/codemarker.cpp
+++ b/src/qdoc/codemarker.cpp
@@ -66,9 +66,7 @@ CodeMarker::~CodeMarker()
   A code market performs no initialization by default. Marker-specific
   initialization is performed in subclasses.
  */
-void CodeMarker::initializeMarker()
-{
-}
+void CodeMarker::initializeMarker() {}
 
 /*!
   Terminating a code marker is trivial.
diff --git a/src/qdoc/config.h b/src/qdoc/config.h
index 36023b38a..151a8caee 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/config.h
@@ -50,7 +50,8 @@ class Singleton
 public:
     Singleton(const Singleton &) = delete;
     Singleton &operator=(const Singleton &) = delete;
-    static T &instance() {
+    static T &instance()
+    {
         static T instance;
         return instance;
     }
diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp
index 1720fbaeb..87a29be51 100644
--- a/src/qdoc/doc.cpp
+++ b/src/qdoc/doc.cpp
@@ -1375,7 +1375,7 @@ void DocParser::parse(const QString &source, DocPrivate *docPrivate,
                             // The QML and JS property group commands are no longer required
                             // for grouping QML and JS properties. They are allowed but ignored.
                             location().warning(tr("Unknown command '\\%1'").arg(cmdStr),
-                                               detailsUnknownCommand(metaCommandSet,cmdStr));
+                                               detailsUnknownCommand(metaCommandSet, cmdStr));
                         }
                         enterPara();
                         append(Atom::UnknownCommand, cmdStr);
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index fa442994e..3897b8519 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -394,7 +394,8 @@ QString Generator::fileBase(const Node *node) const
           to the file name. The suffix, if one exists, is appended to the
           module name.
         */
-        if (!node->logicalModuleName().isEmpty() && (!node->logicalModule()->isInternal() || showInternal_))
+        if (!node->logicalModuleName().isEmpty()
+            && (!node->logicalModule()->isInternal() || showInternal_))
             base.prepend(node->logicalModuleName() + outputSuffix(node) + QLatin1Char('-'));
 
         base.prepend(outputPrefix(node));
@@ -1261,8 +1262,9 @@ void Generator::generateReimplementsClause(const FunctionNode *fn, CodeMarker *m
                     text << "." << Atom::ParaRight;
                     generateText(text, fn, marker);
                 } else {
-                    fn->doc().location().warning(tr("Illegal \\reimp; no documented virtual function for %1")
-                                                    .arg(overrides->plainSignature()));
+                    fn->doc().location().warning(
+                            tr("Illegal \\reimp; no documented virtual function for %1")
+                                    .arg(overrides->plainSignature()));
                 }
                 return;
             }
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 70def56bf..0f84d9776 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -2138,7 +2138,7 @@ void HtmlGenerator::generateQmlRequisites(QmlTypeNode *qcn, CodeMarker *marker)
     // skip import statement of \internal collections
     if (!collection || !collection->isInternal() || showInternal_) {
         logicalModuleVersion =
-            collection ? collection->logicalModuleVersion() : qcn->logicalModuleVersion();
+                collection ? collection->logicalModuleVersion() : qcn->logicalModuleVersion();
 
         if (logicalModuleVersion.isEmpty() || qcn->logicalModuleName().isEmpty())
             qcn->doc().location().warning(tr("Could not resolve QML import "
@@ -2916,8 +2916,7 @@ void HtmlGenerator::generateQmlItem(const Node *node, const Node *relative, Code
 
     // Look for the _ character in the member name followed by a number (or n):
     // this is intended to be rendered as a subscript.
-    marked.replace(QRegExp("<@param>([a-z]+)_([0-9]+|n)</@param>"),
-                   "<i>\\1<sub>\\2</sub></i>");
+    marked.replace(QRegExp("<@param>([a-z]+)_([0-9]+|n)</@param>"), "<i>\\1<sub>\\2</sub></i>");
 
     // Replace some markup by HTML tags. Do both the opening and the closing tag
     // in one go (instead of <@param> and </@param> separately, for instance).
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index 38c567feb..0993f53f0 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -614,7 +614,7 @@ QString Node::plainFullName(const Node *relative) const
     while (node && !node->isHeader()) {
         parts.prepend(node->plainName());
         if (node->parent() == relative || node->parent()->name().isEmpty())
-          break;
+            break;
         node = node->parent();
     }
     return parts.join(QLatin1String("::"));
@@ -1060,11 +1060,10 @@ void Node::setSince(const QString &since)
         project = Config::dot + parts.first();
 
     QVersionNumber cutoff =
-        QVersionNumber::fromString(Config::instance().getString(
-            CONFIG_IGNORESINCE + project)).normalized();
+            QVersionNumber::fromString(Config::instance().getString(CONFIG_IGNORESINCE + project))
+                    .normalized();
 
-    if (!cutoff.isNull() &&
-        QVersionNumber::fromString(parts.last()).normalized() < cutoff)
+    if (!cutoff.isNull() && QVersionNumber::fromString(parts.last()).normalized() < cutoff)
         return;
 
     since_ = parts.join(QLatin1Char(' '));
@@ -2947,7 +2946,9 @@ void ClassNode::removePrivateAndInternalBases()
         ClassNode *bc = bases_.at(i).node_;
         if (bc == nullptr)
             bc = QDocDatabase::qdocDB()->findClassNode(bases_.at(i).path_);
-        if (bc != nullptr && (bc->isPrivate() || bc->isInternal() || bc->isDontDocument() || found.contains(bc))) {
+        if (bc != nullptr
+            && (bc->isPrivate() || bc->isInternal() || bc->isDontDocument()
+                || found.contains(bc))) {
             RelatedClass rc = bases_.at(i);
             bases_.removeAt(i);
             ignoredBases_.append(rc);
diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index ee93e8200..54a93f7e4 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -865,9 +865,7 @@ class EnumNode : public Node
 {
 public:
     EnumNode(Aggregate *parent, const QString &name, bool isScoped = false)
-    : Node(Enum, parent, name),
-    flagsType_(nullptr),
-    isScoped_(isScoped)
+        : Node(Enum, parent, name), flagsType_(nullptr), isScoped_(isScoped)
     {
     }
 
@@ -957,10 +955,7 @@ public:
         n->setSharedCommentNode(this);
         setGenus(n->genus());
     }
-    void sort()
-    {
-        std::sort(collective_.begin(), collective_.end(), Node::nodeNameLessThan);
-    }
+    void sort() { std::sort(collective_.begin(), collective_.end(), Node::nodeNameLessThan); }
     const QVector<Node *> &collective() const { return collective_; }
     void setOverloadFlags();
     void setRelatedNonmember(bool b) override;
diff --git a/src/qdoc/qmlmarkupvisitor.cpp b/src/qdoc/qmlmarkupvisitor.cpp
index b48b44a9f..d7b95fae7 100644
--- a/src/qdoc/qmlmarkupvisitor.cpp
+++ b/src/qdoc/qmlmarkupvisitor.cpp
@@ -244,7 +244,8 @@ bool QmlMarkupVisitor::visit(QQmlJS::AST::UiImport *uiimport)
 void QmlMarkupVisitor::endVisit(QQmlJS::AST::UiImport *uiimport)
 {
     if (uiimport->version)
-        addVerbatim(uiimport->version->firstSourceLocation(), uiimport->version->lastSourceLocation());
+        addVerbatim(uiimport->version->firstSourceLocation(),
+                    uiimport->version->lastSourceLocation());
     addVerbatim(uiimport->asToken);
     addMarkedUpToken(uiimport->importIdToken, QLatin1String("headerfile"));
     addVerbatim(uiimport->semicolonToken);