diff options
Diffstat (limited to 'src/tools/qdoc/cppcodeparser.h')
| -rw-r--r-- | src/tools/qdoc/cppcodeparser.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/tools/qdoc/cppcodeparser.h b/src/tools/qdoc/cppcodeparser.h index 7499575d13d..f7a46b093ac 100644 --- a/src/tools/qdoc/cppcodeparser.h +++ b/src/tools/qdoc/cppcodeparser.h @@ -65,15 +65,15 @@ public: CppCodeParser(); ~CppCodeParser(); - virtual void initializeParser(const Config& config); - virtual void terminateParser(); - virtual QString language(); - virtual QStringList headerFileNameFilter(); - virtual QStringList sourceFileNameFilter(); - virtual void parseHeaderFile(const Location& location, const QString& filePath); - virtual void parseSourceFile(const Location& location, const QString& filePath); - virtual void doneParsingHeaderFiles(); - virtual void doneParsingSourceFiles(); + virtual void initializeParser(const Config& config) Q_DECL_OVERRIDE; + virtual void terminateParser() Q_DECL_OVERRIDE; + virtual QString language() Q_DECL_OVERRIDE; + virtual QStringList headerFileNameFilter() Q_DECL_OVERRIDE; + virtual QStringList sourceFileNameFilter() Q_DECL_OVERRIDE; + virtual void parseHeaderFile(const Location& location, const QString& filePath) Q_DECL_OVERRIDE; + virtual void parseSourceFile(const Location& location, const QString& filePath) Q_DECL_OVERRIDE; + virtual void doneParsingHeaderFiles() Q_DECL_OVERRIDE; + virtual void doneParsingSourceFiles() Q_DECL_OVERRIDE; protected: const QSet<QString>& topicCommands(); @@ -156,7 +156,7 @@ protected: int tok; Node::Access access; FunctionNode::Metaness metaness; - QString moduleName; + QString physicalModuleName; QStringList lastPath_; QRegExp varComment; QRegExp sep; @@ -234,6 +234,11 @@ protected: #define COMMAND_LICENSEDESCRIPTION Doc::alias("licensedescription") #define COMMAND_RELEASEDATE Doc::alias("releasedate") #define COMMAND_QTVARIABLE Doc::alias("qtvariable") +#define COMMAND_JSTYPE Doc::alias("jstype") +#define COMMAND_JSPROPERTY Doc::alias("jsproperty") +#define COMMAND_JSMETHOD Doc::alias("jsmethod") +#define COMMAND_JSSIGNAL Doc::alias("jssignal") +#define COMMAND_JSMODULE Doc::alias("jsmodule") QT_END_NAMESPACE |