diff options
Diffstat (limited to 'src/tools')
25 files changed, 667 insertions, 667 deletions
diff --git a/src/tools/qdoc/atom.h b/src/tools/qdoc/atom.h index 2eb34a042b..859ea3e740 100644 --- a/src/tools/qdoc/atom.h +++ b/src/tools/qdoc/atom.h @@ -215,12 +215,12 @@ class LinkAtom : public Atom LinkAtom(Atom* previous, const LinkAtom& t); virtual ~LinkAtom() { } - virtual bool isLinkAtom() const { return true; } - virtual Node::Genus genus() const { return genus_; } - virtual bool specifiesDomain() const { return (domain_ != 0); } - virtual Tree* domain() const { return domain_; } - virtual Node::Type goal() const { return goal_; } - virtual const QString& error() { return error_; } + virtual bool isLinkAtom() const Q_DECL_OVERRIDE { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return genus_; } + virtual bool specifiesDomain() const Q_DECL_OVERRIDE { return (domain_ != 0); } + virtual Tree* domain() const Q_DECL_OVERRIDE { return domain_; } + virtual Node::Type goal() const Q_DECL_OVERRIDE { return goal_; } + virtual const QString& error() Q_DECL_OVERRIDE { return error_; } protected: Node::Genus genus_; diff --git a/src/tools/qdoc/cppcodemarker.h b/src/tools/qdoc/cppcodemarker.h index ec2ee124d4..899c2018fe 100644 --- a/src/tools/qdoc/cppcodemarker.h +++ b/src/tools/qdoc/cppcodemarker.h @@ -50,29 +50,29 @@ public: CppCodeMarker(); ~CppCodeMarker(); - virtual bool recognizeCode(const QString& code); - virtual bool recognizeExtension(const QString& ext); - virtual bool recognizeLanguage(const QString& lang); - virtual Atom::Type atomType() const; + virtual bool recognizeCode(const QString& code) Q_DECL_OVERRIDE; + virtual bool recognizeExtension(const QString& ext) Q_DECL_OVERRIDE; + virtual bool recognizeLanguage(const QString& lang) Q_DECL_OVERRIDE; + virtual Atom::Type atomType() const Q_DECL_OVERRIDE; virtual QString markedUpCode(const QString& code, const Node *relative, - const Location &location); + const Location &location) Q_DECL_OVERRIDE; virtual QString markedUpSynopsis(const Node *node, const Node *relative, - SynopsisStyle style); - virtual QString markedUpQmlItem(const Node *node, bool summary); - virtual QString markedUpName(const Node *node); - virtual QString markedUpFullName(const Node *node, const Node *relative); - virtual QString markedUpEnumValue(const QString &enumValue, const Node *relative); - virtual QString markedUpIncludes(const QStringList& includes); - virtual QString functionBeginRegExp(const QString& funcName); - virtual QString functionEndRegExp(const QString& funcName); + SynopsisStyle style) Q_DECL_OVERRIDE; + virtual QString markedUpQmlItem(const Node *node, bool summary) Q_DECL_OVERRIDE; + virtual QString markedUpName(const Node *node) Q_DECL_OVERRIDE; + virtual QString markedUpFullName(const Node *node, const Node *relative) Q_DECL_OVERRIDE; + virtual QString markedUpEnumValue(const QString &enumValue, const Node *relative) Q_DECL_OVERRIDE; + virtual QString markedUpIncludes(const QStringList& includes) Q_DECL_OVERRIDE; + virtual QString functionBeginRegExp(const QString& funcName) Q_DECL_OVERRIDE; + virtual QString functionEndRegExp(const QString& funcName) Q_DECL_OVERRIDE; virtual QList<Section> sections(const InnerNode *innerNode, SynopsisStyle style, - Status status); + Status status) Q_DECL_OVERRIDE; virtual QList<Section> qmlSections(QmlClassNode* qmlClassNode, SynopsisStyle style, - Status status = Okay); + Status status = Okay) Q_DECL_OVERRIDE; private: QString addMarkUp(const QString& protectedCode, diff --git a/src/tools/qdoc/cppcodeparser.h b/src/tools/qdoc/cppcodeparser.h index 7499575d13..03b55c7775 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(); diff --git a/src/tools/qdoc/ditaxmlgenerator.h b/src/tools/qdoc/ditaxmlgenerator.h index 4514f19bc8..d2f445dd5b 100644 --- a/src/tools/qdoc/ditaxmlgenerator.h +++ b/src/tools/qdoc/ditaxmlgenerator.h @@ -290,11 +290,11 @@ public: DitaXmlGenerator(); ~DitaXmlGenerator(); - virtual void initializeGenerator(const Config& config); - virtual void terminateGenerator(); - virtual QString format(); - virtual bool canHandleFormat(const QString& format); - virtual void generateDocs(); + virtual void initializeGenerator(const Config& config) Q_DECL_OVERRIDE; + virtual void terminateGenerator() Q_DECL_OVERRIDE; + virtual QString format() Q_DECL_OVERRIDE; + virtual bool canHandleFormat(const QString& format) Q_DECL_OVERRIDE; + virtual void generateDocs() Q_DECL_OVERRIDE; QString protectEnc(const QString& string); static QString protect(const QString& string, const QString& encoding = "ISO-8859-1"); @@ -304,12 +304,12 @@ public: protected: virtual int generateAtom(const Atom* atom, const Node* relative, - CodeMarker* marker); - virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker); - virtual void generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* marker); - virtual void generateDocNode(DocNode* dn, CodeMarker* marker); - virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker); - virtual QString fileExtension() const; + CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateDocNode(DocNode* dn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual QString fileExtension() const Q_DECL_OVERRIDE; virtual QString guidForNode(const Node* node); virtual QString linkForNode(const Node* node, const Node* relative); @@ -394,8 +394,8 @@ private: void generateDetailedQmlMember(Node* node, const InnerNode* relative, CodeMarker* marker); - void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker); - void generateQmlInheritedBy(const QmlClassNode* qcn, CodeMarker* marker); + void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker) Q_DECL_OVERRIDE; + void generateQmlInheritedBy(const QmlClassNode* qcn, CodeMarker* marker) Q_DECL_OVERRIDE; void generateQmlInstantiates(QmlClassNode* qcn, CodeMarker* marker); void generateInstantiatedBy(ClassNode* cn, CodeMarker* marker); void generateQmlModuleDef(QmlClassNode* qcn); @@ -420,7 +420,7 @@ private: QString getAutoLink(const Atom *atom, const Node *relative, const Node** node); QString registerRef(const QString& ref); - virtual QString fileBase(const Node *node) const; + virtual QString fileBase(const Node *node) const Q_DECL_OVERRIDE; QString fileName(const Node *node); static int hOffset(const Node *node); static bool isThreeColumnEnumValueTable(const Atom *atom); @@ -434,9 +434,9 @@ private: QString lookupGuid(QString text); QString lookupGuid(const QString& fileName, const QString& text); GuidMap* lookupGuidMap(const QString& fileName); - virtual void beginSubPage(const InnerNode* node, const QString& fileName); - virtual void endSubPage(); - virtual void generateInnerNode(InnerNode* node); + virtual void beginSubPage(const InnerNode* node, const QString& fileName) Q_DECL_OVERRIDE; + virtual void endSubPage() Q_DECL_OVERRIDE; + virtual void generateInnerNode(InnerNode* node) Q_DECL_OVERRIDE; QXmlStreamWriter& xmlWriter(); void writeApiDesc(const Node* node, CodeMarker* marker, const QString& title); void addLink(const QString& href, const QStringRef& text, DitaTag t = DT_xref); diff --git a/src/tools/qdoc/doc.h b/src/tools/qdoc/doc.h index 1c13c0f026..72db2c882c 100644 --- a/src/tools/qdoc/doc.h +++ b/src/tools/qdoc/doc.h @@ -97,9 +97,9 @@ public: TopicRef() { } ~TopicRef(); - virtual bool isMapRef() const { return false; } - virtual const DitaRefList* subrefs() const { return &subrefs_; } - virtual void appendSubref(DitaRef* t) { subrefs_.append(t); } + virtual bool isMapRef() const Q_DECL_OVERRIDE { return false; } + virtual const DitaRefList* subrefs() const Q_DECL_OVERRIDE { return &subrefs_; } + virtual void appendSubref(DitaRef* t) Q_DECL_OVERRIDE { subrefs_.append(t); } private: DitaRefList subrefs_; @@ -111,7 +111,7 @@ public: MapRef() { } ~MapRef() { } - virtual bool isMapRef() const { return true; } + virtual bool isMapRef() const Q_DECL_OVERRIDE { return true; } }; class Doc diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h index f7625113f0..4d93822db1 100644 --- a/src/tools/qdoc/htmlgenerator.h +++ b/src/tools/qdoc/htmlgenerator.h @@ -77,10 +77,10 @@ public: HtmlGenerator(); ~HtmlGenerator(); - virtual void initializeGenerator(const Config& config); - virtual void terminateGenerator(); - virtual QString format(); - virtual void generateDocs(); + virtual void initializeGenerator(const Config& config) Q_DECL_OVERRIDE; + virtual void terminateGenerator() Q_DECL_OVERRIDE; + virtual QString format() Q_DECL_OVERRIDE; + virtual void generateDocs() Q_DECL_OVERRIDE; void generateManifestFiles(); QString protectEnc(const QString &string); @@ -89,18 +89,18 @@ public: static QString sinceTitle(int i) { return sinceTitles[i]; } protected: - virtual void generateQAPage(); + virtual void generateQAPage() Q_DECL_OVERRIDE; QString generateLinksToLinksPage(const QString& module, CodeMarker* marker); QString generateLinksToBrokenLinksPage(CodeMarker* marker, int& count); virtual int generateAtom(const Atom *atom, const Node *relative, - CodeMarker *marker); - virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker); - virtual void generateQmlTypePage(QmlClassNode* qcn, CodeMarker* marker); - virtual void generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* marker); - virtual void generateDocNode(DocNode* dn, CodeMarker* marker); - virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker); - virtual QString fileExtension() const; + CodeMarker *marker) Q_DECL_OVERRIDE; + virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateQmlTypePage(QmlClassNode* qcn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateDocNode(DocNode* dn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker) Q_DECL_OVERRIDE; + virtual QString fileExtension() const Q_DECL_OVERRIDE; virtual QString refForNode(const Node *node); virtual QString linkForNode(const Node *node, const Node *relative); @@ -183,7 +183,7 @@ private: void generateDetailedQmlMember(Node *node, const InnerNode *relative, CodeMarker *marker); - void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker); + void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker) Q_DECL_OVERRIDE; void generateQmlInstantiates(QmlClassNode* qcn, CodeMarker* marker); void generateInstantiatedBy(ClassNode* cn, CodeMarker* marker); @@ -214,7 +214,7 @@ private: QString getAutoLink(const Atom *atom, const Node *relative, const Node** node); QString registerRef(const QString& ref); - virtual QString fileBase(const Node *node) const; + virtual QString fileBase(const Node *node) const Q_DECL_OVERRIDE; QString fileName(const Node *node); static int hOffset(const Node *node); static bool isThreeColumnEnumValueTable(const Atom *atom); diff --git a/src/tools/qdoc/jscodemarker.h b/src/tools/qdoc/jscodemarker.h index 52fe8855af..70bf38d67d 100644 --- a/src/tools/qdoc/jscodemarker.h +++ b/src/tools/qdoc/jscodemarker.h @@ -50,14 +50,14 @@ public: JsCodeMarker(); ~JsCodeMarker(); - virtual bool recognizeCode(const QString &code); - virtual bool recognizeExtension(const QString &ext); - virtual bool recognizeLanguage(const QString &language); - virtual Atom::Type atomType() const; + virtual bool recognizeCode(const QString &code) Q_DECL_OVERRIDE; + virtual bool recognizeExtension(const QString &ext) Q_DECL_OVERRIDE; + virtual bool recognizeLanguage(const QString &language) Q_DECL_OVERRIDE; + virtual Atom::Type atomType() const Q_DECL_OVERRIDE; virtual QString markedUpCode(const QString &code, const Node *relative, - const Location &location); + const Location &location) Q_DECL_OVERRIDE; private: QString addMarkUp(const QString &code, const Node *relative, diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index e25bbd7a4a..811c9400de 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -359,7 +359,7 @@ public: //Node* findChildNode(const QString& name, bool qml) const; Node* findChildNode(const QString& name, Type type); //void findNodes(const QString& name, NodeList& n); - virtual void findChildren(const QString& name, NodeList& nodes) const; + virtual void findChildren(const QString& name, NodeList& nodes) const Q_DECL_OVERRIDE; FunctionNode* findFunctionNode(const QString& name) const; FunctionNode* findFunctionNode(const FunctionNode* clone); void addInclude(const QString &include); @@ -370,8 +370,8 @@ public: void deleteChildren(); void removeFromRelated(); - virtual bool isInnerNode() const { return true; } - virtual bool isLeaf() const { return false; } + virtual bool isInnerNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isLeaf() const Q_DECL_OVERRIDE { return false; } const EnumNode* findEnumNodeForValue(const QString &enumValue) const; const NodeList & childNodes() const { return children_; } const NodeList & relatedNodes() const { return related_; } @@ -384,14 +384,14 @@ public: QStringList primaryKeys(); QStringList secondaryKeys(); const QStringList& pageKeywords() const { return pageKeywds; } - virtual void addPageKeywords(const QString& t) { pageKeywds << t; } - virtual void setOutputFileName(const QString& f) { outputFileName_ = f; } - virtual QString outputFileName() const { return outputFileName_; } - virtual QmlPropertyNode* hasQmlProperty(const QString& ) const; - virtual QmlPropertyNode* hasQmlProperty(const QString&, bool attached) const; + virtual void addPageKeywords(const QString& t) Q_DECL_OVERRIDE { pageKeywds << t; } + virtual void setOutputFileName(const QString& f) Q_DECL_OVERRIDE { outputFileName_ = f; } + virtual QString outputFileName() const Q_DECL_OVERRIDE { return outputFileName_; } + virtual QmlPropertyNode* hasQmlProperty(const QString& ) const Q_DECL_OVERRIDE; + virtual QmlPropertyNode* hasQmlProperty(const QString&, bool attached) const Q_DECL_OVERRIDE; void addChild(Node* child, const QString& title); const QStringList& groupNames() const { return groupNames_; } - virtual void appendGroupName(const QString& t) { groupNames_.append(t); } + virtual void appendGroupName(const QString& t) Q_DECL_OVERRIDE { groupNames_.append(t); } void printChildren(const QString& title); protected: @@ -423,8 +423,8 @@ public: LeafNode(); virtual ~LeafNode() { } - virtual bool isInnerNode() const { return false; } - virtual bool isLeaf() const { return true; } + virtual bool isInnerNode() const Q_DECL_OVERRIDE { return false; } + virtual bool isLeaf() const Q_DECL_OVERRIDE { return true; } protected: LeafNode(Type type, InnerNode* parent, const QString& name); @@ -436,10 +436,10 @@ class NamespaceNode : public InnerNode public: NamespaceNode(InnerNode* parent, const QString& name); virtual ~NamespaceNode() { } - virtual bool isNamespace() const { return true; } - virtual Tree* tree() const { return (parent() ? parent()->tree() : tree_); } - virtual bool isCppNode() const { return true; } - virtual Node::Genus genus() const { return Node::CPP; } + virtual bool isNamespace() const Q_DECL_OVERRIDE { return true; } + virtual Tree* tree() const Q_DECL_OVERRIDE { return (parent() ? parent()->tree() : tree_); } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::CPP; } void setTree(Tree* t) { tree_ = t; } private: @@ -469,13 +469,13 @@ class ClassNode : public InnerNode public: ClassNode(InnerNode* parent, const QString& name); virtual ~ClassNode() { } - virtual bool isClass() const { return true; } - virtual bool isCppNode() const { return true; } - virtual bool isWrapper() const { return wrapper_; } - virtual Node::Genus genus() const { return Node::CPP; } - virtual QString obsoleteLink() const { return obsoleteLink_; } - virtual void setObsoleteLink(const QString& t) { obsoleteLink_ = t; } - virtual void setWrapper() { wrapper_ = true; } + virtual bool isClass() const Q_DECL_OVERRIDE { return true; } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isWrapper() const Q_DECL_OVERRIDE { return wrapper_; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::CPP; } + virtual QString obsoleteLink() const Q_DECL_OVERRIDE { return obsoleteLink_; } + virtual void setObsoleteLink(const QString& t) Q_DECL_OVERRIDE { obsoleteLink_ = t; } + virtual void setWrapper() Q_DECL_OVERRIDE { wrapper_ = true; } void addResolvedBaseClass(Access access, ClassNode* node); void addDerivedClass(Access access, ClassNode* node); @@ -495,8 +495,8 @@ public: void setServiceName(const QString& value) { sname = value; } QmlClassNode* qmlElement() { return qmlelement; } void setQmlElement(QmlClassNode* qcn) { qmlelement = qcn; } - virtual bool isAbstract() const { return abstract_; } - virtual void setAbstract(bool b) { abstract_ = b; } + virtual bool isAbstract() const Q_DECL_OVERRIDE { return abstract_; } + virtual void setAbstract(bool b) Q_DECL_OVERRIDE { abstract_ = b; } PropertyNode* findPropertyNode(const QString& name); QmlClassNode* findQmlBaseNode(); @@ -521,21 +521,21 @@ public: PageType ptype); virtual ~DocNode() { } - virtual void setTitle(const QString &title); - virtual void setSubTitle(const QString &subTitle) { subtitle_ = subTitle; } + virtual void setTitle(const QString &title) Q_DECL_OVERRIDE; + virtual void setSubTitle(const QString &subTitle) Q_DECL_OVERRIDE { subtitle_ = subTitle; } - SubType subType() const { return nodeSubtype_; } - virtual QString title() const { return title_; } - virtual QString fullTitle() const; - virtual QString subTitle() const; + SubType subType() const Q_DECL_OVERRIDE { return nodeSubtype_; } + virtual QString title() const Q_DECL_OVERRIDE { return title_; } + virtual QString fullTitle() const Q_DECL_OVERRIDE; + virtual QString subTitle() const Q_DECL_OVERRIDE; virtual QString imageFileName() const { return QString(); } - virtual QString nameForLists() const { return title(); } + virtual QString nameForLists() const Q_DECL_OVERRIDE { return title(); } virtual void setImageFileName(const QString& ) { } - virtual bool isHeaderFile() const { return (subType() == Node::HeaderFile); } - virtual bool isExample() const { return (subType() == Node::Example); } - virtual bool isExampleFile() const { return (parent() && parent()->isExample()); } - virtual bool isExternalPage() const { return nodeSubtype_ == ExternalPage; } - virtual bool isDocNode() const { return true; } + virtual bool isHeaderFile() const Q_DECL_OVERRIDE { return (subType() == Node::HeaderFile); } + virtual bool isExample() const Q_DECL_OVERRIDE { return (subType() == Node::Example); } + virtual bool isExampleFile() const Q_DECL_OVERRIDE { return (parent() && parent()->isExample()); } + virtual bool isExternalPage() const Q_DECL_OVERRIDE { return nodeSubtype_ == ExternalPage; } + virtual bool isDocNode() const Q_DECL_OVERRIDE { return true; } protected: SubType nodeSubtype_; @@ -549,8 +549,8 @@ public: ExampleNode(InnerNode* parent, const QString& name) : DocNode(parent, name, Node::Example, Node::ExamplePage) { } virtual ~ExampleNode() { } - virtual QString imageFileName() const { return imageFileName_; } - virtual void setImageFileName(const QString& ifn) { imageFileName_ = ifn; } + virtual QString imageFileName() const Q_DECL_OVERRIDE { return imageFileName_; } + virtual void setImageFileName(const QString& ifn) Q_DECL_OVERRIDE { imageFileName_ = ifn; } private: QString imageFileName_; @@ -581,25 +581,25 @@ class QmlClassNode : public InnerNode public: QmlClassNode(InnerNode* parent, const QString& name); virtual ~QmlClassNode(); - virtual bool isQmlNode() const { return true; } - virtual bool isQmlType() const { return true; } - virtual bool isQtQuickNode() const { return (qmlModuleName() == QLatin1String("QtQuick")); } - virtual ClassNode* classNode() { return cnode_; } - virtual void setClassNode(ClassNode* cn) { cnode_ = cn; } - virtual bool isAbstract() const { return abstract_; } - virtual bool isWrapper() const { return wrapper_; } - virtual void setAbstract(bool b) { abstract_ = b; } - virtual void setWrapper() { wrapper_ = true; } - virtual bool isInternal() const { return (status() == Internal); } - virtual QString qmlFullBaseName() const; - virtual QString obsoleteLink() const { return obsoleteLink_; } - virtual void setObsoleteLink(const QString& t) { obsoleteLink_ = t; }; - virtual QString qmlModuleName() const; - virtual QString qmlModuleVersion() const; - virtual QString qmlModuleIdentifier() const; - virtual QmlModuleNode* qmlModule() const { return qmlModule_; } - virtual void setQmlModule(QmlModuleNode* t) { qmlModule_ = t; } - virtual Node::Genus genus() const { return Node::QML; } + virtual bool isQmlNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isQmlType() const Q_DECL_OVERRIDE { return true; } + virtual bool isQtQuickNode() const Q_DECL_OVERRIDE { return (qmlModuleName() == QLatin1String("QtQuick")); } + virtual ClassNode* classNode() Q_DECL_OVERRIDE { return cnode_; } + virtual void setClassNode(ClassNode* cn) Q_DECL_OVERRIDE { cnode_ = cn; } + virtual bool isAbstract() const Q_DECL_OVERRIDE { return abstract_; } + virtual bool isWrapper() const Q_DECL_OVERRIDE { return wrapper_; } + virtual void setAbstract(bool b) Q_DECL_OVERRIDE { abstract_ = b; } + virtual void setWrapper() Q_DECL_OVERRIDE { wrapper_ = true; } + virtual bool isInternal() const Q_DECL_OVERRIDE { return (status() == Internal); } + virtual QString qmlFullBaseName() const Q_DECL_OVERRIDE; + virtual QString obsoleteLink() const Q_DECL_OVERRIDE { return obsoleteLink_; } + virtual void setObsoleteLink(const QString& t) Q_DECL_OVERRIDE { obsoleteLink_ = t; }; + virtual QString qmlModuleName() const Q_DECL_OVERRIDE; + virtual QString qmlModuleVersion() const Q_DECL_OVERRIDE; + virtual QString qmlModuleIdentifier() const Q_DECL_OVERRIDE; + virtual QmlModuleNode* qmlModule() const Q_DECL_OVERRIDE { return qmlModule_; } + virtual void setQmlModule(QmlModuleNode* t) Q_DECL_OVERRIDE { qmlModule_ = t; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::QML; } const ImportList& importList() const { return importList_; } void setImportList(const ImportList& il) { importList_ = il; } const QString& qmlBaseName() const { return qmlBaseName_; } @@ -635,9 +635,9 @@ public: QmlBasicTypeNode(InnerNode* parent, const QString& name); virtual ~QmlBasicTypeNode() { } - virtual bool isQmlNode() const { return true; } - virtual bool isQmlBasicType() const { return true; } - virtual Node::Genus genus() const { return Node::QML; } + virtual bool isQmlNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isQmlBasicType() const Q_DECL_OVERRIDE { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::QML; } }; class QmlPropertyGroupNode : public InnerNode @@ -645,17 +645,17 @@ class QmlPropertyGroupNode : public InnerNode public: QmlPropertyGroupNode(QmlClassNode* parent, const QString& name); virtual ~QmlPropertyGroupNode() { } - virtual bool isQmlNode() const { return true; } - virtual bool isQtQuickNode() const { return parent()->isQtQuickNode(); } - virtual QString qmlTypeName() const { return parent()->qmlTypeName(); } - virtual QString qmlModuleName() const { return parent()->qmlModuleName(); } - virtual QString qmlModuleVersion() const { return parent()->qmlModuleVersion(); } - virtual QString qmlModuleIdentifier() const { return parent()->qmlModuleIdentifier(); } - virtual QString idNumber(); - virtual bool isQmlPropertyGroup() const { return true; } - virtual Node::Genus genus() const { return Node::QML; } - - virtual QString element() const { return parent()->name(); } + virtual bool isQmlNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isQtQuickNode() const Q_DECL_OVERRIDE { return parent()->isQtQuickNode(); } + virtual QString qmlTypeName() const Q_DECL_OVERRIDE { return parent()->qmlTypeName(); } + virtual QString qmlModuleName() const Q_DECL_OVERRIDE { return parent()->qmlModuleName(); } + virtual QString qmlModuleVersion() const Q_DECL_OVERRIDE { return parent()->qmlModuleVersion(); } + virtual QString qmlModuleIdentifier() const Q_DECL_OVERRIDE { return parent()->qmlModuleIdentifier(); } + virtual QString idNumber() Q_DECL_OVERRIDE; + virtual bool isQmlPropertyGroup() const Q_DECL_OVERRIDE { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::QML; } + + virtual QString element() const Q_DECL_OVERRIDE { return parent()->name(); } private: int idNumber_; @@ -672,11 +672,11 @@ public: bool attached); virtual ~QmlPropertyNode() { } - virtual Node::Genus genus() const { return Node::QML; } - virtual void setDataType(const QString& dataType) { type_ = dataType; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::QML; } + virtual void setDataType(const QString& dataType) Q_DECL_OVERRIDE { type_ = dataType; } void setStored(bool stored) { stored_ = toFlagValue(stored); } void setDesignable(bool designable) { designable_ = toFlagValue(designable); } - virtual void setReadOnly(bool ro) { readOnly_ = toFlagValue(ro); } + virtual void setReadOnly(bool ro) Q_DECL_OVERRIDE { readOnly_ = toFlagValue(ro); } void setDefault() { isdefault_ = true; } const QString &dataType() const { return type_; } @@ -685,17 +685,17 @@ public: bool isStored() const { return fromFlagValue(stored_,true); } bool isDesignable() const { return fromFlagValue(designable_,false); } bool isWritable(); - virtual bool isDefault() const { return isdefault_; } - virtual bool isReadOnly() const { return fromFlagValue(readOnly_,false); } - virtual bool isAlias() const { return isAlias_; } - virtual bool isAttached() const { return attached_; } - virtual bool isQmlNode() const { return true; } - virtual bool isQtQuickNode() const { return parent()->isQtQuickNode(); } - virtual QString qmlTypeName() const { return parent()->qmlTypeName(); } - virtual QString qmlModuleName() const { return parent()->qmlModuleName(); } - virtual QString qmlModuleVersion() const { return parent()->qmlModuleVersion(); } - virtual QString qmlModuleIdentifier() const { return parent()->qmlModuleIdentifier(); } - virtual QString element() const; + virtual bool isDefault() const Q_DECL_OVERRIDE { return isdefault_; } + virtual bool isReadOnly() const Q_DECL_OVERRIDE { return fromFlagValue(readOnly_,false); } + virtual bool isAlias() const Q_DECL_OVERRIDE { return isAlias_; } + virtual bool isAttached() const Q_DECL_OVERRIDE { return attached_; } + virtual bool isQmlNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isQtQuickNode() const Q_DECL_OVERRIDE { return parent()->isQtQuickNode(); } + virtual QString qmlTypeName() const Q_DECL_OVERRIDE { return parent()->qmlTypeName(); } + virtual QString qmlModuleName() const Q_DECL_OVERRIDE { return parent()->qmlModuleName(); } + virtual QString qmlModuleVersion() const Q_DECL_OVERRIDE { return parent()->qmlModuleVersion(); } + virtual QString qmlModuleIdentifier() const Q_DECL_OVERRIDE { return parent()->qmlModuleIdentifier(); } + virtual QString element() const Q_DECL_OVERRIDE; private: PropertyNode* findCorrespondingCppProperty(); @@ -731,8 +731,8 @@ public: EnumNode(InnerNode* parent, const QString& name); virtual ~EnumNode() { } - virtual Node::Genus genus() const { return Node::CPP; } - virtual bool isCppNode() const { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::CPP; } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } void addItem(const EnumItem& item); void setFlagsType(TypedefNode* typedeff); bool hasItem(const QString &name) const { return names.contains(name); } @@ -754,8 +754,8 @@ public: TypedefNode(InnerNode* parent, const QString& name); virtual ~TypedefNode() { } - virtual Node::Genus genus() const { return Node::CPP; } - virtual bool isCppNode() const { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::CPP; } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } const EnumNode* associatedEnum() const { return ae; } private: @@ -842,8 +842,8 @@ public: bool isConst() const { return con; } bool isStatic() const { return sta; } bool isOverload() const { return ove; } - bool isReimp() const { return reimp; } - bool isFunction() const { return true; } + bool isReimp() const Q_DECL_OVERRIDE { return reimp; } + bool isFunction() const Q_DECL_OVERRIDE { return true; } int overloadNumber() const; const QList<Parameter>& parameters() const { return params; } QStringList parameterNames() const; @@ -855,20 +855,20 @@ public: QStringList reconstructParams(bool values = false) const; QString signature(bool values = false) const; - virtual QString element() const { return parent()->name(); } - virtual bool isAttached() const { return attached_; } - virtual bool isQmlNode() const { + virtual QString element() const Q_DECL_OVERRIDE { return parent()->name(); } + virtual bool isAttached() const Q_DECL_OVERRIDE { return attached_; } + virtual bool isQmlNode() const Q_DECL_OVERRIDE { return ((type() == QmlSignal) || (type() == QmlMethod) || (type() == QmlSignalHandler)); } - virtual bool isCppNode() const { return !isQmlNode(); } - virtual Node::Genus genus() const { return (isQmlNode() ? Node::QML : Node::CPP); } - virtual bool isQtQuickNode() const { return parent()->isQtQuickNode(); } - virtual QString qmlTypeName() const { return parent()->qmlTypeName(); } - virtual QString qmlModuleName() const { return parent()->qmlModuleName(); } - virtual QString qmlModuleVersion() const { return parent()->qmlModuleVersion(); } - virtual QString qmlModuleIdentifier() const { return parent()->qmlModuleIdentifier(); } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return !isQmlNode(); } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return (isQmlNode() ? Node::QML : Node::CPP); } + virtual bool isQtQuickNode() const Q_DECL_OVERRIDE { return parent()->isQtQuickNode(); } + virtual QString qmlTypeName() const Q_DECL_OVERRIDE { return parent()->qmlTypeName(); } + virtual QString qmlModuleName() const Q_DECL_OVERRIDE { return parent()->qmlModuleName(); } + virtual QString qmlModuleVersion() const Q_DECL_OVERRIDE { return parent()->qmlModuleVersion(); } + virtual QString qmlModuleIdentifier() const Q_DECL_OVERRIDE { return parent()->qmlModuleIdentifier(); } void debug() const; @@ -902,9 +902,9 @@ public: PropertyNode(InnerNode* parent, const QString& name); virtual ~PropertyNode() { } - virtual Node::Genus genus() const { return Node::CPP; } - virtual bool isCppNode() const { return true; } - virtual void setDataType(const QString& dataType) { type_ = dataType; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::CPP; } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } + virtual void setDataType(const QString& dataType) Q_DECL_OVERRIDE { type_ = dataType; } void addFunction(FunctionNode* function, FunctionRole role); void addSignal(FunctionNode* function, FunctionRole role); void setStored(bool stored) { stored_ = toFlagValue(stored); } @@ -991,8 +991,8 @@ public: VariableNode(InnerNode* parent, const QString &name); virtual ~VariableNode() { } - virtual Node::Genus genus() const { return Node::CPP; } - virtual bool isCppNode() const { return true; } + virtual Node::Genus genus() const Q_DECL_OVERRIDE { return Node::CPP; } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } void setLeftType(const QString &leftType) { lt = leftType; } void setRightType(const QString &rightType) { rt = rightType; } void setStatic(bool statique) { sta = statique; } @@ -1033,20 +1033,20 @@ class CollectionNode : public InnerNode } virtual ~CollectionNode() { } - virtual bool isCollectionNode() const { return true; } - virtual void addMember(Node* node); - virtual bool hasMembers() const; - virtual bool hasNamespaces() const; - virtual bool hasClasses() const; - virtual void getMemberNamespaces(NodeMap& out); - virtual void getMemberClasses(NodeMap& out); - virtual bool wasSeen() const { return seen_; } - virtual QString title() const { return title_; } - virtual QString subTitle() const { return subtitle_; } - virtual QString fullTitle() const { return title_; } - virtual QString nameForLists() const { return title_; } - virtual void setTitle(const QString &title); - virtual void setSubTitle(const QString &subTitle) { subtitle_ = subTitle; } + virtual bool isCollectionNode() const Q_DECL_OVERRIDE { return true; } + virtual void addMember(Node* node) Q_DECL_OVERRIDE; + virtual bool hasMembers() const Q_DECL_OVERRIDE; + virtual bool hasNamespaces() const Q_DECL_OVERRIDE; + virtual bool hasClasses() const Q_DECL_OVERRIDE; + virtual void getMemberNamespaces(NodeMap& out) Q_DECL_OVERRIDE; + virtual void getMemberClasses(NodeMap& out) Q_DECL_OVERRIDE; + virtual bool wasSeen() const Q_DECL_OVERRIDE { return seen_; } + virtual QString title() const Q_DECL_OVERRIDE { return title_; } + virtual QString subTitle() const Q_DECL_OVERRIDE { return subtitle_; } + virtual QString fullTitle() const Q_DECL_OVERRIDE { return title_; } + virtual QString nameForLists() const Q_DECL_OVERRIDE { return title_; } + virtual void setTitle(const QString &title) Q_DECL_OVERRIDE; + virtual void setSubTitle(const QString &subTitle) Q_DECL_OVERRIDE { subtitle_ = subTitle; } const NodeList& members() const { return members_; } void printMembers(const QString& title); @@ -1068,7 +1068,7 @@ class GroupNode : public CollectionNode : CollectionNode(Node::Group, parent, name) { } virtual ~GroupNode() { } - virtual bool isGroup() const { return true; } + virtual bool isGroup() const Q_DECL_OVERRIDE { return true; } }; class ModuleNode : public CollectionNode @@ -1078,10 +1078,10 @@ class ModuleNode : public CollectionNode : CollectionNode(Node::Module, parent, name) { } virtual ~ModuleNode() { } - virtual bool isModule() const { return true; } - virtual bool isCppNode() const { return true; } - virtual void setQtVariable(const QString& v) { qtVariable_ = v; } - virtual QString qtVariable() const { return qtVariable_; } + virtual bool isModule() const Q_DECL_OVERRIDE { return true; } + virtual bool isCppNode() const Q_DECL_OVERRIDE { return true; } + virtual void setQtVariable(const QString& v) Q_DECL_OVERRIDE { qtVariable_ = v; } + virtual QString qtVariable() const Q_DECL_OVERRIDE { return qtVariable_; } private: QString qtVariable_; @@ -1094,18 +1094,18 @@ class QmlModuleNode : public CollectionNode : CollectionNode(Node::QmlModule, parent, name) { } virtual ~QmlModuleNode() { } - virtual bool isQmlNode() const { return true; } - virtual bool isQmlModule() const { return true; } - virtual QString qmlModuleName() const { return qmlModuleName_; } - virtual QString qmlModuleVersion() const { + virtual bool isQmlNode() const Q_DECL_OVERRIDE { return true; } + virtual bool isQmlModule() const Q_DECL_OVERRIDE { return true; } + virtual QString qmlModuleName() const Q_DECL_OVERRIDE { return qmlModuleName_; } + virtual QString qmlModuleVersion() const Q_DECL_OVERRIDE { return qmlModuleVersionMajor_ + "." + qmlModuleVersionMinor_; } - virtual QString qmlModuleIdentifier() const { + virtual QString qmlModuleIdentifier() const Q_DECL_OVERRIDE { return qmlModuleName_ + qmlModuleVersionMajor_; } - virtual void setQmlModuleInfo(const QString& ); - virtual void setQtVariable(const QString& v) { qtVariable_ = v; } - virtual QString qtVariable() const { return qtVariable_; } + virtual void setQmlModuleInfo(const QString& ) Q_DECL_OVERRIDE; + virtual void setQtVariable(const QString& v) Q_DECL_OVERRIDE { qtVariable_ = v; } + virtual QString qtVariable() const Q_DECL_OVERRIDE { return qtVariable_; } private: QString qmlModuleName_; diff --git a/src/tools/qdoc/plaincodemarker.h b/src/tools/qdoc/plaincodemarker.h index df6beebd03..2fb97c443d 100644 --- a/src/tools/qdoc/plaincodemarker.h +++ b/src/tools/qdoc/plaincodemarker.h @@ -48,20 +48,20 @@ public: PlainCodeMarker(); ~PlainCodeMarker(); - bool recognizeCode( const QString& code ); - bool recognizeExtension( const QString& ext ); - bool recognizeLanguage( const QString& lang ); - Atom::Type atomType() const; - QString markedUpCode( const QString& code, const Node *relative, const Location &location ); + bool recognizeCode( const QString& code ) Q_DECL_OVERRIDE; + bool recognizeExtension( const QString& ext ) Q_DECL_OVERRIDE; + bool recognizeLanguage( const QString& lang ) Q_DECL_OVERRIDE; + Atom::Type atomType() const Q_DECL_OVERRIDE; + QString markedUpCode( const QString& code, const Node *relative, const Location &location ) Q_DECL_OVERRIDE; QString markedUpSynopsis( const Node *node, const Node *relative, - SynopsisStyle style ); - QString markedUpName( const Node *node ); - QString markedUpFullName( const Node *node, const Node *relative ); - QString markedUpEnumValue(const QString &enumValue, const Node *relative); - QString markedUpIncludes( const QStringList& includes ); - QString functionBeginRegExp( const QString& funcName ); - QString functionEndRegExp( const QString& funcName ); - QList<Section> sections(const InnerNode *innerNode, SynopsisStyle style, Status status); + SynopsisStyle style ) Q_DECL_OVERRIDE; + QString markedUpName( const Node *node ) Q_DECL_OVERRIDE; + QString markedUpFullName( const Node *node, const Node *relative ) Q_DECL_OVERRIDE; + QString markedUpEnumValue(const QString &enumValue, const Node *relative) Q_DECL_OVERRIDE; + QString markedUpIncludes( const QStringList& includes ) Q_DECL_OVERRIDE; + QString functionBeginRegExp( const QString& funcName ) Q_DECL_OVERRIDE; + QString functionEndRegExp( const QString& funcName ) Q_DECL_OVERRIDE; + QList<Section> sections(const InnerNode *innerNode, SynopsisStyle style, Status status) Q_DECL_OVERRIDE; }; QT_END_NAMESPACE diff --git a/src/tools/qdoc/puredocparser.h b/src/tools/qdoc/puredocparser.h index e6a4eca9d8..4100b50e2d 100644 --- a/src/tools/qdoc/puredocparser.h +++ b/src/tools/qdoc/puredocparser.h @@ -57,8 +57,8 @@ public: PureDocParser(); virtual ~PureDocParser(); - virtual QStringList sourceFileNameFilter(); - virtual void parseSourceFile(const Location& location, const QString& filePath); + virtual QStringList sourceFileNameFilter() Q_DECL_OVERRIDE; + virtual void parseSourceFile(const Location& location, const QString& filePath) Q_DECL_OVERRIDE; private: bool processQdocComments(); diff --git a/src/tools/qdoc/qmlcodemarker.h b/src/tools/qdoc/qmlcodemarker.h index c6e4aa7e19..e9a54710df 100644 --- a/src/tools/qdoc/qmlcodemarker.h +++ b/src/tools/qdoc/qmlcodemarker.h @@ -51,19 +51,19 @@ public: QmlCodeMarker(); ~QmlCodeMarker(); - virtual bool recognizeCode(const QString &code); - virtual bool recognizeExtension(const QString &ext); - virtual bool recognizeLanguage(const QString &language); - virtual Atom::Type atomType() const; + virtual bool recognizeCode(const QString &code) Q_DECL_OVERRIDE; + virtual bool recognizeExtension(const QString &ext) Q_DECL_OVERRIDE; + virtual bool recognizeLanguage(const QString &language) Q_DECL_OVERRIDE; + virtual Atom::Type atomType() const Q_DECL_OVERRIDE; virtual QString markedUpCode(const QString &code, const Node *relative, - const Location &location); + const Location &location) Q_DECL_OVERRIDE; - virtual QString markedUpName(const Node *node); - virtual QString markedUpFullName(const Node *node, const Node *relative); - virtual QString markedUpIncludes(const QStringList &includes); - virtual QString functionBeginRegExp(const QString &funcName); - virtual QString functionEndRegExp(const QString &funcName); + virtual QString markedUpName(const Node *node) Q_DECL_OVERRIDE; + virtual QString markedUpFullName(const Node *node, const Node *relative) Q_DECL_OVERRIDE; + virtual QString markedUpIncludes(const QStringList &includes) Q_DECL_OVERRIDE; + virtual QString functionBeginRegExp(const QString &funcName) Q_DECL_OVERRIDE; + virtual QString functionEndRegExp(const QString &funcName) Q_DECL_OVERRIDE; /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */ QList<QQmlJS::AST::SourceLocation> extractPragmas(QString &script); diff --git a/src/tools/qdoc/qmlcodeparser.h b/src/tools/qdoc/qmlcodeparser.h index cf60b1d7d7..715b4278b9 100644 --- a/src/tools/qdoc/qmlcodeparser.h +++ b/src/tools/qdoc/qmlcodeparser.h @@ -59,12 +59,12 @@ public: QmlCodeParser(); virtual ~QmlCodeParser(); - virtual void initializeParser(const Config& config); - virtual void terminateParser(); - virtual QString language(); - virtual QStringList sourceFileNameFilter(); - virtual void parseSourceFile(const Location& location, const QString& filePath); - 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 sourceFileNameFilter() Q_DECL_OVERRIDE; + virtual void parseSourceFile(const Location& location, const QString& filePath) Q_DECL_OVERRIDE; + virtual void doneParsingSourceFiles() Q_DECL_OVERRIDE; /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */ void extractPragmas(QString &script); diff --git a/src/tools/qdoc/qmlmarkupvisitor.h b/src/tools/qdoc/qmlmarkupvisitor.h index 09aa1f7400..4debce9129 100644 --- a/src/tools/qdoc/qmlmarkupvisitor.h +++ b/src/tools/qdoc/qmlmarkupvisitor.h @@ -56,92 +56,92 @@ public: QString markedUpCode(); - virtual bool visit(QQmlJS::AST::UiImport *); - virtual void endVisit(QQmlJS::AST::UiImport *); - - virtual bool visit(QQmlJS::AST::UiPublicMember *); - virtual bool visit(QQmlJS::AST::UiObjectDefinition *); - - virtual bool visit(QQmlJS::AST::UiObjectInitializer *); - virtual void endVisit(QQmlJS::AST::UiObjectInitializer *); - - virtual bool visit(QQmlJS::AST::UiObjectBinding *); - virtual bool visit(QQmlJS::AST::UiScriptBinding *); - virtual bool visit(QQmlJS::AST::UiArrayBinding *); - virtual bool visit(QQmlJS::AST::UiArrayMemberList *); - virtual bool visit(QQmlJS::AST::UiQualifiedId *); - - virtual bool visit(QQmlJS::AST::ThisExpression *); - virtual bool visit(QQmlJS::AST::IdentifierExpression *); - virtual bool visit(QQmlJS::AST::NullExpression *); - virtual bool visit(QQmlJS::AST::TrueLiteral *); - virtual bool visit(QQmlJS::AST::FalseLiteral *); - virtual bool visit(QQmlJS::AST::NumericLiteral *); - virtual bool visit(QQmlJS::AST::StringLiteral *); - virtual bool visit(QQmlJS::AST::RegExpLiteral *); - virtual bool visit(QQmlJS::AST::ArrayLiteral *); - - virtual bool visit(QQmlJS::AST::ObjectLiteral *); - virtual void endVisit(QQmlJS::AST::ObjectLiteral *); - - virtual bool visit(QQmlJS::AST::ElementList *); - virtual bool visit(QQmlJS::AST::Elision *); - virtual bool visit(QQmlJS::AST::PropertyNameAndValue *); - virtual bool visit(QQmlJS::AST::ArrayMemberExpression *); - virtual bool visit(QQmlJS::AST::FieldMemberExpression *); - virtual bool visit(QQmlJS::AST::NewMemberExpression *); - virtual bool visit(QQmlJS::AST::NewExpression *); - virtual bool visit(QQmlJS::AST::ArgumentList *); - virtual bool visit(QQmlJS::AST::PostIncrementExpression *); - virtual bool visit(QQmlJS::AST::PostDecrementExpression *); - virtual bool visit(QQmlJS::AST::DeleteExpression *); - virtual bool visit(QQmlJS::AST::VoidExpression *); - virtual bool visit(QQmlJS::AST::TypeOfExpression *); - virtual bool visit(QQmlJS::AST::PreIncrementExpression *); - virtual bool visit(QQmlJS::AST::PreDecrementExpression *); - virtual bool visit(QQmlJS::AST::UnaryPlusExpression *); - virtual bool visit(QQmlJS::AST::UnaryMinusExpression *); - virtual bool visit(QQmlJS::AST::TildeExpression *); - virtual bool visit(QQmlJS::AST::NotExpression *); - virtual bool visit(QQmlJS::AST::BinaryExpression *); - virtual bool visit(QQmlJS::AST::ConditionalExpression *); - virtual bool visit(QQmlJS::AST::Expression *); - - virtual bool visit(QQmlJS::AST::Block *); - virtual void endVisit(QQmlJS::AST::Block *); - - virtual bool visit(QQmlJS::AST::VariableStatement *); - virtual bool visit(QQmlJS::AST::VariableDeclarationList *); - virtual bool visit(QQmlJS::AST::VariableDeclaration *); - virtual bool visit(QQmlJS::AST::EmptyStatement *); - virtual bool visit(QQmlJS::AST::ExpressionStatement *); - virtual bool visit(QQmlJS::AST::IfStatement *); - virtual bool visit(QQmlJS::AST::DoWhileStatement *); - virtual bool visit(QQmlJS::AST::WhileStatement *); - virtual bool visit(QQmlJS::AST::ForStatement *); - virtual bool visit(QQmlJS::AST::LocalForStatement *); - virtual bool visit(QQmlJS::AST::ForEachStatement *); - virtual bool visit(QQmlJS::AST::LocalForEachStatement *); - virtual bool visit(QQmlJS::AST::ContinueStatement *); - virtual bool visit(QQmlJS::AST::BreakStatement *); - virtual bool visit(QQmlJS::AST::ReturnStatement *); - virtual bool visit(QQmlJS::AST::WithStatement *); - - virtual bool visit(QQmlJS::AST::CaseBlock *); - virtual void endVisit(QQmlJS::AST::CaseBlock *); - - virtual bool visit(QQmlJS::AST::SwitchStatement *); - virtual bool visit(QQmlJS::AST::CaseClause *); - virtual bool visit(QQmlJS::AST::DefaultClause *); - virtual bool visit(QQmlJS::AST::LabelledStatement *); - virtual bool visit(QQmlJS::AST::ThrowStatement *); - virtual bool visit(QQmlJS::AST::TryStatement *); - virtual bool visit(QQmlJS::AST::Catch *); - virtual bool visit(QQmlJS::AST::Finally *); - virtual bool visit(QQmlJS::AST::FunctionDeclaration *); - virtual bool visit(QQmlJS::AST::FunctionExpression *); - virtual bool visit(QQmlJS::AST::FormalParameterList *); - virtual bool visit(QQmlJS::AST::DebuggerStatement *); + virtual bool visit(QQmlJS::AST::UiImport *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::UiImport *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::UiPublicMember *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UiObjectDefinition *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::UiObjectInitializer *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::UiObjectInitializer *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::UiObjectBinding *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UiScriptBinding *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UiArrayBinding *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UiArrayMemberList *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UiQualifiedId *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::ThisExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::IdentifierExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::NullExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::TrueLiteral *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::FalseLiteral *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::NumericLiteral *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::StringLiteral *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::RegExpLiteral *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ArrayLiteral *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::ObjectLiteral *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::ObjectLiteral *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::ElementList *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::Elision *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::PropertyNameAndValue *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ArrayMemberExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::FieldMemberExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::NewMemberExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::NewExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ArgumentList *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::PostIncrementExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::PostDecrementExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::DeleteExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::VoidExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::TypeOfExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::PreIncrementExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::PreDecrementExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UnaryPlusExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UnaryMinusExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::TildeExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::NotExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::BinaryExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ConditionalExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::Expression *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::Block *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::Block *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::VariableStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::VariableDeclarationList *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::VariableDeclaration *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::EmptyStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ExpressionStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::IfStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::DoWhileStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::WhileStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ForStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::LocalForStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ForEachStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::LocalForEachStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ContinueStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::BreakStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ReturnStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::WithStatement *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::CaseBlock *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::CaseBlock *) Q_DECL_OVERRIDE; + + virtual bool visit(QQmlJS::AST::SwitchStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::CaseClause *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::DefaultClause *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::LabelledStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::ThrowStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::TryStatement *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::Catch *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::Finally *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::FunctionDeclaration *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::FunctionExpression *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::FormalParameterList *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::DebuggerStatement *) Q_DECL_OVERRIDE; protected: QString protect(const QString &string); diff --git a/src/tools/qdoc/qmlparser/qqmljsast_p.h b/src/tools/qdoc/qmlparser/qqmljsast_p.h index fa4b2c3e13..ae79046563 100644 --- a/src/tools/qdoc/qmlparser/qqmljsast_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsast_p.h @@ -247,7 +247,7 @@ class QML_PARSER_EXPORT ExpressionNode: public Node public: ExpressionNode() {} - virtual ExpressionNode *expressionCast(); + virtual ExpressionNode *expressionCast() Q_DECL_OVERRIDE; }; class QML_PARSER_EXPORT Statement: public Node @@ -255,7 +255,7 @@ class QML_PARSER_EXPORT Statement: public Node public: Statement() {} - virtual Statement *statementCast(); + virtual Statement *statementCast() Q_DECL_OVERRIDE; }; class QML_PARSER_EXPORT NestedExpression: public ExpressionNode @@ -267,12 +267,12 @@ public: : expression(expression) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return lparenToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rparenToken; } // attributes @@ -288,12 +288,12 @@ public: ThisExpression() { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return thisToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return thisToken; } // attributes @@ -308,12 +308,12 @@ public: IdentifierExpression(const QStringRef &n): name (n) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } // attributes @@ -328,12 +328,12 @@ public: NullExpression() { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return nullToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return nullToken; } // attributes @@ -347,12 +347,12 @@ public: TrueLiteral() { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return trueToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return trueToken; } // attributes @@ -366,12 +366,12 @@ public: FalseLiteral() { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return falseToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return falseToken; } // attributes @@ -386,12 +386,12 @@ public: NumericLiteral(double v): value(v) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return literalToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return literalToken; } // attributes: @@ -407,12 +407,12 @@ public: StringLiteral(const QStringRef &v): value (v) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return literalToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return literalToken; } // attributes: @@ -428,12 +428,12 @@ public: RegExpLiteral(const QStringRef &p, int f): pattern (p), flags (f) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return literalToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return literalToken; } // attributes: @@ -459,12 +459,12 @@ public: elements (elts), elision (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return lbracketToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbracketToken; } // attributes @@ -486,12 +486,12 @@ public: ObjectLiteral(PropertyAssignmentList *plist): properties (plist) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbraceToken; } // attributes @@ -515,12 +515,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return commaToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : commaToken; } inline Elision *finish () @@ -559,16 +559,16 @@ public: return front; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { if (elision) return elision->firstSourceLocation(); return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (next) return next->lastSourceLocation(); @@ -589,10 +589,10 @@ public: PropertyName() { kind = K; } - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return propertyNameToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return propertyNameToken; } // attributes @@ -630,12 +630,12 @@ public: return front; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return assignment->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : assignment->lastSourceLocation(); } // attributes @@ -653,12 +653,12 @@ public: : name(n), value(v) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return name->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return value->lastSourceLocation(); } // attributes @@ -686,12 +686,12 @@ public: : type(Setter), name(n), formals(f), functionBody (b) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return getSetToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbraceToken; } // attributes @@ -714,7 +714,7 @@ public: IdentifierPropertyName(const QStringRef &n): id (n) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes QStringRef id; @@ -728,7 +728,7 @@ public: StringLiteralPropertyName(const QStringRef &n): id (n) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes QStringRef id; @@ -742,7 +742,7 @@ public: NumericLiteralPropertyName(double n): id (n) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes double id; @@ -757,12 +757,12 @@ public: base (b), expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbracketToken; } // attributes @@ -781,12 +781,12 @@ public: base (b), name (n) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } // attributes @@ -805,12 +805,12 @@ public: base (b), arguments (a) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return newToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rparenToken; } // attributes @@ -829,12 +829,12 @@ public: NewExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return newToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -851,12 +851,12 @@ public: base (b), arguments (a) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rparenToken; } // attributes @@ -883,12 +883,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (next) return next->lastSourceLocation(); @@ -916,12 +916,12 @@ public: PostIncrementExpression(ExpressionNode *b): base (b) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return incrementToken; } // attributes @@ -937,12 +937,12 @@ public: PostDecrementExpression(ExpressionNode *b): base (b) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return base->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return decrementToken; } // attributes @@ -958,12 +958,12 @@ public: DeleteExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return deleteToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -979,12 +979,12 @@ public: VoidExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return voidToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1000,12 +1000,12 @@ public: TypeOfExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return typeofToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1021,12 +1021,12 @@ public: PreIncrementExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return incrementToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1042,12 +1042,12 @@ public: PreDecrementExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return decrementToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1063,12 +1063,12 @@ public: UnaryPlusExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return plusToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1084,12 +1084,12 @@ public: UnaryMinusExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return minusToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1105,12 +1105,12 @@ public: TildeExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return tildeToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1126,12 +1126,12 @@ public: NotExpression(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return notToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression->lastSourceLocation(); } // attributes @@ -1148,14 +1148,14 @@ public: left (l), op (o), right (r) { kind = K; } - virtual BinaryExpression *binaryExpressionCast(); + virtual BinaryExpression *binaryExpressionCast() Q_DECL_OVERRIDE; - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return left->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return right->lastSourceLocation(); } // attributes @@ -1174,12 +1174,12 @@ public: expression (e), ok (t), ko (f) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return ko->lastSourceLocation(); } // attributes @@ -1198,12 +1198,12 @@ public: Expression(ExpressionNode *l, ExpressionNode *r): left (l), right (r) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return left->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return right->lastSourceLocation(); } // attributes @@ -1220,12 +1220,12 @@ public: Block(StatementList *slist): statements (slist) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbraceToken; } // attributes @@ -1251,12 +1251,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return statement->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : statement->lastSourceLocation(); } inline StatementList *finish () @@ -1280,12 +1280,12 @@ public: declarations (vlist) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return declarationKindToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1303,12 +1303,12 @@ public: name (n), expression (e), readOnly(false) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return expression ? expression->lastSourceLocation() : identifierToken; } // attributes @@ -1335,12 +1335,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return declaration->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (next) return next->lastSourceLocation(); @@ -1372,12 +1372,12 @@ public: EmptyStatement() { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1392,12 +1392,12 @@ public: ExpressionStatement(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return expression->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1414,12 +1414,12 @@ public: expression (e), ok (t), ko (f) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return ifToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (ko) return ko->lastSourceLocation(); @@ -1446,12 +1446,12 @@ public: statement (stmt), expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return doToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1473,12 +1473,12 @@ public: expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return whileToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1498,12 +1498,12 @@ public: initialiser (i), condition (c), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return forToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1527,12 +1527,12 @@ public: declarations (vlist), condition (c), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return forToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1557,12 +1557,12 @@ public: initialiser (i), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return forToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1584,12 +1584,12 @@ public: declaration (v), expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return forToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1611,12 +1611,12 @@ public: ContinueStatement(const QStringRef &l = QStringRef()): label (l) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return continueToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1634,12 +1634,12 @@ public: BreakStatement(const QStringRef &l): label (l) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return breakToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1657,12 +1657,12 @@ public: ReturnStatement(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return returnToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1680,12 +1680,12 @@ public: expression (e), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return withToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1705,12 +1705,12 @@ public: clauses (c), defaultClause (d), moreClauses (r) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbraceToken; } // attributes @@ -1730,12 +1730,12 @@ public: expression (e), block (b) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return switchToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return block->rbraceToken; } // attributes @@ -1755,12 +1755,12 @@ public: expression (e), statements (slist) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return caseToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statements ? statements->lastSourceLocation() : colonToken; } // attributes @@ -1787,12 +1787,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return clause->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : clause->lastSourceLocation(); } inline CaseClauses *finish () @@ -1816,12 +1816,12 @@ public: statements (slist) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return defaultToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statements ? statements->lastSourceLocation() : colonToken; } // attributes @@ -1839,12 +1839,12 @@ public: label (l), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1862,12 +1862,12 @@ public: ThrowStatement(ExpressionNode *e): expression (e) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return throwToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -1885,12 +1885,12 @@ public: name (n), statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return catchToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -1911,12 +1911,12 @@ public: statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return finallyToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement ? statement->lastSourceLocation() : finallyToken; } // attributes @@ -1941,12 +1941,12 @@ public: statement (stmt), catchExpression (c), finallyExpression (0) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return tryToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (finallyExpression) return finallyExpression->statement->rbraceToken; @@ -1972,12 +1972,12 @@ public: name (n), formals (f), body (b) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return functionToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbraceToken; } // attributes @@ -2001,7 +2001,7 @@ public: FunctionExpression(n, f, b) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; }; class QML_PARSER_EXPORT FormalParameterList: public Node @@ -2021,12 +2021,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : identifierToken; } inline FormalParameterList *finish () @@ -2069,12 +2069,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return element->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : element->lastSourceLocation(); } inline SourceElements *finish () @@ -2098,12 +2098,12 @@ public: elements (elts) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return elements ? elements->firstSourceLocation() : SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return elements ? elements->lastSourceLocation() : SourceLocation(); } // attributes @@ -2119,12 +2119,12 @@ public: elements (elts) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return elements ? elements->firstSourceLocation() : SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return elements ? elements->lastSourceLocation() : SourceLocation(); } // attributes @@ -2140,12 +2140,12 @@ public: declaration (f) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return declaration->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return declaration->lastSourceLocation(); } // attributes @@ -2161,12 +2161,12 @@ public: statement (stmt) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return statement->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } // attributes @@ -2181,12 +2181,12 @@ public: DebuggerStatement() { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return debuggerToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -2218,12 +2218,12 @@ public: return head; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : identifierToken; } // attributes @@ -2245,12 +2245,12 @@ public: : importUri(uri) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return importToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -2271,7 +2271,7 @@ public: virtual SourceLocation firstSourceLocation() const = 0; virtual SourceLocation lastSourceLocation() const = 0; - virtual UiObjectMember *uiObjectMemberCast(); + virtual UiObjectMember *uiObjectMemberCast() Q_DECL_OVERRIDE; }; class QML_PARSER_EXPORT UiObjectMemberList: public Node @@ -2291,12 +2291,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return member->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : member->lastSourceLocation(); } UiObjectMemberList *finish() @@ -2335,12 +2335,12 @@ public: return head; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : identifierToken; } // attributes @@ -2358,12 +2358,12 @@ public: : pragmaType(type) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return pragmaToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return semicolonToken; } // attributes @@ -2408,12 +2408,12 @@ public: return head; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return headerItem->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : headerItem->lastSourceLocation(); } // attributes @@ -2430,9 +2430,9 @@ public: : headers(headers), members(members) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { if (headers) return headers->firstSourceLocation(); @@ -2441,7 +2441,7 @@ public: return SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (members) return members->lastSourceLocation(); @@ -2472,12 +2472,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return member->firstSourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : member->lastSourceLocation(); } UiArrayMemberList *finish() @@ -2502,12 +2502,12 @@ public: : members(members) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return lbraceToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbraceToken; } // attributes @@ -2533,12 +2533,12 @@ public: previous->next = this; } - virtual void accept0(Visitor *); + virtual void accept0(Visitor *) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return propertyTypeToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return next ? next->lastSourceLocation() : identifierToken; } inline UiParameterList *finish () @@ -2573,9 +2573,9 @@ public: : type(Property), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { if (defaultToken.isValid()) return defaultToken; @@ -2585,7 +2585,7 @@ public: return propertyToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (binding) return binding->lastSourceLocation(); @@ -2625,12 +2625,12 @@ public: : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer) { kind = K; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return qualifiedTypeNameId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return initializer->rbraceToken; } // attributes @@ -2647,7 +2647,7 @@ public: : sourceElement(sourceElement) { kind = K; } - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement)) return funDecl->firstSourceLocation(); @@ -2657,7 +2657,7 @@ public: return SourceLocation(); } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement)) return funDecl->lastSourceLocation(); @@ -2667,7 +2667,7 @@ public: return SourceLocation(); } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes @@ -2688,7 +2688,7 @@ public: hasOnToken(false) { kind = K; } - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { if (hasOnToken && qualifiedTypeNameId) return qualifiedTypeNameId->identifierToken; @@ -2696,10 +2696,10 @@ public: return qualifiedId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return initializer->rbraceToken; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes @@ -2721,13 +2721,13 @@ public: statement(statement) { kind = K; } - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return qualifiedId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return statement->lastSourceLocation(); } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes UiQualifiedId *qualifiedId; @@ -2746,13 +2746,13 @@ public: members(members) { kind = K; } - virtual SourceLocation firstSourceLocation() const + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE { return qualifiedId->identifierToken; } - virtual SourceLocation lastSourceLocation() const + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE { return rbracketToken; } - virtual void accept0(Visitor *visitor); + virtual void accept0(Visitor *visitor) Q_DECL_OVERRIDE; // attributes UiQualifiedId *qualifiedId; diff --git a/src/tools/qdoc/qmlvisitor.h b/src/tools/qdoc/qmlvisitor.h index ed9ba7c6eb..418772cdff 100644 --- a/src/tools/qdoc/qmlvisitor.h +++ b/src/tools/qdoc/qmlvisitor.h @@ -67,30 +67,30 @@ public: const QSet<QString> &topics); virtual ~QmlDocVisitor(); - bool visit(QQmlJS::AST::UiImport *import); - void endVisit(QQmlJS::AST::UiImport *definition); + bool visit(QQmlJS::AST::UiImport *import) Q_DECL_OVERRIDE; + void endVisit(QQmlJS::AST::UiImport *definition) Q_DECL_OVERRIDE; - bool visit(QQmlJS::AST::UiObjectDefinition *definition); - void endVisit(QQmlJS::AST::UiObjectDefinition *definition); + bool visit(QQmlJS::AST::UiObjectDefinition *definition) Q_DECL_OVERRIDE; + void endVisit(QQmlJS::AST::UiObjectDefinition *definition) Q_DECL_OVERRIDE; - bool visit(QQmlJS::AST::UiPublicMember *member); - void endVisit(QQmlJS::AST::UiPublicMember *definition); + bool visit(QQmlJS::AST::UiPublicMember *member) Q_DECL_OVERRIDE; + void endVisit(QQmlJS::AST::UiPublicMember *definition) Q_DECL_OVERRIDE; - virtual bool visit(QQmlJS::AST::UiObjectBinding *); - virtual void endVisit(QQmlJS::AST::UiObjectBinding *); - virtual void endVisit(QQmlJS::AST::UiArrayBinding *); - virtual bool visit(QQmlJS::AST::UiArrayBinding *); + virtual bool visit(QQmlJS::AST::UiObjectBinding *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::UiObjectBinding *) Q_DECL_OVERRIDE; + virtual void endVisit(QQmlJS::AST::UiArrayBinding *) Q_DECL_OVERRIDE; + virtual bool visit(QQmlJS::AST::UiArrayBinding *) Q_DECL_OVERRIDE; - bool visit(QQmlJS::AST::IdentifierPropertyName *idproperty); + bool visit(QQmlJS::AST::IdentifierPropertyName *idproperty) Q_DECL_OVERRIDE; - bool visit(QQmlJS::AST::FunctionDeclaration *); - void endVisit(QQmlJS::AST::FunctionDeclaration *); + bool visit(QQmlJS::AST::FunctionDeclaration *) Q_DECL_OVERRIDE; + void endVisit(QQmlJS::AST::FunctionDeclaration *) Q_DECL_OVERRIDE; - bool visit(QQmlJS::AST::UiScriptBinding *); - void endVisit(QQmlJS::AST::UiScriptBinding *); + bool visit(QQmlJS::AST::UiScriptBinding *) Q_DECL_OVERRIDE; + void endVisit(QQmlJS::AST::UiScriptBinding *) Q_DECL_OVERRIDE; - bool visit(QQmlJS::AST::UiQualifiedId *); - void endVisit(QQmlJS::AST::UiQualifiedId *); + bool visit(QQmlJS::AST::UiQualifiedId *) Q_DECL_OVERRIDE; + void endVisit(QQmlJS::AST::UiQualifiedId *) Q_DECL_OVERRIDE; private: QString getFullyQualifiedId(QQmlJS::AST::UiQualifiedId *id); diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h index ce5fd75b5d..162359ca13 100644 --- a/src/tools/uic/cpp/cppextractimages.h +++ b/src/tools/uic/cpp/cppextractimages.h @@ -52,9 +52,9 @@ class ExtractImages : public TreeWalker public: ExtractImages(const Option &opt); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; private: QTextStream *m_output; diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h index 7cd8b3581e..7ce7cd083c 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.h +++ b/src/tools/uic/cpp/cppwritedeclaration.h @@ -50,13 +50,13 @@ struct WriteDeclaration : public TreeWalker { WriteDeclaration(Uic *uic, bool activateScripts); - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - void acceptSpacer(DomSpacer *node); - void acceptLayout(DomLayout *node); - void acceptActionGroup(DomActionGroup *node); - void acceptAction(DomAction *node); - void acceptButtonGroup(const DomButtonGroup *buttonGroup); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; + void acceptAction(DomAction *node) Q_DECL_OVERRIDE; + void acceptButtonGroup(const DomButtonGroup *buttonGroup) Q_DECL_OVERRIDE; private: Uic *m_uic; diff --git a/src/tools/uic/cpp/cppwriteicondata.h b/src/tools/uic/cpp/cppwriteicondata.h index 0dc2bf0721..613b7d7ca3 100644 --- a/src/tools/uic/cpp/cppwriteicondata.h +++ b/src/tools/uic/cpp/cppwriteicondata.h @@ -52,9 +52,9 @@ class WriteIconData : public TreeWalker public: WriteIconData(Uic *uic); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; static void writeImage(QTextStream &output, const QString &indent, bool limitXPM_LineLength, const DomImage *image); diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.h b/src/tools/uic/cpp/cppwriteicondeclaration.h index c093430bec..f717208b59 100644 --- a/src/tools/uic/cpp/cppwriteicondeclaration.h +++ b/src/tools/uic/cpp/cppwriteicondeclaration.h @@ -51,9 +51,9 @@ class WriteIconDeclaration : public TreeWalker public: WriteIconDeclaration(Uic *uic); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; private: Driver *driver; diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.h b/src/tools/uic/cpp/cppwriteiconinitialization.h index d8a0a6195f..53f7de6597 100644 --- a/src/tools/uic/cpp/cppwriteiconinitialization.h +++ b/src/tools/uic/cpp/cppwriteiconinitialization.h @@ -53,9 +53,9 @@ class WriteIconInitialization : public TreeWalker public: WriteIconInitialization(Uic *uic); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; static QString iconFromDataFunction(); diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 6f6a0f6105..0d446514f1 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -53,24 +53,24 @@ struct WriteIncludes : public TreeWalker { WriteIncludes(Uic *uic); - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - void acceptLayout(DomLayout *node); - void acceptSpacer(DomSpacer *node); - void acceptProperty(DomProperty *node); - void acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; + void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE; + void acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &) Q_DECL_OVERRIDE; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node); - void acceptCustomWidget(DomCustomWidget *node); + void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; + void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; // // include hints // - void acceptIncludes(DomIncludes *node); - void acceptInclude(DomInclude *node); + void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE; + void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE; bool scriptsActivated() const { return m_scriptsActivated; } diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 1cf3e750b4..53bc57d376 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -110,47 +110,47 @@ struct WriteInitialization : public TreeWalker // // widgets // - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node); - void acceptSpacer(DomSpacer *node); - void acceptLayoutItem(DomLayoutItem *node); + void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; + void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; // // actions // - void acceptActionGroup(DomActionGroup *node); - void acceptAction(DomAction *node); - void acceptActionRef(DomActionRef *node); + void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; + void acceptAction(DomAction *node) Q_DECL_OVERRIDE; + void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; // // tab stops // - void acceptTabStops(DomTabStops *tabStops); + void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node); - void acceptCustomWidget(DomCustomWidget *node); + void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; + void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; // // layout defaults/functions // - void acceptLayoutDefault(DomLayoutDefault *node) { m_LayoutDefaultHandler.acceptLayoutDefault(node); } - void acceptLayoutFunction(DomLayoutFunction *node) { m_LayoutDefaultHandler.acceptLayoutFunction(node); } + void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); } + void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); } // // signal/slot connections // - void acceptConnection(DomConnection *connection); + void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE; // // images // - void acceptImage(DomImage *image); + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; enum { Use43UiFile = 0, diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 5e58d6c3ce..6b0f7ed81a 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -48,10 +48,10 @@ class CustomWidgetsInfo : public TreeWalker public: CustomWidgetsInfo(); - void acceptUI(DomUI *node); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptCustomWidgets(DomCustomWidgets *node); - void acceptCustomWidget(DomCustomWidget *node); + void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; + void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; inline QStringList customWidgets() const { return m_customWidgets.keys(); } diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index 0c80ad9551..92e0b37fe1 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -47,8 +47,8 @@ class DatabaseInfo : public TreeWalker public: DatabaseInfo(); - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; inline QStringList connections() const { return m_connections; } diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h index 82f6b71b1a..82511776a8 100644 --- a/src/tools/uic/validator.h +++ b/src/tools/uic/validator.h @@ -48,14 +48,14 @@ struct Validator : public TreeWalker { Validator(Uic *uic); - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptLayoutItem(DomLayoutItem *node); - void acceptLayout(DomLayout *node); + void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptActionGroup(DomActionGroup *node); - void acceptAction(DomAction *node); + void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; + void acceptAction(DomAction *node) Q_DECL_OVERRIDE; private: Driver *m_driver; |