summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/clangsupport/connectionclient.h2
-rw-r--r--src/libs/qmleditorwidgets/colorbox.h8
-rw-r--r--src/libs/qmleditorwidgets/contextpanetextwidget.h2
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidgetimage.h6
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidgetrectangle.h2
-rw-r--r--src/libs/qmleditorwidgets/huecontrol.h8
-rw-r--r--src/libs/ssh/sftpfilesystemmodel.h14
-rw-r--r--src/shared/help/bookmarkmanager.h8
-rw-r--r--src/shared/help/contentwindow.h2
-rw-r--r--src/shared/help/indexwindow.h22
-rw-r--r--src/shared/help/topicchooser.h2
-rw-r--r--src/shared/qtsingleapplication/qtsingleapplication.h2
12 files changed, 39 insertions, 39 deletions
diff --git a/src/libs/clangsupport/connectionclient.h b/src/libs/clangsupport/connectionclient.h
index c3ded38029..258bb323d1 100644
--- a/src/libs/clangsupport/connectionclient.h
+++ b/src/libs/clangsupport/connectionclient.h
@@ -98,7 +98,7 @@ protected:
virtual QString outputName() const = 0;
QString connectionName() const;
- bool event(QEvent* event);
+ bool event(QEvent* event) override;
virtual void newConnectedServer(QLocalSocket *localSocket) = 0;
diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h
index 52dfdf6585..f7fd604d4f 100644
--- a/src/libs/qmleditorwidgets/colorbox.h
+++ b/src/libs/qmleditorwidgets/colorbox.h
@@ -69,11 +69,11 @@ signals:
void alphaChanged();
protected:
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event) override;
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ void mousePressEvent(QMouseEvent *) override;
+ void mouseReleaseEvent(QMouseEvent *) override;
+ void mouseMoveEvent(QMouseEvent *) override;
void setCurrent(int x, int y);
private:
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h
index 2fbb1b304b..d97b60f387 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.h
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h
@@ -71,7 +71,7 @@ signals:
void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
protected:
- void timerEvent(QTimerEvent *event);
+ void timerEvent(QTimerEvent *event) override;
private:
Ui::ContextPaneTextWidget *ui;
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
index 89c7413e77..1954de4eef 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
@@ -142,9 +142,9 @@ public:
void onRightMarginsChanged();
protected:
- void changeEvent(QEvent *e);
- void hideEvent(QHideEvent* event);
- void showEvent(QShowEvent* event);
+ void changeEvent(QEvent *e) override;
+ void hideEvent(QHideEvent* event) override;
+ void showEvent(QShowEvent* event) override;
private:
Ui::ContextPaneWidgetImage *ui;
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
index 1ae75cc982..db92838fc8 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
@@ -64,7 +64,7 @@ signals:
void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
protected:
- void timerEvent(QTimerEvent *event);
+ void timerEvent(QTimerEvent *event) override;
private:
void setColor();
diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h
index 902b3ceaa8..b28759c20f 100644
--- a/src/libs/qmleditorwidgets/huecontrol.h
+++ b/src/libs/qmleditorwidgets/huecontrol.h
@@ -49,10 +49,10 @@ signals:
void hueChanged(int hue);
protected:
- void paintEvent(QPaintEvent *);
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ void paintEvent(QPaintEvent *) override;
+ void mousePressEvent(QMouseEvent *) override;
+ void mouseReleaseEvent(QMouseEvent *) override;
+ void mouseMoveEvent(QMouseEvent *) override;
void setCurrent(int y);
private:
diff --git a/src/libs/ssh/sftpfilesystemmodel.h b/src/libs/ssh/sftpfilesystemmodel.h
index 96ba2a2a54..ea16568d93 100644
--- a/src/libs/ssh/sftpfilesystemmodel.h
+++ b/src/libs/ssh/sftpfilesystemmodel.h
@@ -57,7 +57,7 @@ public:
// Use this to get the full path of a file or directory.
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:
/*
@@ -84,12 +84,12 @@ private:
void handleFileInfo(QSsh::SftpJobId jobId, const QList<QSsh::SftpFileInfo> &fileInfoList);
void handleSftpJobFinished(QSsh::SftpJobId jobId, const QString &errorMessage);
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
- QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex &child) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &child) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
void statRootDirectory();
void shutDown();
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index 885346df87..0a63b1fa9a 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -73,7 +73,7 @@ private:
void selectBookmarkFolder(int index);
void customContextMenuRequested(const QPoint &point);
void currentChanged(const QModelIndex& current);
- bool eventFilter(QObject *object, QEvent *e);
+ bool eventFilter(QObject *object, QEvent *e) override;
QString m_url;
QString m_title;
@@ -120,7 +120,7 @@ private:
void customContextMenuRequested(const QPoint &point);
void setup();
void expandItems();
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
QRegularExpression regExp;
TreeView *treeView;
@@ -138,8 +138,8 @@ public:
BookmarkModel(int rows, int columns, QObject *parent = 0);
~BookmarkModel();
- Qt::DropActions supportedDropActions() const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::DropActions supportedDropActions() const override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
};
class BookmarkManager : public QObject
diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h
index 99ec3cbca5..887bd93570 100644
--- a/src/shared/help/contentwindow.h
+++ b/src/shared/help/contentwindow.h
@@ -58,7 +58,7 @@ private:
void expandTOC();
void itemActivated(const QModelIndex &index);
void expandToDepth(int depth);
- bool eventFilter(QObject *o, QEvent *e);
+ bool eventFilter(QObject *o, QEvent *e) override;
Utils::NavigationTreeView *m_contentWidget;
QHelpContentModel *m_contentModel;
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index 8b1dec0872..5fe0712dca 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -51,20 +51,20 @@ public:
IndexFilterModel(QObject *parent);
QModelIndex filter(const QString &filter, const QString &wildcard);
- QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
- QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
- Qt::DropActions supportedDragActions() const;
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex &child) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
+ QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
+ Qt::DropActions supportedDragActions() const override;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &child) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
- void setSourceModel(QAbstractItemModel *sm);
+ void setSourceModel(QAbstractItemModel *sm) override;
// 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:
void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
@@ -95,7 +95,7 @@ private:
void filterIndices(const QString &filter);
void enableSearchLineEdit();
void disableSearchLineEdit();
- bool eventFilter(QObject *obj, QEvent *e);
+ bool eventFilter(QObject *obj, QEvent *e) override;
void open(const QModelIndex &index, bool newPage = false);
Utils::FancyLineEdit *m_searchLineEdit;
diff --git a/src/shared/help/topicchooser.h b/src/shared/help/topicchooser.h
index 8f278428c7..7d47b13712 100644
--- a/src/shared/help/topicchooser.h
+++ b/src/shared/help/topicchooser.h
@@ -50,7 +50,7 @@ private:
void acceptDialog();
void setFilter(const QString &pattern);
void activated(const QModelIndex &index);
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
Ui::TopicChooser ui;
QList<QUrl> m_links;
diff --git a/src/shared/qtsingleapplication/qtsingleapplication.h b/src/shared/qtsingleapplication/qtsingleapplication.h
index d4a0e1bb6a..4da973895f 100644
--- a/src/shared/qtsingleapplication/qtsingleapplication.h
+++ b/src/shared/qtsingleapplication/qtsingleapplication.h
@@ -43,7 +43,7 @@ public:
void setActivationWindow(QWidget* aw, bool activateOnMessage = true);
QWidget* activationWindow() const;
- bool event(QEvent *event);
+ bool event(QEvent *event) override;
QString applicationId() const;
void setBlock(bool value);
View Lorry Controller Status