From c4b07bf7308b34542f83d9f5873330e4752757bb Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sun, 4 Nov 2018 22:30:54 +0100 Subject: [PATCH] ClangTools: Modernize modernize-use-nullptr modernize-use-override modernize-use-equals-default Change-Id: I14a840c6f2972f57763cdfd4bb4483df1ec261d4 Reviewed-by: Orgad Shaneh Reviewed-by: Marco Bubke --- src/plugins/clangtools/clangselectablefilesdialog.cpp | 2 +- src/plugins/clangtools/clangtidyclazyruncontrol.cpp | 2 +- src/plugins/clangtools/clangtool.h | 2 +- src/plugins/clangtools/clangtoolruncontrol.cpp | 2 +- src/plugins/clangtools/clangtoolruncontrol.h | 2 +- src/plugins/clangtools/clangtoolrunner.h | 2 +- src/plugins/clangtools/clangtoolsbasicsettings.h | 4 ++-- src/plugins/clangtools/clangtoolsconfigwidget.h | 2 +- src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp | 4 ++-- src/plugins/clangtools/clangtoolsdiagnosticmodel.h | 2 +- src/plugins/clangtools/clangtoolsdiagnosticview.cpp | 6 +++--- src/plugins/clangtools/clangtoolsdiagnosticview.h | 4 ++-- src/plugins/clangtools/clangtoolsplugin.cpp | 6 +++--- src/plugins/clangtools/clangtoolsprojectsettings.h | 2 +- .../clangtools/clangtoolsprojectsettingswidget.cpp | 11 ++++++----- .../clangtools/clangtoolsprojectsettingswidget.h | 4 ++-- src/plugins/clangtools/clangtoolsunittests.h | 2 +- 17 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/plugins/clangtools/clangselectablefilesdialog.cpp b/src/plugins/clangtools/clangselectablefilesdialog.cpp index 08ba746553d..22c8d150c18 100644 --- a/src/plugins/clangtools/clangselectablefilesdialog.cpp +++ b/src/plugins/clangtools/clangselectablefilesdialog.cpp @@ -363,7 +363,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo, }); } -SelectableFilesDialog::~SelectableFilesDialog() {} +SelectableFilesDialog::~SelectableFilesDialog() = default; FileInfos SelectableFilesDialog::filteredFileInfos() const { diff --git a/src/plugins/clangtools/clangtidyclazyruncontrol.cpp b/src/plugins/clangtools/clangtidyclazyruncontrol.cpp index 38d8d82094e..3d7d63a84a9 100644 --- a/src/plugins/clangtools/clangtidyclazyruncontrol.cpp +++ b/src/plugins/clangtools/clangtidyclazyruncontrol.cpp @@ -47,7 +47,7 @@ ClangTidyClazyRunControl::ClangTidyClazyRunControl( ClangToolRunner *ClangTidyClazyRunControl::createRunner() { - QTC_ASSERT(!m_clangExecutable.isEmpty(), return 0); + QTC_ASSERT(!m_clangExecutable.isEmpty(), return nullptr); auto runner = new ClangTidyClazyRunner(m_diagnosticConfig, m_clangExecutable, diff --git a/src/plugins/clangtools/clangtool.h b/src/plugins/clangtools/clangtool.h index 39d66b7e737..93f7a610505 100644 --- a/src/plugins/clangtools/clangtool.h +++ b/src/plugins/clangtools/clangtool.h @@ -44,7 +44,7 @@ class ClangTool : public QObject public: ClangTool(const QString &name); - virtual ~ClangTool(); + ~ClangTool() override; virtual void startTool(bool askUserForFileSelection) = 0; diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 05f44f62132..d73ab10cc4c 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -354,7 +354,7 @@ void ClangToolRunControl::stop() QSetIterator i(m_runners); while (i.hasNext()) { ClangToolRunner *runner = i.next(); - QObject::disconnect(runner, 0, this, 0); + QObject::disconnect(runner, nullptr, this, nullptr); delete runner; } m_runners.clear(); diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h index dd5a95662ef..ee4f8fe8ef7 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.h +++ b/src/plugins/clangtools/clangtoolruncontrol.h @@ -50,7 +50,7 @@ struct AnalyzeUnit { QString file; QStringList arguments; // without file itself and "-o somePath" }; -typedef QList AnalyzeUnits; +using AnalyzeUnits = QList; class ClangToolRunControl : public ProjectExplorer::RunWorker { diff --git a/src/plugins/clangtools/clangtoolrunner.h b/src/plugins/clangtools/clangtoolrunner.h index 01585a8ca77..b0d0b605cc7 100644 --- a/src/plugins/clangtools/clangtoolrunner.h +++ b/src/plugins/clangtools/clangtoolrunner.h @@ -45,7 +45,7 @@ public: const Utils::Environment &environment, const QString &name, QObject *parent = nullptr); - virtual ~ClangToolRunner(); + ~ClangToolRunner() override; // compilerOptions is expected to contain everything except: // (1) filePath, that is the file to analyze diff --git a/src/plugins/clangtools/clangtoolsbasicsettings.h b/src/plugins/clangtools/clangtoolsbasicsettings.h index 27cdb427865..fb896e830de 100644 --- a/src/plugins/clangtools/clangtoolsbasicsettings.h +++ b/src/plugins/clangtools/clangtoolsbasicsettings.h @@ -38,8 +38,8 @@ class ClangToolsBasicSettings : public QWidget Q_OBJECT public: - explicit ClangToolsBasicSettings(QWidget *parent = 0); - ~ClangToolsBasicSettings(); + explicit ClangToolsBasicSettings(QWidget *parent = nullptr); + ~ClangToolsBasicSettings() override; Ui::ClangToolsBasicSettings *ui(); private: diff --git a/src/plugins/clangtools/clangtoolsconfigwidget.h b/src/plugins/clangtools/clangtoolsconfigwidget.h index 6d7bcc87e5e..177aadd259b 100644 --- a/src/plugins/clangtools/clangtoolsconfigwidget.h +++ b/src/plugins/clangtools/clangtoolsconfigwidget.h @@ -44,7 +44,7 @@ class ClangToolsConfigWidget : public QWidget public: ClangToolsConfigWidget(ClangToolsSettings *settings, QWidget *parent = nullptr); - ~ClangToolsConfigWidget(); + ~ClangToolsConfigWidget() override; private: std::unique_ptr m_ui; ClangToolsSettings *m_settings; diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp index 6a288a00d2b..977b264afcc 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp @@ -87,7 +87,7 @@ int ClangToolsDiagnosticModel::diagnosticsCount() const static QString createDiagnosticToolTipString(const Diagnostic &diagnostic) { - typedef QPair StringPair; + using StringPair = QPair; QList lines; if (!diagnostic.category.isEmpty()) { @@ -140,7 +140,7 @@ static QString createExplainingStepToolTipString(const ExplainingStep &step) if (step.message == step.extendedMessage) return createFullLocationString(step.location); - typedef QPair StringPair; + using StringPair = QPair; QList lines; if (!step.message.isEmpty()) { diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h index 6ced6bfe22d..998989699eb 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h @@ -115,7 +115,7 @@ public: ProjectExplorer::Project *project() const { return m_project; } private: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; void handleSuppressedDiagnosticsChanged(); QPointer m_project; diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp index 6314697593f..e181471f66d 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp @@ -47,7 +47,7 @@ class ClickableFixItHeader : public QHeaderView Q_OBJECT public: - ClickableFixItHeader(Qt::Orientation orientation, QWidget *parent = 0) + ClickableFixItHeader(Qt::Orientation orientation, QWidget *parent = nullptr) : QHeaderView(orientation, parent) { } @@ -58,7 +58,7 @@ public: } protected: - void paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const + void paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const override { painter->save(); QHeaderView::paintSection(painter, rect, logicalIndex); @@ -72,7 +72,7 @@ protected: } } - void mousePressEvent(QMouseEvent *event) + void mousePressEvent(QMouseEvent *event) override { if (event->localPos().x() > sectionPosition(DiagnosticView::FixItColumn)) { state = (state != QStyle::State_On) ? QStyle::State_On : QStyle::State_Off; diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.h b/src/plugins/clangtools/clangtoolsdiagnosticview.h index 581775c0aee..b0752a3046d 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticview.h +++ b/src/plugins/clangtools/clangtoolsdiagnosticview.h @@ -35,7 +35,7 @@ class DiagnosticView : public Debugger::DetailedErrorView Q_OBJECT public: - DiagnosticView(QWidget *parent = 0); + DiagnosticView(QWidget *parent = nullptr); enum ExtraColumn { FixItColumn = LocationColumn + 1, @@ -46,7 +46,7 @@ public: private: void suppressCurrentDiagnostic(); - QList customActions() const; + QList customActions() const override; bool eventFilter(QObject *watched, QEvent *event) override; void setModel(QAbstractItemModel *model) override; diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index c78db789625..e3f5653da3c 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -82,19 +82,19 @@ public: setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } - QWidget *widget() + QWidget *widget() override { if (!m_widget) m_widget = new ClangToolsConfigWidget(ClangToolsSettings::instance()); return m_widget; } - void apply() + void apply() override { ClangToolsSettings::instance()->writeSettings(); } - void finish() + void finish() override { delete m_widget; } diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.h b/src/plugins/clangtools/clangtoolsprojectsettings.h index e6a3351ca74..fb52862966b 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettings.h +++ b/src/plugins/clangtools/clangtoolsprojectsettings.h @@ -65,7 +65,7 @@ inline bool operator==(const SuppressedDiagnostic &d1, const SuppressedDiagnosti && d1.uniquifier == d2.uniquifier; } -typedef QList SuppressedDiagnosticsList; +using SuppressedDiagnosticsList = QList; class ClangToolsProjectSettings : public QObject { diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp index 19b648fac01..419e2e917f0 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp +++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp @@ -39,7 +39,7 @@ class SuppressedDiagnosticsModel : public QAbstractTableModel { Q_OBJECT public: - SuppressedDiagnosticsModel(QObject *parent = 0) : QAbstractTableModel(parent) { } + SuppressedDiagnosticsModel(QObject *parent = nullptr) : QAbstractTableModel(parent) { } void setDiagnostics(const SuppressedDiagnosticsList &diagnostics); SuppressedDiagnostic diagnosticAt(int i) const; @@ -47,10 +47,11 @@ public: private: enum Columns { ColumnFile, ColumnContext, ColumnDescription, ColumnLast = ColumnDescription }; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex & = QModelIndex()) const { return ColumnLast + 1; } - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex & = QModelIndex()) const override { return ColumnLast + 1; } + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; SuppressedDiagnosticsList m_diagnostics; }; diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.h b/src/plugins/clangtools/clangtoolsprojectsettingswidget.h index 2e29a613187..f9153f75a63 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.h +++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.h @@ -40,8 +40,8 @@ class ProjectSettingsWidget : public QWidget Q_OBJECT public: - explicit ProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent = 0); - ~ProjectSettingsWidget(); + explicit ProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent = nullptr); + ~ProjectSettingsWidget() override; private: void updateButtonStates(); diff --git a/src/plugins/clangtools/clangtoolsunittests.h b/src/plugins/clangtools/clangtoolsunittests.h index 36a2fe7e042..4ea2ebd9085 100644 --- a/src/plugins/clangtools/clangtoolsunittests.h +++ b/src/plugins/clangtools/clangtoolsunittests.h @@ -37,7 +37,7 @@ class ClangToolsUnitTests : public QObject Q_OBJECT public: - ClangToolsUnitTests() {} + ClangToolsUnitTests() = default; private slots: void initTestCase();