diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.h b/src/plugins/valgrind/callgrind/callgrindcallmodel.h index d420abb33b2..b10e872844b 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.h @@ -43,7 +43,7 @@ class CallModel : public QAbstractItemModel Q_OBJECT public: CallModel(); - virtual ~CallModel(); + ~CallModel() override; void clear(); @@ -59,12 +59,12 @@ public: QVector calls() const; const Function *function() const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex parent(const QModelIndex &child) const; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; enum Columns { CallerColumn, diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h index b1df49d9177..1c235e3c7d2 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.h +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h @@ -41,7 +41,7 @@ class DataModel : public QAbstractItemModel public: DataModel(); - virtual ~DataModel(); + ~DataModel() override; virtual void setParseData(const ParseData *data); virtual const ParseData *parseData() const; @@ -53,13 +53,13 @@ public: /// By default it is the first event in the @c ParseData, i.e. 0. virtual int costEvent() const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex parent(const QModelIndex &child) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const override; QModelIndex indexForObject(const Function *function) const; diff --git a/src/plugins/valgrind/callgrind/callgrindparser.h b/src/plugins/valgrind/callgrind/callgrindparser.h index 76f1430a2e0..7d53b8abc38 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.h +++ b/src/plugins/valgrind/callgrind/callgrindparser.h @@ -51,7 +51,7 @@ class Parser : public QObject public: explicit Parser(QObject *parent = 0); - ~Parser(); + ~Parser() override; // get and take ownership of the parsing results. If this function is not called the repository // will be destroyed when the parser is destroyed. Subsequent calls return null. diff --git a/src/plugins/valgrind/callgrind/callgrindproxymodel.h b/src/plugins/valgrind/callgrind/callgrindproxymodel.h index 12a5213a277..994e8ed67f4 100644 --- a/src/plugins/valgrind/callgrind/callgrindproxymodel.h +++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.h @@ -40,7 +40,7 @@ class DataProxyModel : public QSortFilterProxyModel public: explicit DataProxyModel(QObject *parent = 0); - virtual void setSourceModel(QAbstractItemModel *sourceModel); + void setSourceModel(QAbstractItemModel *sourceModel) override; QString filterBaseDir() const { return m_baseDir; } const Function *filterFunction() const; @@ -63,7 +63,7 @@ signals: void filterMaximumRowsChanged(int rows); protected: - virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; private: DataModel *dataModel() const; diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h index e6a4fbd8eee..cc41ffab879 100644 --- a/src/plugins/valgrind/valgrindplugin.h +++ b/src/plugins/valgrind/valgrindplugin.h @@ -41,7 +41,7 @@ class ValgrindPlugin : public ExtensionSystem::IPlugin public: ValgrindPlugin() {} - ~ValgrindPlugin(); + ~ValgrindPlugin() override; bool initialize(const QStringList &arguments, QString *errorString) override; void extensionsInitialized() override; diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index 2fc308fb7af..b45e3e3d7e2 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -42,7 +42,7 @@ class ValgrindRunner : public QObject public: explicit ValgrindRunner(QObject *parent = 0); - ~ValgrindRunner(); + ~ValgrindRunner() override; void setValgrindExecutable(const QString &executable); void setValgrindArguments(const QStringList &toolArguments); diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index 35eca30f4fc..a076596ff30 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -61,8 +61,8 @@ public: ValgrindBaseSettings(ProjectExplorer::RunConfiguration *runConfiguration = nullptr); - void toMap(QVariantMap &map) const; - void fromMap(const QVariantMap &map); + void toMap(QVariantMap &map) const override; + void fromMap(const QVariantMap &map) override; signals: void changed(); // sent when multiple values have changed simulatenously (e.g. fromMap) @@ -184,17 +184,17 @@ public: ValgrindGlobalSettings(); QWidget *createConfigWidget(QWidget *parent) override; - void toMap(QVariantMap &map) const; - void fromMap(const QVariantMap &map); + void toMap(QVariantMap &map) const override; + void fromMap(const QVariantMap &map) override; /* * Global memcheck settings */ public: - QStringList suppressionFiles() const; + QStringList suppressionFiles() const override; // in the global settings we change the internal list directly - void addSuppressionFiles(const QStringList &); - void removeSuppressionFiles(const QStringList &); + void addSuppressionFiles(const QStringList &) override; + void removeSuppressionFiles(const QStringList &) override; // internal settings which don't require any UI void setLastSuppressionDialogDirectory(const QString &directory); @@ -242,17 +242,17 @@ public: ValgrindProjectSettings(ProjectExplorer::RunConfiguration *runConfiguration); QWidget *createConfigWidget(QWidget *parent) override; - void toMap(QVariantMap &map) const; - void fromMap(const QVariantMap &map); + void toMap(QVariantMap &map) const override; + void fromMap(const QVariantMap &map) override; /** * Per-project memcheck settings, saves a diff to the global suppression files list */ public: - QStringList suppressionFiles() const; + QStringList suppressionFiles() const override; // in the project-specific settings we store a diff to the global list - void addSuppressionFiles(const QStringList &suppressions); - void removeSuppressionFiles(const QStringList &suppressions); + void addSuppressionFiles(const QStringList &suppressions) override; + void removeSuppressionFiles(const QStringList &suppressions) override; private: QStringList m_disabledGlobalSuppressionFiles;