summaryrefslogtreecommitdiff
path: root/src/qdoc/clangcodeparser.h
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-01-05 14:36:07 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2018-01-05 14:09:39 +0000
commitd7bafcaf801cbcf246b4413ef5c91c7665475d7c (patch)
tree53768f6fad514b6f4ddc1d0e39a094010759a3ef /src/qdoc/clangcodeparser.h
parent0848d3f79a87c3e2055a7b435bfd4930ef06cf6e (diff)
downloadqttools-d7bafcaf801cbcf246b4413ef5c91c7665475d7c.tar.gz
qdoc: Fix processing for \macro and QML method/signal topic commands
Because processing these commands do not use clang, their implementation is moved from ClangCodeParser to CppCodeParser - this ensures that these topic commands are processed also when they appear in .qdoc files (PureDocParser, used for .qdoc, derives from CppCodeParser). Also, these functions did nothing when qdoc was running in prepare phase which in turn meant that they were not written to .index, thus breaking cross-module linking for macros/QML methods/signals. That check is now removed and the functions always do their thing. Change-Id: I8d9333b02092708955b619b573254eda5d82f038 Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/clangcodeparser.h')
-rw-r--r--src/qdoc/clangcodeparser.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/clangcodeparser.h
index 7d9cf31cf..c5a57416b 100644
--- a/src/qdoc/clangcodeparser.h
+++ b/src/qdoc/clangcodeparser.h
@@ -56,10 +56,6 @@ public:
virtual void parseSourceFile(const Location& location, const QString& filePath) Q_DECL_OVERRIDE;
virtual void precompileHeaders() Q_DECL_OVERRIDE;
virtual Node *parseFnArg(const Location &location, const QString &fnArg) Q_DECL_OVERRIDE;
- virtual Node *parseMacroArg(const Location &location, const QString &macroArg) Q_DECL_OVERRIDE;
- virtual Node *parseOtherFuncArg(const QString &topic,
- const Location &location,
- const QString &funcArg) Q_DECL_OVERRIDE;
private:
void getDefaultArgs();