feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: use QTC_OVERRIDE in qmljsmodelmanager

Browse Source 
Change-Id: I3cf1c241a236f8b38fda1b4d40c45e75faa3a1f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-11-12 10:58:32 +01:00
parent c32317d198
commit 02efc5d028
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/plugins/qmljstools/qmljsmodelmanager.h
View File

@@ -36,6 +36,7 @@
#include <qmljs/qmljsqrcparser.h> #include <qmljs/qmljsqrcparser.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <utils/qtcoverride.h>
#include <QFuture> #include <QFuture>
#include <QFutureSynchronizer> #include <QFutureSynchronizer>
@@ -75,26 +76,26 @@ public:
void delayedInitialization(); void delayedInitialization();
virtual WorkingCopy workingCopy() const; WorkingCopy workingCopy() const QTC_OVERRIDE;
virtual QmlJS::Snapshot snapshot() const; QmlJS::Snapshot snapshot() const QTC_OVERRIDE;
virtual QmlJS::Snapshot newestSnapshot() const; QmlJS::Snapshot newestSnapshot() const QTC_OVERRIDE;
virtual void updateSourceFiles(const QStringList &files, void updateSourceFiles(const QStringList &files,
bool emitDocumentOnDiskChanged); bool emitDocumentOnDiskChanged) QTC_OVERRIDE;
virtual void fileChangedOnDisk(const QString &path); void fileChangedOnDisk(const QString &path) QTC_OVERRIDE;
virtual void removeFiles(const QStringList &files); void removeFiles(const QStringList &files) QTC_OVERRIDE;
virtual QStringList filesAtQrcPath(const QString &path, const QLocale *locale = 0, QStringList filesAtQrcPath(const QString &path, const QLocale *locale = 0,
ProjectExplorer::Project *project = 0, ProjectExplorer::Project *project = 0,
QrcResourceSelector resources = AllQrcResources); QrcResourceSelector resources = AllQrcResources) QTC_OVERRIDE;
virtual QMap<QString,QStringList> filesInQrcPath(const QString &path, QMap<QString,QStringList> filesInQrcPath(const QString &path,
const QLocale *locale = 0, const QLocale *locale = 0,
ProjectExplorer::Project *project = 0, ProjectExplorer::Project *project = 0,
bool addDirs = false, bool addDirs = false,
QrcResourceSelector resources = AllQrcResources); QrcResourceSelector resources = AllQrcResources) QTC_OVERRIDE;
virtual QList<ProjectInfo> projectInfos() const; QList<ProjectInfo> projectInfos() const QTC_OVERRIDE;
virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const; ProjectInfo projectInfo(ProjectExplorer::Project *project) const QTC_OVERRIDE;
virtual void updateProjectInfo(const ProjectInfo &pinfo); void updateProjectInfo(const ProjectInfo &pinfo) QTC_OVERRIDE;
Q_SLOT virtual void removeProjectInfo(ProjectExplorer::Project *project); Q_SLOT virtual void removeProjectInfo(ProjectExplorer::Project *project);
virtual ProjectInfo projectInfoForPath(QString path); virtual ProjectInfo projectInfoForPath(QString path);
@@ -103,21 +104,21 @@ public:
void emitDocumentChangedOnDisk(QmlJS::Document::Ptr doc); void emitDocumentChangedOnDisk(QmlJS::Document::Ptr doc);
void updateQrcFile(const QString &path); void updateQrcFile(const QString &path);
virtual QStringList importPaths() const; QStringList importPaths() const QTC_OVERRIDE;
virtual QmlJS::QmlLanguageBundles activeBundles() const; QmlJS::QmlLanguageBundles activeBundles() const QTC_OVERRIDE;
virtual QmlJS::QmlLanguageBundles extendedBundles() const; QmlJS::QmlLanguageBundles extendedBundles() const QTC_OVERRIDE;
virtual void loadPluginTypes(const QString &libraryPath, const QString &importPath, void loadPluginTypes(const QString &libraryPath, const QString &importPath,
const QString &importUri, const QString &importVersion); 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: public slots:
virtual void resetCodeModel(); void resetCodeModel() QTC_OVERRIDE;
Q_SIGNALS: Q_SIGNALS:
void projectPathChanged(const QString &projectPath); void projectPathChanged(const QString &projectPath);