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

Remove a few redundant occurrences of 'virtual' and 'override'

Browse Source 
warning: 'virtual' is redundant since the function is already declared
'override' [modernize-use-override]

warning: 'override' is redundant since the function is already declared
'final' [modernize-use-override]

Change-Id: I9036a0dc88ed70c4f6e37b916bb24ff65074863d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2018-06-15 19:26:02 +02:00
parent acb611c8cf
commit b16ba2ba59
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/qmljs/qmljsdocument.cpp
View File

@@ -248,21 +248,22 @@ public:
{}
virtual void pragmaLibrary(int line, int column) override
void pragmaLibrary(int line, int column) override
{
isLibrary = true;
addLocation(line, column);
}
virtual void importFile(const QString &jsfile, const QString &module,
int line, int column) override
void importFile(const QString &jsfile, const QString &module,
int line, int column) override
{
imports += ImportInfo::pathImport(
documentPath, jsfile, LanguageUtils::ComponentVersion(), module);
addLocation(line, column);
}
virtual void importModule(const QString &uri, const QString &version, const QString &module,
int line, int column) override
void importModule(const QString &uri, const QString &version, const QString &module,
int line, int column) override
{
imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module);
addLocation(line, column);

8
src/plugins/coreplugin/mimetypesettings.cpp
View File

@@ -85,11 +85,11 @@ public:
: QAbstractTableModel(parent) {}
virtual ~MimeTypeSettingsModel() {}
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QVariant headerData(int section, Qt::Orientation orientation,
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const override;
virtual QVariant data(const QModelIndex &modelIndex, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &modelIndex, int role = Qt::DisplayRole) const override;
void load();

2
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -79,7 +79,7 @@ public:
DescriptionEditorWidget(QWidget *parent = nullptr);
~DescriptionEditorWidget() override;
virtual QSize sizeHint() const override;
QSize sizeHint() const override;
protected:
void setDisplaySettings(const DisplaySettings &ds) override;

8
src/plugins/qmakeprojectmanager/profileeditor.cpp
View File

@@ -57,10 +57,10 @@ namespace Internal {
class ProFileEditorWidget : public TextEditorWidget
{
protected:
virtual void findLinkAt(const QTextCursor &,
Utils::ProcessLinkCallback &&processLinkCallback,
bool resolveTarget = true,
bool inNextSplit = false) override;
void findLinkAt(const QTextCursor &,
Utils::ProcessLinkCallback &&processLinkCallback,
bool resolveTarget = true,
bool inNextSplit = false) override;
void contextMenuEvent(QContextMenuEvent *) override;
};

4
src/plugins/serialterminal/serialoutputpane.cpp
View File

@@ -66,7 +66,7 @@ public:
signals:
void contextMenuRequested(const QPoint &pos, int index);
protected:
bool eventFilter(QObject *object, QEvent *event) override final;
bool eventFilter(QObject *object, QEvent *event) final;
private:
int m_tabIndexForMiddleClick = -1;
};
@@ -112,7 +112,7 @@ class ComboBox : public QComboBox
{
Q_OBJECT
public:
void showPopup() override final;
void showPopup() final;
signals:
void opened();
};