diff options
author | Thibaut Cuvelier <cuvelier.thibaut@gmail.com> | 2019-11-13 12:31:52 +0100 |
---|---|---|
committer | Thibaut Cuvelier <cuvelier.thibaut@gmail.com> | 2019-11-13 15:26:10 +0100 |
commit | 0dec9c48e3ad47dc7673399e9115b1ca083feb21 (patch) | |
tree | a7d3a1b1c1c3ff85634ad4f902953dd109fa926c | |
parent | 81c9949541c6663d2ab719a8cff5a0b68d2c4406 (diff) |
Change spaces to follow coding rules
Change-Id: I81de861e9daa00249c47ddbe259f43f47d7c6615
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r-- | src/qdoc/atom.h | 6 | ||||
-rw-r--r-- | src/qdoc/clangcodeparser.h | 2 | ||||
-rw-r--r-- | src/qdoc/cppcodeparser.h | 6 | ||||
-rw-r--r-- | src/qdoc/generator.cpp | 6 | ||||
-rw-r--r-- | src/qdoc/generator.h | 2 | ||||
-rw-r--r-- | src/qdoc/node.h | 12 | ||||
-rw-r--r-- | src/qdoc/parameters.h | 10 | ||||
-rw-r--r-- | src/qdoc/puredocparser.h | 2 | ||||
-rw-r--r-- | src/qdoc/qdocdatabase.h | 22 | ||||
-rw-r--r-- | src/qdoc/qdocindexfiles.h | 4 | ||||
-rw-r--r-- | src/qdoc/qdoctagfiles.h | 4 | ||||
-rw-r--r-- | src/qdoc/sections.h | 14 | ||||
-rw-r--r-- | src/qdoc/tree.h | 10 |
13 files changed, 50 insertions, 50 deletions
diff --git a/src/qdoc/atom.h b/src/qdoc/atom.h index 70a639158..9ad1d2b7a 100644 --- a/src/qdoc/atom.h +++ b/src/qdoc/atom.h @@ -198,7 +198,7 @@ public: virtual const QString &error() { return noError_; } virtual void resolveSquareBracketParams() { } - protected: +protected: static QString noError_; Atom *next_; AtomType type_; @@ -207,7 +207,7 @@ public: class LinkAtom : public Atom { - public: +public: LinkAtom(const QString &p1, const QString &p2); LinkAtom(const LinkAtom &t); LinkAtom(Atom *previous, const LinkAtom &t); @@ -221,7 +221,7 @@ class LinkAtom : public Atom const QString &error() override { return error_; } void resolveSquareBracketParams() override; - protected: +protected: bool resolved_; Node::Genus genus_; Node::NodeType goal_; diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/clangcodeparser.h index e0ca2fba1..b47c5f79c 100644 --- a/src/qdoc/clangcodeparser.h +++ b/src/qdoc/clangcodeparser.h @@ -63,7 +63,7 @@ public: void precompileHeaders() override; Node *parseFnArg(const Location &location, const QString &fnArg) override; - private: +private: void getDefaultArgs(); bool getMoreArgs(); void buildPCH(); diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h index c6d6ca788..d6b1cead0 100644 --- a/src/qdoc/cppcodeparser.h +++ b/src/qdoc/cppcodeparser.h @@ -85,15 +85,15 @@ protected: void processTopicArgs(const Doc &doc, const QString &topic, NodeList &nodes, DocList &docs); bool hasTooManyTopics(const Doc &doc) const; - private: +private: void setExampleFileLists(PageNode *pn); - protected: +protected: typedef bool (Node::*NodeTypeTestFunc) () const; QMap<QString, NodeTypeTestFunc> nodeTypeTestFuncMap_; QMap<QString, Node::NodeType> nodeTypeMap_; - private: +private: static QStringList exampleFiles; static QStringList exampleDirs; static QSet<QString> excludeDirs; diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index fb02f3cc9..39c629465 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1235,14 +1235,14 @@ void Generator::generateDocumentation(Node *node) */ void Generator::generateMaintainerList(const Aggregate *node, CodeMarker *marker) { - QStringList sl = getMetadataElements(node,"maintainer"); + QStringList sl = getMetadataElements(node, "maintainer"); if (!sl.isEmpty()) { Text text; text << Atom::ParaLeft - << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD) + << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD) << "Maintained by: " - << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD); + << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD); for (int i = 0; i < sl.size(); ++i) text << sl.at(i) << separator(i, sl.size()); diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h index f9bb4d53b..f90c82315 100644 --- a/src/qdoc/generator.h +++ b/src/qdoc/generator.h @@ -239,7 +239,7 @@ private: const QString &configVar, const QString &subDir); - protected: +protected: const Config *config_; QDocDatabase *qdb_; bool inLink_; diff --git a/src/qdoc/node.h b/src/qdoc/node.h index 0b6eb9e62..baec4d9f2 100644 --- a/src/qdoc/node.h +++ b/src/qdoc/node.h @@ -426,10 +426,10 @@ public: void setOutputFileName(const QString &f) override { outputFileName_ = f; } QString outputFileName() const override { return outputFileName_; } - protected: +protected: friend class Node; - protected: +protected: bool noAutoList_; QString title_; QString subtitle_; @@ -508,7 +508,7 @@ private: void adoptFunction(FunctionNode *fn); static bool isSameSignature(const FunctionNode *f1, const FunctionNode *f2); - protected: +protected: NodeList children_; NodeList relatedByProxy_; @@ -518,14 +518,14 @@ private: NodeMap nonfunctionMap_; NodeList nonfunctionList_; - protected: +protected: int functionCount_; FunctionMap functionMap_; }; class ProxyNode : public Aggregate { - public: +public: ProxyNode(Aggregate *parent, const QString &name); bool docMustBeGenerated() const override { return true; } bool isRelatableType() const override { return true; } @@ -634,7 +634,7 @@ public: PropertyNode *findOverriddenProperty(const FunctionNode *fn); bool docMustBeGenerated() const override; - private: +private: void promotePublicBases(const QList<RelatedClass> &bases); private: diff --git a/src/qdoc/parameters.h b/src/qdoc/parameters.h index db704426f..dcd4517eb 100644 --- a/src/qdoc/parameters.h +++ b/src/qdoc/parameters.h @@ -41,7 +41,7 @@ class CodeChunk; class Parameter { - public: +public: Parameter() {} Parameter(const QString &type, const QString &name = QString(), @@ -65,7 +65,7 @@ class Parameter QString signature(bool includeValue = false) const; - public: +public: QString type_; QString name_; QString defaultValue_; @@ -75,7 +75,7 @@ typedef QVector<Parameter> ParameterVector; class Parameters { - public: +public: Parameters(); Parameters(const QString &signature); @@ -102,7 +102,7 @@ class Parameters void getTypeAndNameList(QString &out) const; bool match(const Parameters ¶meters) const; - private: +private: void readToken(); QString lexeme(); QString previousLexeme(); @@ -112,7 +112,7 @@ class Parameters bool matchParameter(); bool parse(const QString &signature); - private: +private: static QRegExp varComment_; bool valid_; diff --git a/src/qdoc/puredocparser.h b/src/qdoc/puredocparser.h index 7d814e982..67824f399 100644 --- a/src/qdoc/puredocparser.h +++ b/src/qdoc/puredocparser.h @@ -48,7 +48,7 @@ public: static PureDocParser *pureDocParser() { return pureParser_; } - private: +private: bool processQdocComments(); static PureDocParser *pureParser_; Tokenizer *tokenizer_; diff --git a/src/qdoc/qdocdatabase.h b/src/qdoc/qdocdatabase.h index 28b1cea83..1ff3aff15 100644 --- a/src/qdoc/qdocdatabase.h +++ b/src/qdoc/qdocdatabase.h @@ -54,7 +54,7 @@ enum FindFlag { class QDocForest { - private: +private: friend class QDocDatabase; QDocForest(QDocDatabase *qdb) : qdb_(qdb), primaryTree_(nullptr), currentIndex_(0) { } @@ -197,7 +197,7 @@ class QDocForest void setPrimaryTree(const QString &t); NamespaceNode *newIndexTree(const QString &module); - private: +private: QDocDatabase *qdb_; Tree *primaryTree_; int currentIndex_; @@ -211,7 +211,7 @@ class QDocDatabase { Q_DECLARE_TR_FUNCTIONS(QDoc::QDocDatabase) - public: +public: static QDocDatabase *qdocDB(); static void destroyQdocDB(); ~QDocDatabase(); @@ -261,7 +261,7 @@ class QDocDatabase static NodeMapMap &newQmlTypeMaps() { return newQmlTypeMaps_; } static NodeMultiMapMap &newSinceMaps() { return newSinceMaps_; } - private: +private: void findAllClasses(Aggregate *node) { node->findAllClasses(); } void findAllFunctions(Aggregate *node) { node->findAllFunctions(functionIndex_); } void findAllAttributions(Aggregate *node) { node->findAllAttributions(attributions_); } @@ -269,7 +269,7 @@ class QDocDatabase void findAllObsoleteThings(Aggregate *node) { node->findAllObsoleteThings(); } void findAllSince(Aggregate *node) { node->findAllSince(); } - public: +public: /******************************************************************* special collection access functions ********************************************************************/ @@ -334,7 +334,7 @@ class QDocDatabase FunctionNode *findFunctionNodeForTag(QString tag) { return primaryTree()->findFunctionNodeForTag(tag); } FunctionNode *findMacroNode(const QString &t) { return primaryTree()->findMacroNode(t); } - private: +private: const Node *findNodeForTarget(QStringList &targetPath, const Node *relative, Node::Genus genus, @@ -349,7 +349,7 @@ class QDocDatabase } /*******************************************************************/ - public: +public: void addPropertyFunction(PropertyNode *property, const QString &funcName, PropertyNode::FunctionRole funcRole) { @@ -402,7 +402,7 @@ class QDocDatabase void resolveProxies(); void resolveBaseClasses(); - private: +private: friend class Tree; const Node *findNode(const QStringList &path, @@ -415,16 +415,16 @@ class QDocDatabase bool isLoaded(const QString &t) { return forest_.isLoaded(t); } static void initializeDB(); - private: +private: QDocDatabase(); QDocDatabase(QDocDatabase const &) : showInternal_(false), forest_(this) { } QDocDatabase& operator=(QDocDatabase const &); - public: +public: static bool debug; Tree *primaryTree() { return forest_.primaryTree(); } - private: +private: static QDocDatabase *qdocDB_; static NodeMap typeNodeMap_; static NodeMultiMap obsoleteClasses_; diff --git a/src/qdoc/qdocindexfiles.h b/src/qdoc/qdocindexfiles.h index a93df774a..0e758049a 100644 --- a/src/qdoc/qdocindexfiles.h +++ b/src/qdoc/qdocindexfiles.h @@ -56,7 +56,7 @@ class QDocIndexFiles friend class QDocDatabase; friend class WebXMLGenerator; // for using generateIndexSections() - private: +private: static QDocIndexFiles* qdocIndexFiles(); static void destroyQDocIndexFiles(); @@ -75,7 +75,7 @@ class QDocIndexFiles bool generateIndexSection(QXmlStreamWriter &writer, Node *node, IndexSectionWriter *post = nullptr); void generateIndexSections(QXmlStreamWriter &writer, Node *node, IndexSectionWriter *post = nullptr); - private: +private: static QDocIndexFiles* qdocIndexFiles_; QDocDatabase *qdb_; Generator *gen_; diff --git a/src/qdoc/qdoctagfiles.h b/src/qdoc/qdoctagfiles.h index e1b8b5f73..05ad628d4 100644 --- a/src/qdoc/qdoctagfiles.h +++ b/src/qdoc/qdoctagfiles.h @@ -41,7 +41,7 @@ class QDocTagFiles { friend class QDocDatabase; - private: +private: static QDocTagFiles *qdocTagFiles(); static void destroyQDocTagFiles(); @@ -52,7 +52,7 @@ class QDocTagFiles void generateTagFileMembers(QXmlStreamWriter &writer, const Aggregate *inner); void generateTagFile(const QString &fileName, Generator *g); - private: +private: static QDocTagFiles *qdocTagFiles_; QDocDatabase *qdb_; Generator *gen_; diff --git a/src/qdoc/sections.h b/src/qdoc/sections.h index 92c2cdd2b..d9aeeb28f 100644 --- a/src/qdoc/sections.h +++ b/src/qdoc/sections.h @@ -45,11 +45,11 @@ typedef QList<ClassKeysNodes *> ClassKeysNodesList; class Section { - public: +public: enum Style { Summary, Details, AllMembers, Accessors }; enum Status { Obsolete, Active }; - public: +public: Section() : style_(Details), status_(Active), aggregate_(nullptr) { } Section(Style style, Status status); ~Section(); @@ -108,10 +108,10 @@ class Section const Aggregate *aggregate() const { return aggregate_; } void setAggregate(Aggregate *t) { aggregate_ = t; } - private: +private: QString sortName(const Node *node, const QString *name = nullptr); - private: +private: Style style_; Status status_; QString title_; @@ -139,7 +139,7 @@ typedef QVector<const Section *> SectionPtrVector; class Sections { - public: +public: enum VectorIndex { AllMembers = 0, PublicTypes = 0, @@ -228,7 +228,7 @@ class Sections Aggregate *aggregate() const { return aggregate_; } - private: +private: void stdRefPageSwitch(SectionVector &v, Node *n, Node *t = nullptr); void distributeNodeInSummaryVector(SectionVector &sv, Node *n); void distributeNodeInDetailsVector(SectionVector &dv, Node *n); @@ -236,7 +236,7 @@ class Sections void distributeQmlNodeInSummaryVector(SectionVector &sv, Node *n, bool sharing = false); void initAggregate(SectionVector &v, Aggregate *aggregate); - private: +private: Aggregate *aggregate_; static SectionVector stdSummarySections_; diff --git a/src/qdoc/tree.h b/src/qdoc/tree.h index b9b507f97..0d56425dc 100644 --- a/src/qdoc/tree.h +++ b/src/qdoc/tree.h @@ -44,7 +44,7 @@ class QDocDatabase; struct TargetRec { - public: +public: enum TargetType { Unknown, Target, Keyword, Contents, Class, Function, Page, Subtitle }; TargetRec(const QString &name, @@ -71,7 +71,7 @@ struct TargetRec struct TargetLoc { - public: +public: TargetLoc(const Node *loc, const QString &t, const QString &fileName, const QString &text, bool broken) : loc_(loc), target_(t), fileName_(fileName), text_(text), broken_(broken) { } const Node *loc_; @@ -93,14 +93,14 @@ class Tree friend class QDocForest; friend class QDocDatabase; - private: // Note the constructor and destructor are private. +private: // Note the constructor and destructor are private. typedef QMap<PropertyNode::FunctionRole, QString> RoleMap; typedef QMap<PropertyNode *, RoleMap> PropertyMap; Tree(const QString &camelCaseModuleName, QDocDatabase *qdb); ~Tree(); - public: // Of necessity, a few public functions remain. +public: // Of necessity, a few public functions remain. const QString &camelCaseModuleName() const { return camelCaseModuleName_; } const QString &physicalModuleName() const { return physicalModuleName_; } const QString &indexFileName() const { return indexFileName_; } @@ -114,7 +114,7 @@ class Tree void addToDontDocumentMap(QString &arg); void markDontDocumentNodes(); - private: // The rest of the class is private. +private: // The rest of the class is private. Aggregate *findAggregate(const QString &name); Node *findNodeForInclude(const QStringList &path) const; ClassNode *findClassNode(const QStringList &path, const Node *start = nullptr) const; |