From 07e67b21880525265b8e85efb1df257a166171ea Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 7 May 2018 15:07:21 +0200 Subject: Utils: Use override consistently clang-tidy fixes from modernize-use-override check. Change-Id: I89d27f359b6ee507153cb3712f61f81471ff0858 Reviewed-by: Orgad Shaneh --- src/libs/utils/annotateditemdelegate.h | 8 ++++---- src/libs/utils/basetreeview.h | 2 +- src/libs/utils/checkablemessagebox.h | 2 +- src/libs/utils/classnamevalidatinglineedit.h | 6 +++--- src/libs/utils/completinglineedit.h | 4 ++-- src/libs/utils/completingtextedit.h | 8 ++++---- src/libs/utils/consoleprocess.h | 2 +- src/libs/utils/crumblepath.h | 2 +- src/libs/utils/detailsbutton.h | 10 +++++----- src/libs/utils/detailswidget.h | 8 ++++---- src/libs/utils/dropsupport.h | 2 +- src/libs/utils/elidinglabel.h | 2 +- src/libs/utils/environmentmodel.h | 15 ++++++++------- src/libs/utils/faketooltip.h | 4 ++-- src/libs/utils/fancylineedit.h | 12 ++++++------ src/libs/utils/fancymainwindow.h | 8 ++++---- src/libs/utils/filenamevalidatinglineedit.h | 2 +- src/libs/utils/filesearch.h | 2 +- src/libs/utils/filesystemwatcher.h | 2 +- src/libs/utils/fileutils.h | 7 ++++--- src/libs/utils/filewizardpage.h | 4 ++-- src/libs/utils/fixedsizeclicklabel.h | 6 +++--- src/libs/utils/flowlayout.h | 22 +++++++++++----------- src/libs/utils/highlightingitemdelegate.h | 6 ++++-- src/libs/utils/historycompleter.h | 2 +- src/libs/utils/itemviews.h | 2 +- src/libs/utils/json.h | 14 +++++++------- src/libs/utils/networkaccessmanager.h | 3 ++- src/libs/utils/newclasswidget.h | 2 +- src/libs/utils/outputformatter.h | 2 +- src/libs/utils/pathchooser.h | 2 +- src/libs/utils/pathlisteditor.h | 2 +- src/libs/utils/projectintropage.h | 4 ++-- src/libs/utils/proxycredentialsdialog.h | 2 +- src/libs/utils/qtcolorbutton.h | 14 +++++++------- src/libs/utils/removefiledialog.h | 2 +- src/libs/utils/runextensions.h | 4 ++-- src/libs/utils/savefile.h | 4 ++-- src/libs/utils/settingsaccessor.h | 4 ++-- src/libs/utils/shellcommandpage.h | 6 +++--- src/libs/utils/styledbar.h | 4 ++-- src/libs/utils/synchronousprocess.h | 2 +- src/libs/utils/theme/theme.h | 2 +- src/libs/utils/tooltip/tooltip.h | 4 ++-- src/libs/utils/treeviewcombobox.h | 10 +++++----- src/libs/utils/wizard.h | 2 +- 46 files changed, 122 insertions(+), 117 deletions(-) (limited to 'src') diff --git a/src/libs/utils/annotateditemdelegate.h b/src/libs/utils/annotateditemdelegate.h index c14b1d49d4..d6223fb379 100644 --- a/src/libs/utils/annotateditemdelegate.h +++ b/src/libs/utils/annotateditemdelegate.h @@ -35,7 +35,7 @@ class QTCREATOR_UTILS_EXPORT AnnotatedItemDelegate : public QStyledItemDelegate { public: AnnotatedItemDelegate(QObject *parent = 0); - virtual ~AnnotatedItemDelegate(); + ~AnnotatedItemDelegate() override; void setAnnotationRole(int role); int annotationRole() const; @@ -44,10 +44,10 @@ public: const QString &delimiter() const; protected: - virtual void paint(QPainter *painter, + void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; - virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: int m_annotationRole; diff --git a/src/libs/utils/basetreeview.h b/src/libs/utils/basetreeview.h index 051f31c2f9..456672d656 100644 --- a/src/libs/utils/basetreeview.h +++ b/src/libs/utils/basetreeview.h @@ -54,7 +54,7 @@ public: }; BaseTreeView(QWidget *parent = 0); - ~BaseTreeView(); + ~BaseTreeView() override; void setSettings(QSettings *settings, const QByteArray &key); diff --git a/src/libs/utils/checkablemessagebox.h b/src/libs/utils/checkablemessagebox.h index c120098e00..3367ce02b1 100644 --- a/src/libs/utils/checkablemessagebox.h +++ b/src/libs/utils/checkablemessagebox.h @@ -50,7 +50,7 @@ class QTCREATOR_UTILS_EXPORT CheckableMessageBox : public QDialog public: explicit CheckableMessageBox(QWidget *parent); - virtual ~CheckableMessageBox(); + ~CheckableMessageBox() override; static QDialogButtonBox::StandardButton question(QWidget *parent, diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h index f3ba7acc0c..a24346cf1b 100644 --- a/src/libs/utils/classnamevalidatinglineedit.h +++ b/src/libs/utils/classnamevalidatinglineedit.h @@ -39,7 +39,7 @@ class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit : public FancyLineEdit public: explicit ClassNameValidatingLineEdit(QWidget *parent = 0); - virtual ~ClassNameValidatingLineEdit(); + ~ClassNameValidatingLineEdit() override; bool namespacesEnabled() const; void setNamespacesEnabled(bool b); @@ -63,8 +63,8 @@ signals: protected: bool validateClassName(FancyLineEdit *edit, QString *errorMessage) const; - void handleChanged(const QString &t); - QString fixInputString(const QString &string); + void handleChanged(const QString &t) override; + QString fixInputString(const QString &string) override; private: void updateRegExp() const; diff --git a/src/libs/utils/completinglineedit.h b/src/libs/utils/completinglineedit.h index abcced4de3..1cedaf0b7c 100644 --- a/src/libs/utils/completinglineedit.h +++ b/src/libs/utils/completinglineedit.h @@ -38,8 +38,8 @@ public: explicit CompletingLineEdit(QWidget *parent = 0); protected: - bool event(QEvent *e); - void keyPressEvent(QKeyEvent *e); + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; }; } // namespace Utils diff --git a/src/libs/utils/completingtextedit.h b/src/libs/utils/completingtextedit.h index 666e2f21dd..b45ce886a3 100644 --- a/src/libs/utils/completingtextedit.h +++ b/src/libs/utils/completingtextedit.h @@ -44,7 +44,7 @@ class QTCREATOR_UTILS_EXPORT CompletingTextEdit : public QTextEdit public: CompletingTextEdit(QWidget *parent = 0); - ~CompletingTextEdit(); + ~CompletingTextEdit() override; void setCompleter(QCompleter *c); QCompleter *completer() const; @@ -53,9 +53,9 @@ public: void setCompletionLengthThreshold(int len); protected: - void keyPressEvent(QKeyEvent *e); - void focusInEvent(QFocusEvent *e); - bool event(QEvent *e); + void keyPressEvent(QKeyEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + bool event(QEvent *e) override; private: class CompletingTextEditPrivate *d; diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index 7fc84bc36d..7ebdfbc678 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -44,7 +44,7 @@ class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject public: enum Mode { Run, Debug, Suspend }; ConsoleProcess(QObject *parent = 0); - ~ConsoleProcess(); + ~ConsoleProcess() override; void setWorkingDirectory(const QString &dir); QString workingDirectory() const; diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h index 7d1473fe04..990522d733 100644 --- a/src/libs/utils/crumblepath.h +++ b/src/libs/utils/crumblepath.h @@ -40,7 +40,7 @@ class QTCREATOR_UTILS_EXPORT CrumblePath : public QWidget public: explicit CrumblePath(QWidget *parent = nullptr); - ~CrumblePath(); + ~CrumblePath() override; QVariant dataForIndex(int index) const; QVariant dataForLastIndex() const; diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h index 3540d8d116..2c8dd72043 100644 --- a/src/libs/utils/detailsbutton.h +++ b/src/libs/utils/detailsbutton.h @@ -49,9 +49,9 @@ class QTCREATOR_UTILS_EXPORT FadingWidget : public FadingPanel Q_OBJECT public: FadingWidget(QWidget *parent = 0); - void fadeTo(qreal value); + void fadeTo(qreal value) override; qreal opacity(); - void setOpacity(qreal value); + void setOpacity(qreal value) override; protected: QGraphicsOpacityEffect *m_opacityEffect; }; @@ -64,13 +64,13 @@ class QTCREATOR_UTILS_EXPORT DetailsButton : public QAbstractButton public: DetailsButton(QWidget *parent = 0); - QSize sizeHint() const; + QSize sizeHint() const override; float fader() { return m_fader; } void setFader(float value) { m_fader = value; update(); } protected: - void paintEvent(QPaintEvent *e); - bool event(QEvent *e); + void paintEvent(QPaintEvent *e) override; + bool event(QEvent *e) override; private: QPixmap cacheRendering(const QSize &size, bool checked); diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h index 0c69d6f3f0..18f934170b 100644 --- a/src/libs/utils/detailswidget.h +++ b/src/libs/utils/detailswidget.h @@ -53,7 +53,7 @@ public: }; explicit DetailsWidget(QWidget *parent = 0); - virtual ~DetailsWidget(); + ~DetailsWidget() override; void setSummaryText(const QString &text); QString summaryText() const; @@ -91,9 +91,9 @@ private: void setExpanded(bool); protected: - virtual void paintEvent(QPaintEvent *paintEvent); - virtual void enterEvent(QEvent *event); - virtual void leaveEvent(QEvent *event); + void paintEvent(QPaintEvent *paintEvent) override; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; private: DetailsWidgetPrivate *d; diff --git a/src/libs/utils/dropsupport.h b/src/libs/utils/dropsupport.h index 5ec0ee906c..720612ada3 100644 --- a/src/libs/utils/dropsupport.h +++ b/src/libs/utils/dropsupport.h @@ -66,7 +66,7 @@ public: bool isValueDrop(QDropEvent *event) const; protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: void emitFilesDropped(); diff --git a/src/libs/utils/elidinglabel.h b/src/libs/utils/elidinglabel.h index fa7bab29d2..70b568f123 100644 --- a/src/libs/utils/elidinglabel.h +++ b/src/libs/utils/elidinglabel.h @@ -43,7 +43,7 @@ public: void setElideMode(const Qt::TextElideMode &elideMode); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: Qt::TextElideMode m_elideMode; diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h index 171c19b8f2..b102ba92d3 100644 --- a/src/libs/utils/environmentmodel.h +++ b/src/libs/utils/environmentmodel.h @@ -41,14 +41,15 @@ class QTCREATOR_UTILS_EXPORT EnvironmentModel : public QAbstractTableModel public: explicit EnvironmentModel(QObject *parent = 0); - ~EnvironmentModel(); + ~EnvironmentModel() override; - int rowCount(const QModelIndex &parent) const; - int columnCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const override; QModelIndex addVariable(); QModelIndex addVariable(const EnvironmentItem &item); diff --git a/src/libs/utils/faketooltip.h b/src/libs/utils/faketooltip.h index 3cb5cbeb47..4b30cb4c35 100644 --- a/src/libs/utils/faketooltip.h +++ b/src/libs/utils/faketooltip.h @@ -39,8 +39,8 @@ public: explicit FakeToolTip(QWidget *parent = 0); protected: - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent *e); + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; }; } // namespace Utils diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index d6b26024ab..9c0b87961f 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -47,7 +47,7 @@ class QTCREATOR_UTILS_EXPORT IconButton: public QAbstractButton Q_PROPERTY(bool autoHide READ hasAutoHide WRITE setAutoHide) public: explicit IconButton(QWidget *parent = 0); - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; float iconOpacity() { return m_iconOpacity; } void setIconOpacity(float value) { m_iconOpacity = value; update(); } void animateShow(bool visible); @@ -55,11 +55,11 @@ public: void setAutoHide(bool hide) { m_autoHide = hide; } bool hasAutoHide() const { return m_autoHide; } - QSize sizeHint() const; + QSize sizeHint() const override; protected: - void keyPressEvent(QKeyEvent *ke); - void keyReleaseEvent(QKeyEvent *ke); + void keyPressEvent(QKeyEvent *ke) override; + void keyReleaseEvent(QKeyEvent *ke) override; private: float m_iconOpacity; @@ -80,7 +80,7 @@ public: enum Side {Left = 0, Right = 1}; explicit FancyLineEdit(QWidget *parent = 0); - ~FancyLineEdit(); + ~FancyLineEdit() override; QIcon buttonIcon(Side side) const; void setButtonIcon(Side side, const QIcon &icon); @@ -154,7 +154,7 @@ signals: void validReturnPressed(); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(QResizeEvent *e) override; virtual QString fixInputString(const QString &string); diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h index 728f83cd18..772fa3e18a 100644 --- a/src/libs/utils/fancymainwindow.h +++ b/src/libs/utils/fancymainwindow.h @@ -43,7 +43,7 @@ class QTCREATOR_UTILS_EXPORT FancyMainWindow : public QMainWindow public: explicit FancyMainWindow(QWidget *parent = 0); - virtual ~FancyMainWindow(); + ~FancyMainWindow() override; /* The widget passed in should have an objectname set * which will then be used as key for QSettings. */ @@ -76,9 +76,9 @@ public slots: void setDockActionsVisible(bool v); protected: - void hideEvent(QHideEvent *event); - void showEvent(QShowEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void hideEvent(QHideEvent *event) override; + void showEvent(QShowEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; private: void onDockActionTriggered(); diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h index 1185723fdf..9921501263 100644 --- a/src/libs/utils/filenamevalidatinglineedit.h +++ b/src/libs/utils/filenamevalidatinglineedit.h @@ -69,7 +69,7 @@ public: void setRequiredExtensions(const QStringList &extensionList); protected: - virtual QString fixInputString(const QString &string); + QString fixInputString(const QString &string) override; private: bool m_allowDirectories; diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index 6ddf18ab53..8babf004ac 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -145,7 +145,7 @@ public: const QStringList &filters, const QStringList &exclusionFilters, QTextCodec *encoding = 0); - ~SubDirFileIterator(); + ~SubDirFileIterator() override; int maxProgress() const override; int currentProgress() const override; diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h index c40c6dae80..9db361659d 100644 --- a/src/libs/utils/filesystemwatcher.h +++ b/src/libs/utils/filesystemwatcher.h @@ -46,7 +46,7 @@ public: explicit FileSystemWatcher(QObject *parent = 0); explicit FileSystemWatcher(int id, QObject *parent = 0); - virtual ~FileSystemWatcher(); + ~FileSystemWatcher() override; void addFile(const QString &file, WatchMode wm); void addFiles(const QStringList &files, WatchMode wm); diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 00b070eb16..feb3b0a9dc 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -215,9 +215,10 @@ class QTCREATOR_UTILS_EXPORT FileSaver : public FileSaverBase { Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic! public: - explicit FileSaver(const QString &filename, QIODevice::OpenMode mode = QIODevice::NotOpen); // QIODevice::WriteOnly is implicit + // QIODevice::WriteOnly is implicit + explicit FileSaver(const QString &filename, QIODevice::OpenMode mode = QIODevice::NotOpen); - virtual bool finalize(); + bool finalize() override; using FileSaverBase::finalize; private: @@ -229,7 +230,7 @@ class QTCREATOR_UTILS_EXPORT TempFileSaver : public FileSaverBase Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic! public: explicit TempFileSaver(const QString &templ = QString()); - ~TempFileSaver(); + ~TempFileSaver() override; void setAutoRemove(bool on) { m_autoRemove = on; } diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index 12897e782d..4c3ee48ff4 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -41,12 +41,12 @@ class QTCREATOR_UTILS_EXPORT FileWizardPage : public WizardPage public: explicit FileWizardPage(QWidget *parent = 0); - ~FileWizardPage(); + ~FileWizardPage() override; QString fileName() const; QString path() const; - bool isComplete() const; + bool isComplete() const override; void setFileNameLabel(const QString &label); void setPathLabel(const QString &label); diff --git a/src/libs/utils/fixedsizeclicklabel.h b/src/libs/utils/fixedsizeclicklabel.h index 8f61dfcfbb..0d83ac667b 100644 --- a/src/libs/utils/fixedsizeclicklabel.h +++ b/src/libs/utils/fixedsizeclicklabel.h @@ -40,14 +40,14 @@ public: void setText(const QString &text, const QString &maxText); using QLabel::setText; - QSize sizeHint() const; + QSize sizeHint() const override; QString maxText() const; void setMaxText(const QString &maxText); protected: - void mousePressEvent(QMouseEvent *ev); - void mouseReleaseEvent(QMouseEvent *ev); + void mousePressEvent(QMouseEvent *ev) override; + void mouseReleaseEvent(QMouseEvent *ev) override; signals: void clicked(); diff --git a/src/libs/utils/flowlayout.h b/src/libs/utils/flowlayout.h index c76472fafb..ed15016316 100644 --- a/src/libs/utils/flowlayout.h +++ b/src/libs/utils/flowlayout.h @@ -37,20 +37,20 @@ class QTCREATOR_UTILS_EXPORT FlowLayout : public QLayout public: explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1); FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1); - ~FlowLayout(); + ~FlowLayout() override; - void addItem(QLayoutItem *item); + void addItem(QLayoutItem *item) override; int horizontalSpacing() const; int verticalSpacing() const; - Qt::Orientations expandingDirections() const; - bool hasHeightForWidth() const; - int heightForWidth(int) const; - int count() const; - QLayoutItem *itemAt(int index) const; - QSize minimumSize() const; - void setGeometry(const QRect &rect); - QSize sizeHint() const; - QLayoutItem *takeAt(int index); + Qt::Orientations expandingDirections() const override; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int count() const override; + QLayoutItem *itemAt(int index) const override; + QSize minimumSize() const override; + void setGeometry(const QRect &rect) override; + QSize sizeHint() const override; + QLayoutItem *takeAt(int index) override; private: int doLayout(const QRect &rect, bool testOnly) const; diff --git a/src/libs/utils/highlightingitemdelegate.h b/src/libs/utils/highlightingitemdelegate.h index b9cfb617dd..ae184de2d7 100644 --- a/src/libs/utils/highlightingitemdelegate.h +++ b/src/libs/utils/highlightingitemdelegate.h @@ -45,11 +45,13 @@ class QTCREATOR_UTILS_EXPORT HighlightingItemDelegate : public QItemDelegate { public: HighlightingItemDelegate(int tabWidth, QObject *parent = 0); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, + const QModelIndex &index) const override; void setTabWidth(int width); private: - int drawLineNumber(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, const QModelIndex &index) const; + int drawLineNumber(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, + const QModelIndex &index) const; void drawText(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, const QModelIndex &index) const; using QItemDelegate::drawDisplay; diff --git a/src/libs/utils/historycompleter.h b/src/libs/utils/historycompleter.h index 4ab08f8700..030c3103df 100644 --- a/src/libs/utils/historycompleter.h +++ b/src/libs/utils/historycompleter.h @@ -49,7 +49,7 @@ public: static bool historyExistsFor(const QString &historyKey); private: - ~HistoryCompleter(); + ~HistoryCompleter() override; int historySize() const; int maximalHistorySize() const; void setMaximalHistorySize(int numberOfEntries); diff --git a/src/libs/utils/itemviews.h b/src/libs/utils/itemviews.h index 5708c6dc4d..91cfc927fc 100644 --- a/src/libs/utils/itemviews.h +++ b/src/libs/utils/itemviews.h @@ -68,7 +68,7 @@ public: return v.toBool() ? SingleClickActivation : DoubleClickActivation; } - void keyPressEvent(QKeyEvent *event) + void keyPressEvent(QKeyEvent *event) override { // Note: This always eats the event // whereas QAbstractItemView never eats it diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h index 09b74d8950..c55fa79196 100644 --- a/src/libs/utils/json.h +++ b/src/libs/utils/json.h @@ -116,7 +116,7 @@ public: , m_value(value) {} - virtual JsonStringValue *toString() { return this; } + JsonStringValue *toString() override { return this; } const QString &value() const { return m_value; } @@ -136,7 +136,7 @@ public: , m_value(value) {} - virtual JsonDoubleValue *toDouble() { return this; } + JsonDoubleValue *toDouble() override { return this; } double value() const { return m_value; } @@ -155,7 +155,7 @@ public: , m_value(value) {} - virtual JsonIntValue *toInt() { return this; } + JsonIntValue *toInt() override { return this; } int value() const { return m_value; } @@ -174,7 +174,7 @@ public: : JsonValue(Object) {} - virtual JsonObjectValue *toObject() { return this; } + JsonObjectValue *toObject() override { return this; } void addMember(const QString &name, JsonValue *value) { m_members.insert(name, value); } bool hasMember(const QString &name) const { return m_members.contains(name); } @@ -202,7 +202,7 @@ public: : JsonValue(Array) {} - virtual JsonArrayValue *toArray() { return this; } + JsonArrayValue *toArray() override { return this; } void addElement(JsonValue *value) { m_elements.append(value); } QList elements() const { return m_elements; } @@ -224,7 +224,7 @@ public: , m_value(value) {} - virtual JsonBooleanValue *toBoolean() { return this; } + JsonBooleanValue *toBoolean() override { return this; } bool value() const { return m_value; } @@ -239,7 +239,7 @@ public: : JsonValue(Null) {} - virtual JsonNullValue *toNull() { return this; } + JsonNullValue *toNull() override { return this; } }; class JsonSchemaManager; diff --git a/src/libs/utils/networkaccessmanager.h b/src/libs/utils/networkaccessmanager.h index d1f92379c5..94c26109fd 100644 --- a/src/libs/utils/networkaccessmanager.h +++ b/src/libs/utils/networkaccessmanager.h @@ -42,7 +42,8 @@ public: static NetworkAccessManager *instance(); protected: - virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData); + QNetworkReply* createRequest(Operation op, const QNetworkRequest &request, + QIODevice *outgoingData) override; }; diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index e91ff6a13a..53dd1de087 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -78,7 +78,7 @@ public: }; explicit NewClassWidget(QWidget *parent = 0); - ~NewClassWidget(); + ~NewClassWidget() override; bool namespacesEnabled() const; bool isBaseClassInputVisible() const; diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index bf2083370d..d30a640b7b 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -49,7 +49,7 @@ class QTCREATOR_UTILS_EXPORT OutputFormatter : public QObject public: OutputFormatter(); - virtual ~OutputFormatter(); + ~OutputFormatter() override; QPlainTextEdit *plainTextEdit() const; virtual void setPlainTextEdit(QPlainTextEdit *plainText); diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index 94f4a19b49..3f91ebc7cb 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -63,7 +63,7 @@ public: static QString browseButtonLabel(); explicit PathChooser(QWidget *parent = nullptr); - virtual ~PathChooser(); + ~PathChooser() override; enum Kind { ExistingDirectory, diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h index 8636450406..fa14f5ee2c 100644 --- a/src/libs/utils/pathlisteditor.h +++ b/src/libs/utils/pathlisteditor.h @@ -47,7 +47,7 @@ class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget public: explicit PathListEditor(QWidget *parent = 0); - virtual ~PathListEditor(); + ~PathListEditor() override; QString pathListString() const; QStringList pathList() const; diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h index 75d8a9fab4..98b51693ae 100644 --- a/src/libs/utils/projectintropage.h +++ b/src/libs/utils/projectintropage.h @@ -43,7 +43,7 @@ class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public WizardPage public: explicit ProjectIntroPage(QWidget *parent = 0); - virtual ~ProjectIntroPage(); + ~ProjectIntroPage() override; QString projectName() const; QString path() const; @@ -53,7 +53,7 @@ public: // Insert an additional control into the form layout for the target. void insertControl(int row, QWidget *label, QWidget *control); - virtual bool isComplete() const; + bool isComplete() const override; bool forceSubProject() const; void setForceSubProject(bool force); diff --git a/src/libs/utils/proxycredentialsdialog.h b/src/libs/utils/proxycredentialsdialog.h index d18af5b2d5..5e39baf27c 100644 --- a/src/libs/utils/proxycredentialsdialog.h +++ b/src/libs/utils/proxycredentialsdialog.h @@ -42,7 +42,7 @@ class QTCREATOR_UTILS_EXPORT ProxyCredentialsDialog : public QDialog public: explicit ProxyCredentialsDialog(const QNetworkProxy &proxy, QWidget *parent = 0); - ~ProxyCredentialsDialog(); + ~ProxyCredentialsDialog() override; QString userName() const; void setUserName(const QString &username); diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h index 07b3c63a22..12dd82be14 100644 --- a/src/libs/utils/qtcolorbutton.h +++ b/src/libs/utils/qtcolorbutton.h @@ -39,7 +39,7 @@ class QTCREATOR_UTILS_EXPORT QtColorButton : public QToolButton Q_PROPERTY(QColor color READ color WRITE setColor) public: QtColorButton(QWidget *parent = 0); - ~QtColorButton(); + ~QtColorButton() override; bool isBackgroundCheckered() const; void setBackgroundCheckered(bool checkered); @@ -55,13 +55,13 @@ public slots: signals: void colorChanged(const QColor &color); protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif private: class QtColorButtonPrivate *d_ptr; diff --git a/src/libs/utils/removefiledialog.h b/src/libs/utils/removefiledialog.h index 459917e1f8..4543e663f3 100644 --- a/src/libs/utils/removefiledialog.h +++ b/src/libs/utils/removefiledialog.h @@ -39,7 +39,7 @@ class QTCREATOR_UTILS_EXPORT RemoveFileDialog : public QDialog public: explicit RemoveFileDialog(const QString &filePath, QWidget *parent = 0); - virtual ~RemoveFileDialog(); + ~RemoveFileDialog() override; void setDeleteFileVisible(bool visible); bool isDeleteFileChecked() const; diff --git a/src/libs/utils/runextensions.h b/src/libs/utils/runextensions.h index ef595c3291..30590ade30 100644 --- a/src/libs/utils/runextensions.h +++ b/src/libs/utils/runextensions.h @@ -325,7 +325,7 @@ public: futureInterface.reportStarted(); } - ~AsyncJob() + ~AsyncJob() override { // QThreadPool can delete runnables even if they were never run (e.g. QThreadPool::clear). // Since we reported them as started, we make sure that we always report them as finished. @@ -382,7 +382,7 @@ public: explicit RunnableThread(QRunnable *runnable, QObject *parent = 0); protected: - void run(); + void run() override; private: QRunnable *m_runnable; diff --git a/src/libs/utils/savefile.h b/src/libs/utils/savefile.h index 1a7b2ce311..56d60aacc9 100644 --- a/src/libs/utils/savefile.h +++ b/src/libs/utils/savefile.h @@ -39,9 +39,9 @@ class QTCREATOR_UTILS_EXPORT SaveFile : public QFile public: explicit SaveFile(const QString &filename); - virtual ~SaveFile(); + ~SaveFile() override; - bool open(OpenMode flags = QIODevice::WriteOnly); + bool open(OpenMode flags = QIODevice::WriteOnly) override; void rollback(); bool commit(); diff --git a/src/libs/utils/settingsaccessor.h b/src/libs/utils/settingsaccessor.h index 355a942761..d7859067ff 100644 --- a/src/libs/utils/settingsaccessor.h +++ b/src/libs/utils/settingsaccessor.h @@ -172,9 +172,9 @@ public: BackingUpSettingsAccessor(std::unique_ptr &&strategy, const QString &docType, const QString &displayName, const QString &applicationDisplayName); - RestoreData readData(const Utils::FileName &path, QWidget *parent) const; + RestoreData readData(const Utils::FileName &path, QWidget *parent) const override; Utils::optional writeData(const Utils::FileName &path, const QVariantMap &data, - QWidget *parent) const; + QWidget *parent) const override; BackUpStrategy *strategy() const { return m_strategy.get(); } diff --git a/src/libs/utils/shellcommandpage.h b/src/libs/utils/shellcommandpage.h index 2e3eda17ca..55a7980d05 100644 --- a/src/libs/utils/shellcommandpage.h +++ b/src/libs/utils/shellcommandpage.h @@ -46,17 +46,17 @@ public: enum State { Idle, Running, Failed, Succeeded }; explicit ShellCommandPage(QWidget *parent = nullptr); - ~ShellCommandPage(); + ~ShellCommandPage() override; void setStartedStatus(const QString &startedStatus); void start(ShellCommand *command); - virtual bool isComplete() const; + bool isComplete() const override; bool isRunning() const{ return m_state == Running; } void terminate(); - bool handleReject(); + bool handleReject() override; signals: void finished(bool success); diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h index 4b76c13e30..7b5d67fd59 100644 --- a/src/libs/utils/styledbar.h +++ b/src/libs/utils/styledbar.h @@ -43,7 +43,7 @@ public: bool isLightColored() const; protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; class QTCREATOR_UTILS_EXPORT StyledSeparator : public QWidget @@ -52,7 +52,7 @@ class QTCREATOR_UTILS_EXPORT StyledSeparator : public QWidget public: StyledSeparator(QWidget *parent = 0); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; } // Utils diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index aa03561615..bbf21c11f2 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -89,7 +89,7 @@ public: }; SynchronousProcess(); - virtual ~SynchronousProcess(); + ~SynchronousProcess() override; /* Timeout for hanging processes (triggers after no more output * occurs on stderr/stdout). */ diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 6b9fea7864..da0b78f7a7 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -49,7 +49,7 @@ class QTCREATOR_UTILS_EXPORT Theme : public QObject public: Theme(const QString &id, QObject *parent = 0); - ~Theme(); + ~Theme() override; enum Color { BackgroundColorAlternate, diff --git a/src/libs/utils/tooltip/tooltip.h b/src/libs/utils/tooltip/tooltip.h index 4478281519..c3139723b1 100644 --- a/src/libs/utils/tooltip/tooltip.h +++ b/src/libs/utils/tooltip/tooltip.h @@ -59,7 +59,7 @@ protected: ToolTip(); public: - ~ToolTip(); + ~ToolTip() override; enum { ColorContent = 0, @@ -67,7 +67,7 @@ public: WidgetContent = 42 }; - bool eventFilter(QObject *o, QEvent *event); + bool eventFilter(QObject *o, QEvent *event) override; static ToolTip *instance(); diff --git a/src/libs/utils/treeviewcombobox.h b/src/libs/utils/treeviewcombobox.h index e32d64d4ae..9377c1ff0c 100644 --- a/src/libs/utils/treeviewcombobox.h +++ b/src/libs/utils/treeviewcombobox.h @@ -46,12 +46,12 @@ class QTCREATOR_UTILS_EXPORT TreeViewComboBox : public QComboBox public: TreeViewComboBox(QWidget *parent = 0); - void wheelEvent(QWheelEvent *e); - void keyPressEvent(QKeyEvent *e); + void wheelEvent(QWheelEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; void setCurrentIndex(const QModelIndex &index); - bool eventFilter(QObject* object, QEvent* event); - void showPopup(); - void hidePopup(); + bool eventFilter(QObject* object, QEvent* event) override; + void showPopup() override; + void hidePopup() override; TreeViewComboBoxView *view() const; diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h index 070b6ff4a2..88d0641d84 100644 --- a/src/libs/utils/wizard.h +++ b/src/libs/utils/wizard.h @@ -94,7 +94,7 @@ class QTCREATOR_UTILS_EXPORT WizardProgress : public QObject public: WizardProgress(QObject *parent = 0); - ~WizardProgress(); + ~WizardProgress() override; WizardProgressItem *addItem(const QString &title); void removeItem(WizardProgressItem *item); -- cgit v1.2.3