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

QmakeProjectManager: Use override consistently

Browse Source 
clang-tidy fixes from modernize-use-override check.

Change-Id: If75d8ae6b75edf271602e9352ea4cfac849c40ee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2018-05-07 15:04:50 +02:00
parent 0b86937dda
commit bd87969b63
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
View File

@@ -59,7 +59,7 @@ private:
void slotCurrentRowChanged(const QModelIndex &,const QModelIndex &); void slotCurrentRowChanged(const QModelIndex &,const QModelIndex &);
protected: protected:
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event) override;
private: private:
ClassModel *m_model; ClassModel *m_model;

6
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
View File

@@ -48,7 +48,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplore
public: public:
explicit QmakeBuildConfiguration(ProjectExplorer::Target *target); explicit QmakeBuildConfiguration(ProjectExplorer::Target *target);
~QmakeBuildConfiguration(); ~QmakeBuildConfiguration() override;
void initialize(const ProjectExplorer::BuildInfo *info) override; void initialize(const ProjectExplorer::BuildInfo *info) override;
ProjectExplorer::NamedWidget *createConfigWidget() override; ProjectExplorer::NamedWidget *createConfigWidget() override;
@@ -93,8 +93,8 @@ public:
QVariantMap toMap() const override; QVariantMap toMap() const override;
virtual bool isEnabled() const override; bool isEnabled() const override;
virtual QString disabledReason() const override; QString disabledReason() const override;
/// \internal For QmakeProject, since that manages the parsing information /// \internal For QmakeProject, since that manages the parsing information
void setEnabled(bool enabled); void setEnabled(bool enabled);

2
src/plugins/qmakeprojectmanager/qmakebuildinfo.h
View File

@@ -61,7 +61,7 @@ public:
&& config == other->config; && config == other->config;
} }
QList<Task> reportIssues(const QString &projectPath, const QString &buildDir) const QList<Task> reportIssues(const QString &projectPath, const QString &buildDir) const override
{ {
ProjectExplorer::Kit *k = ProjectExplorer::KitManager::kit(kitId); ProjectExplorer::Kit *k = ProjectExplorer::KitManager::kit(kitId);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);

2
src/plugins/qmakeprojectmanager/qmakeparser.h
View File

@@ -39,7 +39,7 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeParser : public ProjectExplorer::IOutputPa
public: public:
QMakeParser(); QMakeParser();
void stdError(const QString &line); void stdError(const QString &line) override;
private: private:
QRegExp m_error; QRegExp m_error;

2
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -64,7 +64,7 @@ public:
QmakeProFileNode *rootProjectNode() const final; QmakeProFileNode *rootProjectNode() const final;
virtual QStringList filesGeneratedFrom(const QString &file) const final; QStringList filesGeneratedFrom(const QString &file) const final;
enum Parsing {ExactParse, ExactAndCumulativeParse }; enum Parsing {ExactParse, ExactAndCumulativeParse };
QList<QmakeProFile *> allProFiles(const QList<ProjectType> &projectTypes = QList<ProjectType>(), QList<QmakeProFile *> allProFiles(const QList<ProjectType> &projectTypes = QList<ProjectType>(),

8
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -193,10 +193,10 @@ class QMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
Q_OBJECT Q_OBJECT
public: public:
QMakeStepConfigWidget(QMakeStep *step); QMakeStepConfigWidget(QMakeStep *step);
~QMakeStepConfigWidget(); ~QMakeStepConfigWidget() override;
QString summaryText() const; QString summaryText() const override;
QString additionalSummaryText() const; QString additionalSummaryText() const override;
QString displayName() const; QString displayName() const override;
private: private:
// slots for handling buildconfiguration/step signals // slots for handling buildconfiguration/step signals
void qtVersionChanged(); void qtVersionChanged();