From 1beb7d176492c284640082e6c8d7b9b37d5ce0f0 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 26 Apr 2018 15:01:06 +0200 Subject: qdoc: Remove support for \compat command The \compat command is no longer needed in QDoc, and the code that supports it makes some parts of QDoc needlessly complex. This update removes it, along with the documentation for it in the QDoc manual. Change-Id: I249b571e24ff8c3530d1ae5dbb4fff9186dba49d Reviewed-by: Martin Smith --- src/qdoc/codeparser.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/qdoc/codeparser.cpp') diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp index 0e58606f4..373fc4d40 100644 --- a/src/qdoc/codeparser.cpp +++ b/src/qdoc/codeparser.cpp @@ -40,7 +40,6 @@ QT_BEGIN_NAMESPACE -#define COMMAND_COMPAT Doc::alias(QLatin1String("compat")) #define COMMAND_DEPRECATED Doc::alias(QLatin1String("deprecated")) // ### don't document #define COMMAND_INGROUP Doc::alias(QLatin1String("ingroup")) #define COMMAND_INMODULE Doc::alias(QLatin1String("inmodule")) // ### don't document @@ -191,8 +190,7 @@ static QSet commonMetaCommands_; const QSet& CodeParser::commonMetaCommands() { if (commonMetaCommands_.isEmpty()) { - commonMetaCommands_ << COMMAND_COMPAT - << COMMAND_DEPRECATED + commonMetaCommands_ << COMMAND_DEPRECATED << COMMAND_INGROUP << COMMAND_INMODULE << COMMAND_INQMLMODULE @@ -226,11 +224,7 @@ void CodeParser::processCommonMetaCommand(const Location& location, const ArgLocPair& arg, Node* node) { - if (command == COMMAND_COMPAT) { - location.warning(tr("\\compat command used, but Qt3 compatibility is no longer supported")); - node->setStatus(Node::Compat); - } - else if (command == COMMAND_DEPRECATED) { + if (command == COMMAND_DEPRECATED) { node->setStatus(Node::Obsolete); } else if ((command == COMMAND_INGROUP) || (command == COMMAND_INPUBLICGROUP)) { -- cgit v1.2.3