diff options
Diffstat (limited to 'src/tools/qdoc/qmlvisitor.cpp')
| -rw-r--r-- | src/tools/qdoc/qmlvisitor.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/tools/qdoc/qmlvisitor.cpp b/src/tools/qdoc/qmlvisitor.cpp index 190c9f0444..1468683052 100644 --- a/src/tools/qdoc/qmlvisitor.cpp +++ b/src/tools/qdoc/qmlvisitor.cpp @@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE #define COMMAND_SINCE Doc::alias(QLatin1String("since")) #define COMMAND_WRAPPER Doc::alias(QLatin1String("wrapper")) +#define COMMAND_ABSTRACT Doc::alias(QLatin1String("abstract")) #define COMMAND_QMLABSTRACT Doc::alias(QLatin1String("qmlabstract")) #define COMMAND_QMLCLASS Doc::alias(QLatin1String("qmlclass")) #define COMMAND_QMLTYPE Doc::alias(QLatin1String("qmltype")) @@ -118,7 +119,7 @@ QmlDocVisitor::~QmlDocVisitor() */ QQmlJS::AST::SourceLocation QmlDocVisitor::precedingComment(quint32 offset) const { - QListIterator<QQmlJS::AST::SourceLocation> it(engine->comments()); + QVectorIterator<QQmlJS::AST::SourceLocation> it(engine->comments()); it.toBack(); while (it.hasPrevious()) { @@ -196,7 +197,7 @@ bool QmlDocVisitor::applyDocumentation(QQmlJS::AST::SourceLocation location, Nod const TopicList& topicsUsed = doc.topicsUsed(); NodeList nodes; Node* nodePassedIn = node; - InnerNode* parent = nodePassedIn->parent(); + Aggregate* parent = nodePassedIn->parent(); node->setDoc(doc); nodes.append(node); if (topicsUsed.size() > 0) { @@ -497,7 +498,7 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::AST::SourceLocation, while (i != metacommands.end()) { QString command = *i; ArgList args = doc.metaCommandArgs(command); - if (command == COMMAND_QMLABSTRACT) { + if ((command == COMMAND_QMLABSTRACT) || (command == COMMAND_ABSTRACT)) { if (node->isQmlType() || node->isJsType()) { node->setAbstract(true); } @@ -751,14 +752,14 @@ bool QmlDocVisitor::visit(QQmlJS::AST::FunctionDeclaration* fd) if (current->isJsType()) qmlMethod->setGenus(Node::JS); int overloads = 0; - NodeList::ConstIterator overloadIterator = current->childNodes().constBegin(); - while (overloadIterator != current->childNodes().constEnd()) { - if ((*overloadIterator)->name() == name) + NodeList::ConstIterator i = current->childNodes().constBegin(); + while (i != current->childNodes().constEnd()) { + if ((*i)->name() == name) overloads++; - overloadIterator++; + i++; } if (overloads > 1) - qmlMethod->setOverload(true); + qmlMethod->setOverloadFlag(true); QList<Parameter> parameters; QQmlJS::AST::FormalParameterList* formals = fd->formals; if (formals) { |