diff options
-rw-r--r-- | src/tools/qdoc/node.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index 5eeb7e7d3d..73b705dd0f 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -884,12 +884,24 @@ public: bool isOverload() const { return ove; } bool isReimp() const Q_DECL_OVERRIDE { return reimp; } bool isFunction() const Q_DECL_OVERRIDE { return true; } - virtual bool isQmlSignal() const Q_DECL_OVERRIDE { return genus() == Node::QML; } - virtual bool isJsSignal() const Q_DECL_OVERRIDE { return genus() == Node::JS; } - virtual bool isQmlSignalHandler() const Q_DECL_OVERRIDE { return genus() == Node::QML; } - virtual bool isJsSignalHandler() const Q_DECL_OVERRIDE { return genus() == Node::JS; } - virtual bool isQmlMethod() const Q_DECL_OVERRIDE { return genus() == Node::QML; } - virtual bool isJsMethod() const Q_DECL_OVERRIDE { return genus() == Node::JS; } + virtual bool isQmlSignal() const Q_DECL_OVERRIDE { + return (type() == Node::QmlSignal) && (genus() == Node::QML); + } + virtual bool isJsSignal() const Q_DECL_OVERRIDE { + return (type() == Node::QmlSignal) && (genus() == Node::JS); + } + virtual bool isQmlSignalHandler() const Q_DECL_OVERRIDE { + return (type() == Node::QmlSignalHandler) && (genus() == Node::QML); + } + virtual bool isJsSignalHandler() const Q_DECL_OVERRIDE { + return (type() == Node::QmlSignalHandler) && (genus() == Node::JS); + } + virtual bool isQmlMethod() const Q_DECL_OVERRIDE { + return (type() == Node::QmlMethod) && (genus() == Node::QML); + } + virtual bool isJsMethod() const Q_DECL_OVERRIDE { + return (type() == Node::QmlMethod) && (genus() == Node::JS); + } int overloadNumber() const; const QList<Parameter>& parameters() const { return params; } QStringList parameterNames() const; |