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/effects | |
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/effects')
-rw-r--r-- | tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp | 18 | ||||
-rw-r--r-- | tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index 38181c8af0..bd1b56ebc1 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -73,7 +73,7 @@ public: m_painter(0), m_styleOption(0) {} - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { m_painter = painter; m_styleOption = option; @@ -101,7 +101,7 @@ public: doNothingInDraw(false), m_painter(0), m_styleOption(0), m_source(0), m_opacity(1.0) {} - QRectF boundingRectFor(const QRectF &rect) const + QRectF boundingRectFor(const QRectF &rect) const override { return rect.adjusted(-m_margin, -m_margin, m_margin, m_margin); } void reset() @@ -123,7 +123,7 @@ public: int margin() const { return m_margin; } - void draw(QPainter *painter) + void draw(QPainter *painter) override { ++numRepaints; if (doNothingInDraw) @@ -135,7 +135,7 @@ public: drawSource(painter); } - void sourceChanged(QGraphicsEffect::ChangeFlags flags) + void sourceChanged(QGraphicsEffect::ChangeFlags flags) override { m_sourceChangedFlags |= flags; } int numRepaints; @@ -509,10 +509,10 @@ public: , repaints(0) {} - QRectF boundingRectFor(const QRectF &rect) const + QRectF boundingRectFor(const QRectF &rect) const override { return rect; } - void draw(QPainter *painter) + void draw(QPainter *painter) override { QCOMPARE(sourcePixmap(Qt::LogicalCoordinates).handle(), pixmap.handle()); QVERIFY((painter->worldTransform().type() <= QTransform::TxTranslate) == (sourcePixmap(Qt::DeviceCoordinates).handle() == pixmap.handle())); @@ -551,10 +551,10 @@ void tst_QGraphicsEffect::drawPixmapItem() class DeviceEffect : public QGraphicsEffect { public: - QRectF boundingRectFor(const QRectF &rect) const + QRectF boundingRectFor(const QRectF &rect) const override { return rect; } - void draw(QPainter *painter) + void draw(QPainter *painter) override { QPoint offset; QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, QGraphicsEffect::NoPad); @@ -648,7 +648,7 @@ public: MyGraphicsItem(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), nbPaint(0) {} - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { nbPaint++; QGraphicsWidget::paint(painter, option, widget); diff --git a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp index 99b0ccd10d..5cc08617c6 100644 --- a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp +++ b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp @@ -59,7 +59,8 @@ public: CustomFilter() : QPixmapFilter((QPixmapFilter::FilterType) Type, 0) { }; - void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const { + void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const override + { p->drawPixmap(QRectF(pt, srcRect.size()), src, srcRect); } }; |