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

Add missing "override" to functions of exported classes

Browse Source 
...exported ones or "shared" by other means

Change-Id: Ic4cc7a71426845c46bf3994a62b73b4ab5da321e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2020-11-18 15:23:34 +01:00
parent 4517edd894
commit 97ed5ef910
12 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/clangsupport/connectionclient.h
View File

@@ -98,7 +98,7 @@ protected:
virtual QString outputName() const = 0; virtual QString outputName() const = 0;
QString connectionName() const; QString connectionName() const;
bool event(QEvent* event); bool event(QEvent* event) override;
virtual void newConnectedServer(QLocalSocket *localSocket) = 0; virtual void newConnectedServer(QLocalSocket *localSocket) = 0;

8
src/libs/qmleditorwidgets/colorbox.h
View File

@@ -69,11 +69,11 @@ signals:
void alphaChanged(); void alphaChanged();
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
void mousePressEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
void mouseMoveEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *) override;
void setCurrent(int x, int y); void setCurrent(int x, int y);
private: private:

2
src/libs/qmleditorwidgets/contextpanetextwidget.h
View File

@@ -71,7 +71,7 @@ signals:
void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst); void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
protected: protected:
void timerEvent(QTimerEvent *event); void timerEvent(QTimerEvent *event) override;
private: private:
Ui::ContextPaneTextWidget *ui; Ui::ContextPaneTextWidget *ui;

6
src/libs/qmleditorwidgets/contextpanewidgetimage.h
View File

@@ -142,9 +142,9 @@ public:
void onRightMarginsChanged(); void onRightMarginsChanged();
protected: protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e) override;
void hideEvent(QHideEvent* event); void hideEvent(QHideEvent* event) override;
void showEvent(QShowEvent* event); void showEvent(QShowEvent* event) override;
private: private:
Ui::ContextPaneWidgetImage *ui; Ui::ContextPaneWidgetImage *ui;

2
src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
View File

@@ -64,7 +64,7 @@ signals:
void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst); void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
protected: protected:
void timerEvent(QTimerEvent *event); void timerEvent(QTimerEvent *event) override;
private: private:
void setColor(); void setColor();

8
src/libs/qmleditorwidgets/huecontrol.h
View File

@@ -49,10 +49,10 @@ signals:
void hueChanged(int hue); void hueChanged(int hue);
protected: protected:
void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
void mousePressEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
void mouseMoveEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *) override;
void setCurrent(int y); void setCurrent(int y);
private: private:

14
src/libs/ssh/sftpfilesystemmodel.h
View File

@@ -57,7 +57,7 @@ public:
// Use this to get the full path of a file or directory. // Use this to get the full path of a file or directory.
static const int PathRole = Qt::UserRole; static const int PathRole = Qt::UserRole;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
signals: signals:
/* /*
@@ -84,12 +84,12 @@ private:
void handleFileInfo(QSsh::SftpJobId jobId, const QList<QSsh::SftpFileInfo> &fileInfoList); void handleFileInfo(QSsh::SftpJobId jobId, const QList<QSsh::SftpFileInfo> &fileInfoList);
void handleSftpJobFinished(QSsh::SftpJobId jobId, const QString &errorMessage); void handleSftpJobFinished(QSsh::SftpJobId jobId, const QString &errorMessage);
int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
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;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
void statRootDirectory(); void statRootDirectory();
void shutDown(); void shutDown();

8
src/shared/help/bookmarkmanager.h
View File

@@ -73,7 +73,7 @@ private:
void selectBookmarkFolder(int index); void selectBookmarkFolder(int index);
void customContextMenuRequested(const QPoint &point); void customContextMenuRequested(const QPoint &point);
void currentChanged(const QModelIndex& current); void currentChanged(const QModelIndex& current);
bool eventFilter(QObject *object, QEvent *e); bool eventFilter(QObject *object, QEvent *e) override;
QString m_url; QString m_url;
QString m_title; QString m_title;
@@ -120,7 +120,7 @@ private:
void customContextMenuRequested(const QPoint &point); void customContextMenuRequested(const QPoint &point);
void setup(); void setup();
void expandItems(); void expandItems();
bool eventFilter(QObject *object, QEvent *event); bool eventFilter(QObject *object, QEvent *event) override;
QRegularExpression regExp; QRegularExpression regExp;
TreeView *treeView; TreeView *treeView;
@@ -138,8 +138,8 @@ public:
BookmarkModel(int rows, int columns, QObject *parent = 0); BookmarkModel(int rows, int columns, QObject *parent = 0);
~BookmarkModel(); ~BookmarkModel();
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
}; };
class BookmarkManager : public QObject class BookmarkManager : public QObject

2
src/shared/help/contentwindow.h
View File

@@ -58,7 +58,7 @@ private:
void expandTOC(); void expandTOC();
void itemActivated(const QModelIndex &index); void itemActivated(const QModelIndex &index);
void expandToDepth(int depth); void expandToDepth(int depth);
bool eventFilter(QObject *o, QEvent *e); bool eventFilter(QObject *o, QEvent *e) override;
Utils::NavigationTreeView *m_contentWidget; Utils::NavigationTreeView *m_contentWidget;
QHelpContentModel *m_contentModel; QHelpContentModel *m_contentModel;

22
src/shared/help/indexwindow.h
View File

@@ -51,20 +51,20 @@ public:
IndexFilterModel(QObject *parent); IndexFilterModel(QObject *parent);
QModelIndex filter(const QString &filter, const QString &wildcard); QModelIndex filter(const QString &filter, const QString &wildcard);
QModelIndex mapToSource(const QModelIndex &proxyIndex) const; QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
Qt::DropActions supportedDragActions() const; Qt::DropActions supportedDragActions() const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
void setSourceModel(QAbstractItemModel *sm); void setSourceModel(QAbstractItemModel *sm) override;
// QAbstractProxyModel::sibling is broken in Qt 5 // QAbstractProxyModel::sibling is broken in Qt 5
QModelIndex sibling(int row, int column, const QModelIndex &idx) const; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
private: private:
void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
@@ -95,7 +95,7 @@ private:
void filterIndices(const QString &filter); void filterIndices(const QString &filter);
void enableSearchLineEdit(); void enableSearchLineEdit();
void disableSearchLineEdit(); void disableSearchLineEdit();
bool eventFilter(QObject *obj, QEvent *e); bool eventFilter(QObject *obj, QEvent *e) override;
void open(const QModelIndex &index, bool newPage = false); void open(const QModelIndex &index, bool newPage = false);
Utils::FancyLineEdit *m_searchLineEdit; Utils::FancyLineEdit *m_searchLineEdit;

2
src/shared/help/topicchooser.h
View File

@@ -50,7 +50,7 @@ private:
void acceptDialog(); void acceptDialog();
void setFilter(const QString &pattern); void setFilter(const QString &pattern);
void activated(const QModelIndex &index); void activated(const QModelIndex &index);
bool eventFilter(QObject *object, QEvent *event); bool eventFilter(QObject *object, QEvent *event) override;
Ui::TopicChooser ui; Ui::TopicChooser ui;
QList<QUrl> m_links; QList<QUrl> m_links;

2
src/shared/qtsingleapplication/qtsingleapplication.h
View File

@@ -43,7 +43,7 @@ public:
void setActivationWindow(QWidget* aw, bool activateOnMessage = true); void setActivationWindow(QWidget* aw, bool activateOnMessage = true);
QWidget* activationWindow() const; QWidget* activationWindow() const;
bool event(QEvent *event); bool event(QEvent *event) override;
QString applicationId() const; QString applicationId() const;
void setBlock(bool value); void setBlock(bool value);