summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-02-18 23:04:24 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-02-21 10:43:31 +0100
commit37a6641ba543ec5bd6d11bde9a2a71f58a32c295 (patch)
treed32a6ac1ff9d13622a984d10372563f977f47cdc
parent6df536b01de755ea47e55407e128dc5f59f35e87 (diff)
downloadqttools-37a6641ba543ec5bd6d11bde9a2a71f58a32c295.tar.gz
qdoc: Remove code for unimplemented command \pagekeywords
This undocumented command was storing a list of keywords in a node. Those keywords were never accessed. Task-number: QTBUG-82310 Change-Id: I144454667c78329a8a03ca81b9b90b047971d301 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/qdoc/codeparser.cpp10
-rw-r--r--src/qdoc/codeparser.h1
-rw-r--r--src/qdoc/cppcodeparser.cpp2
-rw-r--r--src/qdoc/node.cpp14
-rw-r--r--src/qdoc/node.h4
-rw-r--r--src/qdoc/qmlvisitor.cpp2
6 files changed, 5 insertions, 28 deletions
diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp
index e9dc3a352..1bf31b800 100644
--- a/src/qdoc/codeparser.cpp
+++ b/src/qdoc/codeparser.cpp
@@ -161,11 +161,11 @@ const QSet<QString> &CodeParser::commonMetaCommands()
<< COMMAND_INJSMODULE << COMMAND_INMODULE << COMMAND_INPUBLICGROUP
<< COMMAND_INQMLMODULE << COMMAND_INTERNAL << COMMAND_MAINCLASS
<< COMMAND_NOAUTOLIST << COMMAND_NONREENTRANT << COMMAND_OBSOLETE
- << COMMAND_PAGEKEYWORDS << COMMAND_PRELIMINARY << COMMAND_QMLABSTRACT
- << COMMAND_QMLDEFAULT << COMMAND_QMLINHERITS << COMMAND_QMLREADONLY
- << COMMAND_QTVARIABLE << COMMAND_REENTRANT << COMMAND_SINCE
- << COMMAND_STARTPAGE << COMMAND_SUBTITLE << COMMAND_THREADSAFE
- << COMMAND_TITLE << COMMAND_WRAPPER;
+ << COMMAND_PRELIMINARY << COMMAND_QMLABSTRACT << COMMAND_QMLDEFAULT
+ << COMMAND_QMLINHERITS << COMMAND_QMLREADONLY << COMMAND_QTVARIABLE
+ << COMMAND_REENTRANT << COMMAND_SINCE << COMMAND_STARTPAGE
+ << COMMAND_SUBTITLE << COMMAND_THREADSAFE << COMMAND_TITLE
+ << COMMAND_WRAPPER;
}
return commonMetaCommands_;
}
diff --git a/src/qdoc/codeparser.h b/src/qdoc/codeparser.h
index 6ab214eb1..7ae34df1d 100644
--- a/src/qdoc/codeparser.h
+++ b/src/qdoc/codeparser.h
@@ -137,7 +137,6 @@ private:
#define COMMAND_OBSOLETE Doc::alias(QLatin1String("obsolete"))
#define COMMAND_OVERLOAD Doc::alias(QLatin1String("overload"))
#define COMMAND_PAGE Doc::alias(QLatin1String("page"))
-#define COMMAND_PAGEKEYWORDS Doc::alias(QLatin1String("pagekeywords"))
#define COMMAND_PERMISSIONS Doc::alias(QLatin1String("permissions"))
#define COMMAND_PRELIMINARY Doc::alias(QLatin1String("preliminary"))
#define COMMAND_PREVIOUSPAGE Doc::alias(QLatin1String("previouspage"))
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index 877b08279..dec081c22 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -620,8 +620,6 @@ void CppCodeParser::processMetaCommand(const Doc &doc, const QString &command,
node->setSince(arg);
} else if (command == COMMAND_WRAPPER) {
node->setWrapper();
- } else if (command == COMMAND_PAGEKEYWORDS) {
- node->addPageKeywords(arg);
} else if (command == COMMAND_THREADSAFE) {
node->setThreadSafeness(Node::ThreadSafe);
} else if (command == COMMAND_TITLE) {
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index cffaf79dd..634cce3ec 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -1822,12 +1822,6 @@ QString Node::physicalModuleName() const
Returns the node's reconstituted brief data member.
*/
-/*! \fn void Node::addPageKeywords(const QString &t)
- If this is a PageNode, the function appends the string \a t
- to the page keywords data member. Otherwise the function does
- nothing.
- */
-
/*! \fn bool Node::isSharingComment() const
This function returns \c true if the node is sharing a comment
with other nodes. For example, multiple functions can be documented
@@ -3661,14 +3655,6 @@ bool PageNode::setTitle(const QString &title)
Appends \a t to the list of group names.
*/
-/*! \fn const QStringList &PageNode::pageKeywords() const
- Returns a const reference to the list of keywords for this page.
- */
-
-/*! \fn void PageNode::addPageKeywords(const QString &t)
- Appends \a t to the keywords list.
- */
-
/*! \fn void PageNode::setOutputFileName(const QString &f)
Sets this PageNode's output file name to \a f.
*/
diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index f1b356fa4..9f78cc824 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -322,7 +322,6 @@ public:
const QString &templateDecl() const { return templateDecl_; }
const QString &reconstitutedBrief() const { return reconstitutedBrief_; }
QString nodeSubtypeString() const;
- virtual void addPageKeywords(const QString &) {}
bool isSharingComment() const { return (sharedCommentNode_ != nullptr); }
bool hasSharedDoc() const;
@@ -434,8 +433,6 @@ public:
const QStringList &groupNames() const { return groupNames_; }
void appendGroupName(const QString &t) override { groupNames_.append(t); }
- const QStringList &pageKeywords() const { return pageKeywds_; }
- void addPageKeywords(const QString &t) override { pageKeywds_ << t; }
void setOutputFileName(const QString &f) override { outputFileName_ = f; }
QString outputFileName() const override { return outputFileName_; }
@@ -448,7 +445,6 @@ protected:
QString subtitle_;
QString outputFileName_;
QStringList groupNames_;
- QStringList pageKeywds_;
};
class ExternalPageNode : public PageNode
diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp
index 168c5e38d..2ee362d77 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qmlvisitor.cpp
@@ -453,8 +453,6 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::AST::SourceLocation, Node *node, D
node->setStatus(Node::Internal);
} else if (command == COMMAND_OBSOLETE) {
node->setStatus(Node::Obsolete);
- } else if (command == COMMAND_PAGEKEYWORDS) {
- // Not done yet. Do we need this?
} else if (command == COMMAND_PRELIMINARY) {
node->setStatus(Node::Preliminary);
} else if (command == COMMAND_SINCE) {