summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-02-06 06:51:36 +0100
committerPaul Wicking <paul.wicking@qt.io>2020-02-06 14:55:43 +0100
commit0ea6dae91934b0dcd00d5d0d5f4c9fb7dd2dfde6 (patch)
treecba1f7cbe87a6ec1519b9984fd1ed1a72337e48e
parent7767b21452e9f46408086d0ee6d7cc7be702b864 (diff)
QDoc: Remove compiler warnings
The DocBook generator overloads virtual methods inherited from Generator. As there is no overload resolution across scopes, add `using` declarations to silence compiler warnings (from clang-8) about hidden virtual function overloads ([-Woverloaded-virtual]). This patch also removes one unused private member ([-Wunused-private-field]). Change-Id: I9f1677b637138f607db626bbcde032ec71b20fe4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/qdoc/docbookgenerator.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/qdoc/docbookgenerator.h b/src/qdoc/docbookgenerator.h
index 540aa7586..0c74a1708 100644
--- a/src/qdoc/docbookgenerator.h
+++ b/src/qdoc/docbookgenerator.h
@@ -56,12 +56,19 @@ public:
protected:
QString fileExtension() const override;
void generateDocumentation(Node *node) override;
+ using Generator::generateCppReferencePage;
void generateCppReferencePage(Node *node);
+ using Generator::generatePageNode;
void generatePageNode(PageNode *pn);
+ using Generator::generateQmlTypePage;
void generateQmlTypePage(QmlTypeNode *qcn);
+ using Generator::generateQmlBasicTypePage;
void generateQmlBasicTypePage(QmlBasicTypeNode *qbtn);
+ using Generator::generateCollectionNode;
void generateCollectionNode(CollectionNode *cn);
+ using Generator::generateGenericCollectionPage;
void generateGenericCollectionPage(CollectionNode *cn);
+ using Generator::generateProxyPage;
void generateProxyPage(Aggregate *aggregate);
void generateList(QXmlStreamWriter &writer, const Node *relative, const QString &selector);
@@ -78,11 +85,14 @@ protected:
bool generateStatus(QXmlStreamWriter &writer, const Node *node);
bool generateThreadSafeness(QXmlStreamWriter &writer, const Node *node);
bool generateSince(QXmlStreamWriter &writer, const Node *node);
+ using Generator::generateBody;
void generateBody(QXmlStreamWriter &writer, const Node *node);
+ using Generator::generateText;
bool generateText(QXmlStreamWriter &writer, const Text &text, const Node *relative);
const Atom *generateAtomList(QXmlStreamWriter &writer, const Atom *atom, const Node *relative,
bool generate, int &numAtoms);
+ using Generator::generateAtom;
int generateAtom(QXmlStreamWriter &writer, const Atom *atom, const Node *relative);
private:
@@ -100,6 +110,7 @@ private:
void generateCompactList(QXmlStreamWriter &writer, ListType listType, const Node *relative,
const NodeMultiMap &nmm, const QString &commonPrefix,
const QString &selector);
+ using Generator::generateFileList;
void generateFileList(QXmlStreamWriter &writer, const ExampleNode *en, bool images);
void generateObsoleteMembers(QXmlStreamWriter &writer, const Sections &sections);
void generateObsoleteQmlMembers(QXmlStreamWriter &writer, const Sections &sections);
@@ -123,18 +134,22 @@ private:
void generateFullName(QXmlStreamWriter &writer, const Node *apparentNode,
const QString &fullName, const Node *actualNode);
void generateBrief(QXmlStreamWriter &writer, const Node *node);
+ using Generator::generateAlsoList;
void generateAlsoList(QXmlStreamWriter &writer, const Node *node);
static void generateSignatureList(QXmlStreamWriter &writer, const NodeList &nodes);
+ using Generator::generateMaintainerList;
void generateMaintainerList(QXmlStreamWriter &writer, const Aggregate *node);
void generateReimplementsClause(QXmlStreamWriter &writer, const FunctionNode *fn);
void generateClassHierarchy(QXmlStreamWriter &writer, const Node *relative, NodeMap &classMap);
void generateFunctionIndex(QXmlStreamWriter &writer, const Node *relative);
void generateLegaleseList(QXmlStreamWriter &writer, const Node *relative);
+ using Generator::generateExampleFilePage;
void generateExampleFilePage(const Node *en, const QString &file);
static void generateOverloadedSignal(QXmlStreamWriter &writer, const Node *node);
static void generatePrivateSignalNote(QXmlStreamWriter &writer);
static void generateInvokableNote(QXmlStreamWriter &writer, const Node *node);
void generateAssociatedPropertyNotes(QXmlStreamWriter &writer, const FunctionNode *fn);
+ using Generator::generateQmlText;
bool generateQmlText(QXmlStreamWriter &writer, const Text &text, const Node *relative);
void generateRequiredLinks(QXmlStreamWriter &writer, const Node *node);
void generateLinkToExample(QXmlStreamWriter &writer, const ExampleNode *en,
@@ -147,7 +162,6 @@ private:
const Node *relative);
void endLink(QXmlStreamWriter &writer);
- bool hasQuotingInformation {};
bool inListItemLineOpen {};
bool inLink {};
int currentSectionLevel {};