summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeproject.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-09-30 14:11:10 +0200
committerTobias Hunger <tobias.hunger@qt.io>2016-09-30 17:59:15 +0000
commit87f7ec4ec9d99fb587b5aa5460184dc500e1aab5 (patch)
treeffb8dbe21375fda40d06d6df87d49d60e190fdcd /src/plugins/cmakeprojectmanager/cmakeproject.h
parent83b14ec359950c37306ecee8fe63f7245f0e967d (diff)
downloadqt-creator-87f7ec4ec9d99fb587b5aa5460184dc500e1aab5.tar.gz
CMake: Clean up CMakeProject
Some polish for the CMakeProject. Remove unnecessary includes, etc. Change-Id: I3a73aac79b2177adc613f31865074f778ef21360 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.h')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeproject.h30
1 files changed, 10 insertions, 20 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index f7e3bac626..f214592d8f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -26,22 +26,13 @@
#pragma once
#include "cmake_global.h"
-#include "cmakeprojectnodes.h"
#include <projectexplorer/extracompiler.h>
#include <projectexplorer/project.h>
-#include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/namedwidget.h>
-#include <coreplugin/idocument.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
#include <utils/fileutils.h>
#include <QFuture>
-#include <QXmlStreamReader>
-#include <QPushButton>
-#include <QLineEdit>
QT_BEGIN_NAMESPACE
class QFileSystemWatcher;
@@ -50,7 +41,6 @@ QT_END_NAMESPACE
namespace CMakeProjectManager {
namespace Internal {
-class BuildDirManager;
class CMakeFile;
class CMakeBuildSettingsWidget;
class CMakeBuildConfiguration;
@@ -92,22 +82,22 @@ class CMAKE_EXPORT CMakeProject : public ProjectExplorer::Project
friend class Internal::CMakeBuildSettingsWidget;
public:
CMakeProject(Internal::CMakeManager *manager, const Utils::FileName &filename);
- ~CMakeProject() override;
+ ~CMakeProject() final;
- QString displayName() const override;
+ QString displayName() const final;
- QStringList files(FilesMode fileMode) const override;
+ QStringList files(FilesMode fileMode) const final;
QStringList buildTargetTitles(bool runnable = false) const;
QList<CMakeBuildTarget> buildTargets() const;
bool hasBuildTarget(const QString &title) const;
CMakeBuildTarget buildTargetForTitle(const QString &title);
- bool needsConfiguration() const override;
- bool requiresTargetPanel() const override;
- bool knowsAllBuildExecutables() const override;
+ bool needsConfiguration() const final;
+ bool requiresTargetPanel() const final;
+ bool knowsAllBuildExecutables() const final;
- bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage = 0) const override;
+ bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage = 0) const final;
void runCMake();
@@ -116,8 +106,8 @@ signals:
void parsingStarted();
protected:
- RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
- bool setupTarget(ProjectExplorer::Target *t) override;
+ RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) final;
+ bool setupTarget(ProjectExplorer::Target *t) final;
private:
void handleCmakeFileChanged();
@@ -132,7 +122,7 @@ private:
void gatherFileNodes(ProjectExplorer::FolderNode *parent, QList<ProjectExplorer::FileNode *> &list) const;
ProjectExplorer::FolderNode *findOrCreateFolder(Internal::CMakeProjectNode *rootNode, QString directory);
void createGeneratedCodeModelSupport();
- QStringList filesGeneratedFrom(const QString &sourceFile) const override;
+ QStringList filesGeneratedFrom(const QString &sourceFile) const final;
void updateTargetRunConfigurations(ProjectExplorer::Target *t);
void updateApplicationAndDeploymentTargets();
QStringList getCXXFlagsFor(const CMakeBuildTarget &buildTarget, QHash<QString, QStringList> &cache);