diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 20:39:49 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-11 00:20:47 +0200 |
commit | 6ae7a02104631a2234c475575ae15ca79bef14f9 (patch) | |
tree | 5ca2db0e3aa3c7851c6d19117147c581bebeeee3 /tests/auto/widgets/widgets | |
parent | 459e8dfdfb8ac164383c14332b2b0919f59f8b3c (diff) |
Remove most compiler warnings about missing overrides
Remove around 1000 compiler warnings about missing overrides
in our auto tests.
This significantly reduce the compiler warning noise in our auto
tests, so that one can actually better see the real problems
inbetween.
Change-Id: Id0c04dba43fcaf55d8cd2b5c6697358857c31bf9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets')
11 files changed, 35 insertions, 35 deletions
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index e5a891912f..3b2bc1d126 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -103,7 +103,7 @@ class MyButton : public QAbstractButton { public: MyButton(QWidget *p = 0) : QAbstractButton(p) {} - void paintEvent(QPaintEvent *) + void paintEvent(QPaintEvent *) override { QPainter p(this); QRect r = rect(); @@ -124,7 +124,7 @@ public: #endif } } - QSize sizeHint() const + QSize sizeHint() const override { QSize sh(8, 8); if (!text().isEmpty()) @@ -139,7 +139,7 @@ private: int timerEvents; - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent *event) override { ++timerEvents; QAbstractButton::timerEvent(event); diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp index fd1e5c267d..86a5ebc114 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -291,7 +291,7 @@ public: startTimer(2000); } - void timerEvent(QTimerEvent * /* event */) + void timerEvent(QTimerEvent * /* event */) override { // should not crash. (void)new QScrollArea(this); diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index dd8a3e5839..e3448fa93d 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -51,7 +51,7 @@ public: { } protected: - void focusInEvent(QFocusEvent *) + void focusInEvent(QFocusEvent *) override { QCoreApplication::postEvent(this, new QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier)); diff --git a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp index a164be8712..d9cd5ad136 100644 --- a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp +++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp @@ -523,17 +523,17 @@ public: } protected: - void mousePressEvent(QMouseEvent*) + void mousePressEvent(QMouseEvent*) override { mousePressed = true; } - void mouseReleaseEvent(QMouseEvent*) + void mouseReleaseEvent(QMouseEvent*) override { mouseReleased = true; } - void mouseMoveEvent(QMouseEvent*) + void mouseMoveEvent(QMouseEvent*) override { mouseMoved = true; } diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index eb34a5ad4e..d4bc816ec0 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -391,7 +391,7 @@ void tst_QLabel::task226479_movieResize() { class Label : public QLabel { protected: - void paintEvent(QPaintEvent *e) + void paintEvent(QPaintEvent *e) override { paintedRegion += e->region(); QLabel::paintEvent(e); diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 2367d56dad..87be592e2b 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -906,7 +906,7 @@ public: : QValidator(parent) {} - QValidator::State validate(QString &str, int &) const + QValidator::State validate(QString &str, int &) const override { const int s = str.size(); if (s < chars) { @@ -917,7 +917,7 @@ public: return Acceptable; } - void fixup(QString &str) const + void fixup(QString &str) const override { str = str.leftJustified(chars, 'X', true); } @@ -1930,7 +1930,7 @@ void tst_QLineEdit::isReadOnly() class BlinkTestLineEdit : public QLineEdit { public: - void paintEvent(QPaintEvent *e) + void paintEvent(QPaintEvent *e) override { ++updates; QLineEdit::paintEvent(e); @@ -2431,7 +2431,7 @@ void tst_QLineEdit::returnPressed() class QIntFixValidator : public QIntValidator { public: QIntFixValidator(int min, int max, QObject *parent) : QIntValidator(min, max, parent) {} - void fixup (QString &input) const { + void fixup (QString &input) const override { for (int i=0; i<input.length(); ++i) if (!input.at(i).isNumber()) { input[(int)i] = QChar('0'); @@ -3149,7 +3149,7 @@ class InputMaskValidator : public QValidator { public: InputMaskValidator(QObject *parent, const char *name = 0) : QValidator(parent) { setObjectName(name); } - State validate(QString &text, int &pos) const + State validate(QString &text, int &pos) const override { InputMaskValidator *that = (InputMaskValidator *)this; that->validateText = text; @@ -3219,7 +3219,7 @@ class LineEdit : public QLineEdit public: LineEdit() { state = Other; } - void keyPressEvent(QKeyEvent *e) + void keyPressEvent(QKeyEvent *e) override { QLineEdit::keyPressEvent(e); if (e->key() == Qt::Key_Enter) { @@ -4048,7 +4048,7 @@ class UpdateRegionLineEdit : public QLineEdit public: QRegion updateRegion; protected: - void paintEvent(QPaintEvent *event) + void paintEvent(QPaintEvent *event) override { updateRegion = event->region(); } diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 8def1a11fc..53dbf2012f 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -792,7 +792,7 @@ class MyChild : public QWidget { public: MyChild(QWidget *parent = 0) : QWidget(parent) {} - QSize sizeHint() const { return QSize(234, 123); } + QSize sizeHint() const override { return QSize(234, 123); } }; void tst_QMdiArea::childSize() @@ -866,8 +866,8 @@ class LargeWidget : public QWidget { public: LargeWidget(QWidget *parent = 0) : QWidget(parent) {} - QSize sizeHint() const { return QSize(1280, 1024); } - QSize minimumSizeHint() const { return QSize(300, 300); } + QSize sizeHint() const override { return QSize(1280, 1024); } + QSize minimumSizeHint() const override { return QSize(300, 300); } }; // New tests @@ -2051,7 +2051,7 @@ public: void clear() { _count = 0; } protected: - bool eventFilter(QObject *object, QEvent *event) + bool eventFilter(QObject *object, QEvent *event) override { if (event->type() == eventToSpy) ++_count; diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index fd7775d944..8121a3637f 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -260,7 +260,7 @@ void tst_QMdiSubWindow::minimumSizeHint() public: Widget() = default; - QSize minimumSizeHint() const + QSize minimumSizeHint() const override { return QSize(100, 100); } diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 783476cf67..81ec5c77d0 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -979,7 +979,7 @@ class Menu258920 : public QMenu { Q_OBJECT public slots: - void paintEvent(QPaintEvent *e) + void paintEvent(QPaintEvent *e) override { QMenu::paintEvent(e); painted = true; @@ -1410,7 +1410,7 @@ void tst_QMenu::widgetActionTriggerClosesMenu() } protected: - QWidget *createWidget(QWidget *parent) + QWidget *createWidget(QWidget *parent) override { QPushButton *button = new QPushButton(QLatin1String("Button"), parent); connect(button, &QPushButton::clicked, this, &QAction::trigger); diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index d3b3f72367..e3812f16d0 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -222,18 +222,18 @@ public: inline QtTestDocumentLayout(QPlainTextEdit *edit, QTextDocument *doc, int &itCount) : QAbstractTextDocumentLayout(doc), useBiggerSize(false), ed(edit), iterationCounter(itCount) {} - virtual void draw(QPainter *, const QAbstractTextDocumentLayout::PaintContext &) {} + virtual void draw(QPainter *, const QAbstractTextDocumentLayout::PaintContext &) override {} - virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const { return 0; } + virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override { return 0; } - virtual void documentChanged(int, int, int) {} + virtual void documentChanged(int, int, int) override {} - virtual int pageCount() const { return 1; } + virtual int pageCount() const override { return 1; } - virtual QSizeF documentSize() const { return usedSize; } + virtual QSizeF documentSize() const override { return usedSize; } - virtual QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } - virtual QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } + virtual QRectF frameBoundingRect(QTextFrame *) const override { return QRectF(); } + virtual QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); } bool useBiggerSize; QSize usedSize; @@ -1104,15 +1104,15 @@ public: mutable int canInsertCallCount; mutable int insertCallCount; - virtual QMimeData *createMimeDataFromSelection() const { + virtual QMimeData *createMimeDataFromSelection() const override { createMimeDataCallCount++; return QPlainTextEdit::createMimeDataFromSelection(); } - virtual bool canInsertFromMimeData(const QMimeData *source) const { + virtual bool canInsertFromMimeData(const QMimeData *source) const override { canInsertCallCount++; return QPlainTextEdit::canInsertFromMimeData(source); } - virtual void insertFromMimeData(const QMimeData *source) { + virtual void insertFromMimeData(const QMimeData *source) override { insertCallCount++; QPlainTextEdit::insertFromMimeData(source); } @@ -1252,7 +1252,7 @@ public: bool resizeEventCalled; protected: - virtual void resizeEvent(QResizeEvent *e) + virtual void resizeEvent(QResizeEvent *e) override { QPlainTextEdit::resizeEvent(e); setPlainText("<img src=qtextbrowser-resizeevent.png width=" + QString::number(size().width()) + "><br>Size is " + QString::number(size().width()) + " x " + QString::number(size().height())); diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp index a1097fa433..eb80460311 100644 --- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp @@ -145,7 +145,7 @@ void tst_QProgressBar::text() class ProgressBar : public QProgressBar { - void paintEvent(QPaintEvent *event) + void paintEvent(QPaintEvent *event) override { repainted = true; QProgressBar::paintEvent(event); |