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

Valgrind: Use override consistently

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

Change-Id: I86854125710ee2a24f4b663546f87baafefb9679
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-05-07 15:06:00 +02:00
parent a939ec8244
commit f531f76d04
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/valgrind/callgrind/callgrindcallmodel.h
View File

@@ -43,7 +43,7 @@ class CallModel : public QAbstractItemModel
Q_OBJECT Q_OBJECT
public: public:
CallModel(); CallModel();
virtual ~CallModel(); ~CallModel() override;
void clear(); void clear();
@@ -59,12 +59,12 @@ public:
QVector<const FunctionCall *> calls() const; QVector<const FunctionCall *> calls() const;
const Function *function() const; const Function *function() const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
enum Columns { enum Columns {
CallerColumn, CallerColumn,

16
src/plugins/valgrind/callgrind/callgrinddatamodel.h
View File

@@ -41,7 +41,7 @@ class DataModel : public QAbstractItemModel
public: public:
DataModel(); DataModel();
virtual ~DataModel(); ~DataModel() override;
virtual void setParseData(const ParseData *data); virtual void setParseData(const ParseData *data);
virtual const ParseData *parseData() const; virtual const ParseData *parseData() const;
@@ -53,13 +53,13 @@ public:
/// By default it is the first event in the @c ParseData, i.e. 0. /// By default it is the first event in the @c ParseData, i.e. 0.
virtual int costEvent() const; virtual int costEvent() const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
virtual QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData(int section, Qt::Orientation orientation, QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const; int role = Qt::DisplayRole) const override;
QModelIndex indexForObject(const Function *function) const; QModelIndex indexForObject(const Function *function) const;

2
src/plugins/valgrind/callgrind/callgrindparser.h
View File

@@ -51,7 +51,7 @@ class Parser : public QObject
public: public:
explicit Parser(QObject *parent = 0); explicit Parser(QObject *parent = 0);
~Parser(); ~Parser() override;
// get and take ownership of the parsing results. If this function is not called the repository // 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. // will be destroyed when the parser is destroyed. Subsequent calls return null.

4
src/plugins/valgrind/callgrind/callgrindproxymodel.h
View File

@@ -40,7 +40,7 @@ class DataProxyModel : public QSortFilterProxyModel
public: public:
explicit DataProxyModel(QObject *parent = 0); explicit DataProxyModel(QObject *parent = 0);
virtual void setSourceModel(QAbstractItemModel *sourceModel); void setSourceModel(QAbstractItemModel *sourceModel) override;
QString filterBaseDir() const { return m_baseDir; } QString filterBaseDir() const { return m_baseDir; }
const Function *filterFunction() const; const Function *filterFunction() const;
@@ -63,7 +63,7 @@ signals:
void filterMaximumRowsChanged(int rows); void filterMaximumRowsChanged(int rows);
protected: protected:
virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const; bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
private: private:
DataModel *dataModel() const; DataModel *dataModel() const;

2
src/plugins/valgrind/valgrindplugin.h
View File

@@ -41,7 +41,7 @@ class ValgrindPlugin : public ExtensionSystem::IPlugin
public: public:
ValgrindPlugin() {} ValgrindPlugin() {}
~ValgrindPlugin(); ~ValgrindPlugin() override;
bool initialize(const QStringList &arguments, QString *errorString) override; bool initialize(const QStringList &arguments, QString *errorString) override;
void extensionsInitialized() override; void extensionsInitialized() override;

2
src/plugins/valgrind/valgrindrunner.h
View File

@@ -42,7 +42,7 @@ class ValgrindRunner : public QObject
public: public:
explicit ValgrindRunner(QObject *parent = 0); explicit ValgrindRunner(QObject *parent = 0);
~ValgrindRunner(); ~ValgrindRunner() override;
void setValgrindExecutable(const QString &executable); void setValgrindExecutable(const QString &executable);
void setValgrindArguments(const QStringList &toolArguments); void setValgrindArguments(const QStringList &toolArguments);

24
src/plugins/valgrind/valgrindsettings.h
View File

@@ -61,8 +61,8 @@ public:
ValgrindBaseSettings(ProjectExplorer::RunConfiguration *runConfiguration = nullptr); ValgrindBaseSettings(ProjectExplorer::RunConfiguration *runConfiguration = nullptr);
void toMap(QVariantMap &map) const; void toMap(QVariantMap &map) const override;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map) override;
signals: signals:
void changed(); // sent when multiple values have changed simulatenously (e.g. fromMap) void changed(); // sent when multiple values have changed simulatenously (e.g. fromMap)
@@ -184,17 +184,17 @@ public:
ValgrindGlobalSettings(); ValgrindGlobalSettings();
QWidget *createConfigWidget(QWidget *parent) override; QWidget *createConfigWidget(QWidget *parent) override;
void toMap(QVariantMap &map) const; void toMap(QVariantMap &map) const override;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map) override;
/* /*
* Global memcheck settings * Global memcheck settings
*/ */
public: public:
QStringList suppressionFiles() const; QStringList suppressionFiles() const override;
// in the global settings we change the internal list directly // in the global settings we change the internal list directly
void addSuppressionFiles(const QStringList &); void addSuppressionFiles(const QStringList &) override;
void removeSuppressionFiles(const QStringList &); void removeSuppressionFiles(const QStringList &) override;
// internal settings which don't require any UI // internal settings which don't require any UI
void setLastSuppressionDialogDirectory(const QString &directory); void setLastSuppressionDialogDirectory(const QString &directory);
@@ -242,17 +242,17 @@ public:
ValgrindProjectSettings(ProjectExplorer::RunConfiguration *runConfiguration); ValgrindProjectSettings(ProjectExplorer::RunConfiguration *runConfiguration);
QWidget *createConfigWidget(QWidget *parent) override; QWidget *createConfigWidget(QWidget *parent) override;
void toMap(QVariantMap &map) const; void toMap(QVariantMap &map) const override;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map) override;
/** /**
* Per-project memcheck settings, saves a diff to the global suppression files list * Per-project memcheck settings, saves a diff to the global suppression files list
*/ */
public: public:
QStringList suppressionFiles() const; QStringList suppressionFiles() const override;
// in the project-specific settings we store a diff to the global list // in the project-specific settings we store a diff to the global list
void addSuppressionFiles(const QStringList &suppressions); void addSuppressionFiles(const QStringList &suppressions) override;
void removeSuppressionFiles(const QStringList &suppressions); void removeSuppressionFiles(const QStringList &suppressions) override;
private: private:
QStringList m_disabledGlobalSuppressionFiles; QStringList m_disabledGlobalSuppressionFiles;