diff options
Diffstat (limited to 'tests/auto/gui/painting/qpainter/tst_qpainter.cpp')
-rw-r--r-- | tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
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; }; |