From 80bd696270a53a1c8c4c601dff79dddbc1cd6d51 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 20 Dec 2017 17:48:37 +0100 Subject: [PATCH] QmakeProject: De-virtualize some QmakePriFile functions Some left-over from the time they were nodes. It's not used polymorphically anymore. Change-Id: I98e75eb5378abdf27e4538041b07c09fa1f9fcc5 Reviewed-by: Christian Kandeler Reviewed-by: Tobias Hunger --- .../qmakeprojectmanager/qmakeparsernodes.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index 4c5c84ca439..27dad4aae92 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h @@ -132,17 +132,16 @@ public: void update(const Internal::QmakePriFileEvalResult &result); - // ProjectNode interface - virtual bool canAddSubProject(const QString &proFilePath) const; + bool canAddSubProject(const QString &proFilePath) const; - virtual bool addSubProject(const QString &proFile); - virtual bool removeSubProjects(const QString &proFilePath); + bool addSubProject(const QString &proFile); + bool removeSubProjects(const QString &proFilePath); - virtual bool addFiles(const QStringList &filePaths, QStringList *notAdded = nullptr); - virtual bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = nullptr); - virtual bool deleteFiles(const QStringList &filePaths); - virtual bool canRenameFile(const QString &filePath, const QString &newFilePath); - virtual bool renameFile(const QString &filePath, const QString &newFilePath); + bool addFiles(const QStringList &filePaths, QStringList *notAdded = nullptr); + bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = nullptr); + bool deleteFiles(const QStringList &filePaths); + bool canRenameFile(const QString &filePath, const QString &newFilePath); + bool renameFile(const QString &filePath, const QString &newFilePath); bool setProVariable(const QString &var, const QStringList &values, const QString &scope = QString(), @@ -150,7 +149,7 @@ public: bool folderChanged(const QString &changedFolder, const QSet &newFiles); - virtual bool deploysFolder(const QString &folder) const; + bool deploysFolder(const QString &folder) const; QmakeProFile *proFile() const; QVector subPriFilesExact() const;