From 02efc5d028251941fdd3a5010b00f657d77de176 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Tue, 12 Nov 2013 10:58:32 +0100 Subject: [PATCH] qmljs: use QTC_OVERRIDE in qmljsmodelmanager Change-Id: I3cf1c241a236f8b38fda1b4d40c45e75faa3a1f7 Reviewed-by: Thomas Hartmann --- src/plugins/qmljstools/qmljsmodelmanager.h | 55 +++++++++++----------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h index e333e822e25..04cb3d5d4e9 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.h +++ b/src/plugins/qmljstools/qmljsmodelmanager.h @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -75,26 +76,26 @@ public: void delayedInitialization(); - virtual WorkingCopy workingCopy() const; - virtual QmlJS::Snapshot snapshot() const; - virtual QmlJS::Snapshot newestSnapshot() const; + WorkingCopy workingCopy() const QTC_OVERRIDE; + QmlJS::Snapshot snapshot() const QTC_OVERRIDE; + QmlJS::Snapshot newestSnapshot() const QTC_OVERRIDE; - virtual void updateSourceFiles(const QStringList &files, - bool emitDocumentOnDiskChanged); - virtual void fileChangedOnDisk(const QString &path); - virtual void removeFiles(const QStringList &files); - virtual QStringList filesAtQrcPath(const QString &path, const QLocale *locale = 0, - ProjectExplorer::Project *project = 0, - QrcResourceSelector resources = AllQrcResources); - virtual QMap filesInQrcPath(const QString &path, - const QLocale *locale = 0, - ProjectExplorer::Project *project = 0, - bool addDirs = false, - QrcResourceSelector resources = AllQrcResources); + void updateSourceFiles(const QStringList &files, + bool emitDocumentOnDiskChanged) QTC_OVERRIDE; + void fileChangedOnDisk(const QString &path) QTC_OVERRIDE; + void removeFiles(const QStringList &files) QTC_OVERRIDE; + QStringList filesAtQrcPath(const QString &path, const QLocale *locale = 0, + ProjectExplorer::Project *project = 0, + QrcResourceSelector resources = AllQrcResources) QTC_OVERRIDE; + QMap filesInQrcPath(const QString &path, + const QLocale *locale = 0, + ProjectExplorer::Project *project = 0, + bool addDirs = false, + QrcResourceSelector resources = AllQrcResources) QTC_OVERRIDE; - virtual QList projectInfos() const; - virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const; - virtual void updateProjectInfo(const ProjectInfo &pinfo); + QList projectInfos() const QTC_OVERRIDE; + ProjectInfo projectInfo(ProjectExplorer::Project *project) const QTC_OVERRIDE; + void updateProjectInfo(const ProjectInfo &pinfo) QTC_OVERRIDE; Q_SLOT virtual void removeProjectInfo(ProjectExplorer::Project *project); virtual ProjectInfo projectInfoForPath(QString path); @@ -103,21 +104,21 @@ public: void emitDocumentChangedOnDisk(QmlJS::Document::Ptr doc); void updateQrcFile(const QString &path); - virtual QStringList importPaths() const; - virtual QmlJS::QmlLanguageBundles activeBundles() const; - virtual QmlJS::QmlLanguageBundles extendedBundles() const; + QStringList importPaths() const QTC_OVERRIDE; + QmlJS::QmlLanguageBundles activeBundles() const QTC_OVERRIDE; + QmlJS::QmlLanguageBundles extendedBundles() const QTC_OVERRIDE; - virtual void loadPluginTypes(const QString &libraryPath, const QString &importPath, - const QString &importUri, const QString &importVersion); + void loadPluginTypes(const QString &libraryPath, const QString &importPath, + const QString &importUri, const QString &importVersion) QTC_OVERRIDE; - virtual CppDataHash cppData() const; + CppDataHash cppData() const QTC_OVERRIDE; - virtual QmlJS::LibraryInfo builtins(const QmlJS::Document::Ptr &doc) const; + QmlJS::LibraryInfo builtins(const QmlJS::Document::Ptr &doc) const QTC_OVERRIDE; - virtual void joinAllThreads(); + void joinAllThreads() QTC_OVERRIDE; public slots: - virtual void resetCodeModel(); + void resetCodeModel() QTC_OVERRIDE; Q_SIGNALS: void projectPathChanged(const QString &projectPath);