summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qdoc/codechunk.cpp24
-rw-r--r--src/qdoc/codechunk.h8
-rw-r--r--src/qdoc/cppcodeparser.cpp16
-rw-r--r--src/qdoc/cppcodeparser.h4
-rw-r--r--src/qdoc/generator.cpp26
-rw-r--r--src/qdoc/generator.h14
-rw-r--r--src/qdoc/puredocparser.cpp18
-rw-r--r--src/qdoc/puredocparser.h10
8 files changed, 16 insertions, 104 deletions
diff --git a/src/qdoc/codechunk.cpp b/src/qdoc/codechunk.cpp
index 82aeaae0c..277622962 100644
--- a/src/qdoc/codechunk.cpp
+++ b/src/qdoc/codechunk.cpp
@@ -89,16 +89,6 @@ static int category( QChar ch )
return charCategory[static_cast<int>(ch.toLatin1())];
}
-CodeChunk::CodeChunk()
- : hotspot( -1 )
-{
-}
-
-CodeChunk::CodeChunk( const QString& str )
- : s( str ), hotspot( -1 )
-{
-}
-
void CodeChunk::append( const QString& lexeme )
{
if ( !s.isEmpty() && !lexeme.isEmpty() ) {
@@ -114,20 +104,6 @@ void CodeChunk::append( const QString& lexeme )
s += lexeme;
}
-void CodeChunk::appendHotspot()
-{
- /*
- The first hotspot is the right one.
- */
- if ( hotspot == -1 )
- hotspot = s.length();
-}
-
-QString CodeChunk::toString() const
-{
- return s;
-}
-
QStringList CodeChunk::toPath() const
{
QString t = s;
diff --git a/src/qdoc/codechunk.h b/src/qdoc/codechunk.h
index e7f103fa3..3889d2854 100644
--- a/src/qdoc/codechunk.h
+++ b/src/qdoc/codechunk.h
@@ -64,15 +64,15 @@ QT_BEGIN_NAMESPACE
class CodeChunk
{
public:
- CodeChunk();
- CodeChunk( const QString& str );
+ CodeChunk() : hotspot(-1) {}
+ CodeChunk(const QString& str) : s(str), hotspot(-1) {}
void append( const QString& lexeme );
- void appendHotspot();
+ void appendHotspot() { if (hotspot == -1) hotspot = s.length(); }
bool isEmpty() const { return s.isEmpty(); }
void clear() { s.clear(); }
- QString toString() const;
+ QString toString() const { return s; }
QStringList toPath() const;
QString left() const { return s.left(hotspot == -1 ? s.length() : hotspot); }
QString right() const { return s.mid(hotspot == -1 ? s.length() : hotspot); }
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index 20341b769..0904ebc4e 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -120,14 +120,6 @@ CppCodeParser::CppCodeParser()
}
/*!
- The destructor is trivial.
- */
-CppCodeParser::~CppCodeParser()
-{
- // nothing.
-}
-
-/*!
The constructor initializes a map of special node types
for identifying important nodes. And it initializes
some filters for identifying and excluding certain kinds of files.
@@ -184,14 +176,6 @@ void CppCodeParser::terminateParser()
}
/*!
- Returns "Cpp".
- */
-QString CppCodeParser::language()
-{
- return "Cpp";
-}
-
-/*!
Returns a list of extensions for header files.
*/
QStringList CppCodeParser::headerFileNameFilter()
diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h
index 1db389489..8964ef699 100644
--- a/src/qdoc/cppcodeparser.h
+++ b/src/qdoc/cppcodeparser.h
@@ -58,11 +58,11 @@ class CppCodeParser : public CodeParser
public:
CppCodeParser();
- ~CppCodeParser();
+ ~CppCodeParser() = default;
void initializeParser(const Config& config) override;
void terminateParser() override;
- QString language() override;
+ QString language() override { return QStringLiteral("Cpp"); }
QStringList headerFileNameFilter() override;
QStringList sourceFileNameFilter() override;
bool parseParameters(const QString& parameters, QVector<Parameter>& pvect, bool& isQPrivateSignal);
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index b58469ec0..9d234475f 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -724,13 +724,6 @@ void Generator::generateAlsoList(const Node *node, CodeMarker *marker)
}
}
-int Generator::generateAtom(const Atom * /* atom */,
- const Node * /* relative */,
- CodeMarker * /* marker */)
-{
- return 0;
-}
-
const Atom *Generator::generateAtomList(const Atom *atom,
const Node *relative,
CodeMarker *marker,
@@ -977,18 +970,6 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
}
}
-void Generator::generateCppReferencePage(Node* /* node */, CodeMarker* /* marker */)
-{
-}
-
-void Generator::generatePageNode(PageNode* /* pn */, CodeMarker* /* marker */)
-{
-}
-
-void Generator::generateCollectionNode(CollectionNode* , CodeMarker* )
-{
-}
-
/*!
This function is called when the documentation for an example is
being formatted. It outputs a list of files for the example, which
@@ -1247,13 +1228,6 @@ void Generator::generateQmlInheritedBy(const QmlTypeNode* qcn,
}
/*!
- */
-void Generator::generateQmlInherits(QmlTypeNode* , CodeMarker* )
-{
- // stub.
-}
-
-/*!
Extract sections of markup text surrounded by \e qmltext
and \e endqmltext and output them.
*/
diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h
index a58d83852..1c0126d77 100644
--- a/src/qdoc/generator.h
+++ b/src/qdoc/generator.h
@@ -111,19 +111,19 @@ protected:
virtual QString fileExtension() const = 0;
virtual void generateQAPage() { }
virtual void generateAlsoList(const Node *node, CodeMarker *marker);
- virtual int generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker);
+ virtual int generateAtom(const Atom *, const Node *, CodeMarker *) { return 0; }
virtual void generateBody(const Node *node, CodeMarker *marker);
- virtual void generateCppReferencePage(Node* node, CodeMarker* marker);
- virtual void generateQmlTypePage(QmlTypeNode* , CodeMarker* ) { }
- virtual void generateQmlBasicTypePage(QmlBasicTypeNode* , CodeMarker* ) { }
- virtual void generatePageNode(PageNode* pn, CodeMarker* marker);
- virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker);
+ virtual void generateCppReferencePage(Node *, CodeMarker *) {}
+ virtual void generateQmlTypePage(QmlTypeNode *, CodeMarker *) {}
+ virtual void generateQmlBasicTypePage(QmlBasicTypeNode *, CodeMarker *) {}
+ virtual void generatePageNode(PageNode *, CodeMarker *) {}
+ virtual void generateCollectionNode(CollectionNode *, CodeMarker *) {}
virtual void generateInheritedBy(const ClassNode *classe, CodeMarker *marker);
virtual void generateInherits(const ClassNode *classe, CodeMarker *marker);
virtual void generateDocumentation(Node* node);
virtual void generateMaintainerList(const Aggregate* node, CodeMarker* marker);
virtual void generateQmlInheritedBy(const QmlTypeNode* qcn, CodeMarker* marker);
- virtual void generateQmlInherits(QmlTypeNode* qcn, CodeMarker* marker);
+ virtual void generateQmlInherits(QmlTypeNode *, CodeMarker *) {}
virtual bool generateQmlText(const Text& text,
const Node *relative,
CodeMarker *marker,
diff --git a/src/qdoc/puredocparser.cpp b/src/qdoc/puredocparser.cpp
index c522b7180..cd3479f7f 100644
--- a/src/qdoc/puredocparser.cpp
+++ b/src/qdoc/puredocparser.cpp
@@ -42,23 +42,7 @@
QT_BEGIN_NAMESPACE
-PureDocParser *PureDocParser::pureParser_ = 0;
-
-/*!
- Constructs the pure doc parser.
-*/
-PureDocParser::PureDocParser()
-{
- pureParser_ = this;
-}
-
-/*!
- Destroys the pure doc parser.
- */
-PureDocParser::~PureDocParser()
-{
- pureParser_ = 0;
-}
+PureDocParser *PureDocParser::pureParser_ = nullptr;
/*!
Returns a list of the kinds of files that the pure doc
diff --git a/src/qdoc/puredocparser.h b/src/qdoc/puredocparser.h
index fdd4f50c6..60f20484c 100644
--- a/src/qdoc/puredocparser.h
+++ b/src/qdoc/puredocparser.h
@@ -26,15 +26,9 @@
**
****************************************************************************/
-/*
- puredocparser.h
-*/
-
#ifndef PUREDOCPARSER_H
#define PUREDOCPARSER_H
-#include <qset.h>
-
#include "cppcodeparser.h"
#include "location.h"
@@ -49,8 +43,8 @@ class PureDocParser : public CppCodeParser
Q_DECLARE_TR_FUNCTIONS(QDoc::PureDocParser)
public:
- PureDocParser();
- virtual ~PureDocParser();
+ PureDocParser() { pureParser_ = this; }
+ virtual ~PureDocParser() { pureParser_ = nullptr; }
QStringList sourceFileNameFilter() override;
void parseSourceFile(const Location& location, const QString& filePath) override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:13:24 +0000