summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/painting
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-10 20:39:49 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-11 00:20:47 +0200
commit6ae7a02104631a2234c475575ae15ca79bef14f9 (patch)
tree5ca2db0e3aa3c7851c6d19117147c581bebeeee3 /tests/auto/gui/painting
parent459e8dfdfb8ac164383c14332b2b0919f59f8b3c (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/gui/painting')
-rw-r--r--tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp10
-rw-r--r--tests/auto/gui/painting/qpainter/tst_qpainter.cpp28
2 files changed, 20 insertions, 18 deletions
diff --git a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
index 64a6ce2939..d6b532887f 100644
--- a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
+++ b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
@@ -58,11 +58,11 @@ class MyPaintEngine : public QPaintEngine
{
public:
MyPaintEngine() : QPaintEngine() {}
- bool begin(QPaintDevice *) { return true; }
- bool end() { return true; }
- void updateState(const QPaintEngineState &) {}
- void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) {}
- Type type() const { return Raster; }
+ bool begin(QPaintDevice *) override { return true; }
+ bool end() override { return true; }
+ void updateState(const QPaintEngineState &) override {}
+ void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {}
+ Type type() const override { return Raster; }
};
// Testing get/set functions
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 960dfdd04f..5d4e9def83 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -2634,17 +2634,17 @@ class DummyPaintEngine : public QPaintEngine, public QPaintDevice
{
public:
DummyPaintEngine() : QPaintEngine(no_porter_duff()) {}
- virtual bool begin(QPaintDevice *) { return true; }
- virtual bool end() { return true; }
+ virtual bool begin(QPaintDevice *) override { return true; }
+ virtual bool end() override { return true; }
- virtual void updateState(const QPaintEngineState &) {}
- virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) {}
+ virtual void updateState(const QPaintEngineState &) override {}
+ virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {}
- virtual Type type() const { return User; }
+ virtual Type type() const override { return User; }
- virtual QPaintEngine *paintEngine() const { return (QPaintEngine *)this; }
+ virtual QPaintEngine *paintEngine() const override { return (QPaintEngine *)this; }
- virtual int metric(PaintDeviceMetric metric) const { Q_UNUSED(metric); return 0; };
+ virtual int metric(PaintDeviceMetric metric) const override { Q_UNUSED(metric); return 0; };
};
static bool success;
@@ -2698,7 +2698,8 @@ class ViewportTestWidget : public QWidget
{
public:
ViewportTestWidget(QWidget *parent = 0) : QWidget(parent), hasPainted(false) {}
- QSize sizeHint() const {
+ QSize sizeHint() const override
+ {
return QSize(100, 100);
}
@@ -2706,7 +2707,8 @@ public:
bool hasPainted;
protected:
- void paintEvent(QPaintEvent *) {
+ void paintEvent(QPaintEvent *) override
+ {
hasPainted = true;
QPainter p(this);
viewport = p.viewport();
@@ -4451,7 +4453,7 @@ class TestProxy : public QGraphicsProxyWidget
{
public:
TestProxy() : QGraphicsProxyWidget() {}
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
{
QGraphicsProxyWidget::paint(painter, option, widget);
deviceTransform = painter->deviceTransform();
@@ -4464,7 +4466,7 @@ class TestWidget : public QWidget
Q_OBJECT
public:
TestWidget() : QWidget(), painted(false) {}
- void paintEvent(QPaintEvent *)
+ void paintEvent(QPaintEvent *) override
{
QPainter p(this);
deviceTransform = p.deviceTransform();
@@ -4645,7 +4647,7 @@ void tst_QPainter::drawPointScaled()
class GradientProducer : public QThread
{
protected:
- void run();
+ void run() override;
};
void GradientProducer::run()
@@ -4739,7 +4741,7 @@ void tst_QPainter::QTBUG38781_NoBrushAndQBitmap()
class TextDrawerThread : public QThread
{
public:
- void run();
+ void run() override;
QImage rendering;
};