diff options
Diffstat (limited to 'tests/auto/gui/text')
9 files changed, 57 insertions, 55 deletions
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp index be3ef968ef..5e6f8ce946 100644 --- a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp +++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp @@ -72,13 +72,14 @@ public: { } - void draw(QPainter *, const PaintContext &) {} - int hitTest(const QPointF &, Qt::HitTestAccuracy) const { return 0; } - int pageCount() const { return 0; } - QSizeF documentSize() const { return QSizeF(); } - QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } - QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } - void documentChanged(int from, int /* oldLength */, int length) { + void draw(QPainter *, const PaintContext &) override {} + int hitTest(const QPointF &, Qt::HitTestAccuracy) const override { return 0; } + int pageCount() const override { return 0; } + QSizeF documentSize() const override { return QSizeF(); } + QRectF frameBoundingRect(QTextFrame *) const override { return QRectF(); } + QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); } + void documentChanged(int from, int /* oldLength */, int length) override + { ++changeEvents; QTextBlock last = document()->lastBlock(); diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index a01805236a..0c7e53b4fa 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -887,30 +887,30 @@ public: styleSheets.append(sheet); } - virtual QStringList nodeNames(NodePtr node) const { return QStringList(reinterpret_cast<QDomElement *>(node.ptr)->tagName()); } - virtual QString attribute(NodePtr node, const QString &name) const { return reinterpret_cast<QDomElement *>(node.ptr)->attribute(name); } + virtual QStringList nodeNames(NodePtr node) const override { return QStringList(reinterpret_cast<QDomElement *>(node.ptr)->tagName()); } + virtual QString attribute(NodePtr node, const QString &name) const override { return reinterpret_cast<QDomElement *>(node.ptr)->attribute(name); } virtual bool hasAttribute(NodePtr node, const QString &name) const { return reinterpret_cast<QDomElement *>(node.ptr)->hasAttribute(name); } - virtual bool hasAttributes(NodePtr node) const { return reinterpret_cast<QDomElement *>(node.ptr)->hasAttributes(); } + virtual bool hasAttributes(NodePtr node) const override { return reinterpret_cast<QDomElement *>(node.ptr)->hasAttributes(); } - virtual bool isNullNode(NodePtr node) const { + virtual bool isNullNode(NodePtr node) const override { return reinterpret_cast<QDomElement *>(node.ptr)->isNull(); } - virtual NodePtr parentNode(NodePtr node) const { + virtual NodePtr parentNode(NodePtr node) const override { NodePtr parent; parent.ptr = new QDomElement(reinterpret_cast<QDomElement *>(node.ptr)->parentNode().toElement()); return parent; } - virtual NodePtr duplicateNode(NodePtr node) const { + virtual NodePtr duplicateNode(NodePtr node) const override { NodePtr n; n.ptr = new QDomElement(*reinterpret_cast<QDomElement *>(node.ptr)); return n; } - virtual NodePtr previousSiblingNode(NodePtr node) const { + virtual NodePtr previousSiblingNode(NodePtr node) const override { NodePtr sibling; sibling.ptr = new QDomElement(reinterpret_cast<QDomElement *>(node.ptr)->previousSiblingElement()); return sibling; } - virtual void freeNode(NodePtr node) const { + virtual void freeNode(NodePtr node) const override { delete reinterpret_cast<QDomElement *>(node.ptr); } diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index 645ff39cbe..8908d8b9d1 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -847,7 +847,7 @@ public: TestPixmap(int w, int h) : QPixmap(w, h), testPaintEngine(new TestPaintEngine) {} ~TestPixmap() { delete testPaintEngine; } - QPaintEngine *paintEngine() const + QPaintEngine *paintEngine() const override { return testPaintEngine; } diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp index 1301ccc9cf..da73e7846a 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp +++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp @@ -45,18 +45,18 @@ public: inline QTestDocumentLayout(QTextDocument *doc) : QAbstractTextDocumentLayout(doc), documentChangedCalled(false) {} - 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) { documentChangedCalled = true; } + virtual void documentChanged(int, int, int) override { documentChangedCalled = true; } - virtual int pageCount() const { return 1; } + virtual int pageCount() const override { return 1; } - virtual QSizeF documentSize() const { return QSize(); } + virtual QSizeF documentSize() const override { return QSize(); } - 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 documentChangedCalled; }; @@ -122,7 +122,7 @@ public: inline TestHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent), highlighted(false), callCount(0) {} - virtual void highlightBlock(const QString &text) + virtual void highlightBlock(const QString &text) override { for (int i = 0; i < formats.count(); ++i) { const QTextLayout::FormatRange &range = formats.at(i); @@ -179,7 +179,7 @@ public: highlighted = false; } - virtual void highlightBlock(const QString &text) + virtual void highlightBlock(const QString &text) override { QTextCharFormat commentFormat; commentFormat.setForeground(Qt::darkGreen); @@ -294,7 +294,7 @@ public: state = 0; } - virtual void highlightBlock(const QString &text) + virtual void highlightBlock(const QString &text) override { highlighted = true; if (text == QLatin1String("changestate")) diff --git a/tests/auto/gui/text/qtextdocument/common.h b/tests/auto/gui/text/qtextdocument/common.h index 0681f7f0e2..11ad99cfa0 100644 --- a/tests/auto/gui/text/qtextdocument/common.h +++ b/tests/auto/gui/text/qtextdocument/common.h @@ -36,10 +36,10 @@ class QTestDocumentLayout : public QAbstractTextDocumentLayout Q_OBJECT public: QTestDocumentLayout(QTextDocument *doc) : QAbstractTextDocumentLayout(doc), f(-1), called(false) {} - virtual void draw(QPainter *, const PaintContext &) {} - virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const { return 0; } + virtual void draw(QPainter *, const PaintContext &) override {} + virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override { return 0; } - virtual void documentChanged(int from, int oldLength, int length) + virtual void documentChanged(int from, int oldLength, int length) override { called = true; lastDocumentLengths.append(QTextDocumentPrivate::get(document())->length()); @@ -55,11 +55,11 @@ public: } } - virtual int pageCount() const { return 1; } - virtual QSizeF documentSize() const { return QSizeF(); } + virtual int pageCount() const override { return 1; } + virtual QSizeF documentSize() const override { return QSizeF(); } - 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(); } int f; int o; diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 04f8a9aa38..aaa3433173 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -209,13 +209,13 @@ class MyAbstractTextDocumentLayout : public QAbstractTextDocumentLayout { public: MyAbstractTextDocumentLayout(QTextDocument *doc) : QAbstractTextDocumentLayout(doc) {} - void draw(QPainter *, const PaintContext &) {} - int hitTest(const QPointF &, Qt::HitTestAccuracy) const { return 0; } - int pageCount() const { return 0; } - QSizeF documentSize() const { return QSizeF(); } - QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } - QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } - void documentChanged(int, int, int) {} + void draw(QPainter *, const PaintContext &) override {} + int hitTest(const QPointF &, Qt::HitTestAccuracy) const override { return 0; } + int pageCount() const override { return 0; } + QSizeF documentSize() const override { return QSizeF(); } + QRectF frameBoundingRect(QTextFrame *) const override { return QRectF(); } + QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); } + void documentChanged(int, int, int) override {} }; QString tst_QTextDocument::cssFontSizeString(const QFont &font) @@ -2384,7 +2384,7 @@ public: bool hasResourceCached(); protected: - virtual QVariant loadResource(int type, const QUrl &name); + virtual QVariant loadResource(int type, const QUrl &name) override; private: QUrl url; @@ -3185,7 +3185,7 @@ class BaseDocument : public QTextDocument public: QUrl loadedResource() const { return resourceUrl; } - QVariant loadResource(int type, const QUrl &name) + QVariant loadResource(int type, const QUrl &name) override { resourceUrl = name; return QTextDocument::loadResource(type, name); diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index 159effbd8f..3fdfa8ae99 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -3134,7 +3134,8 @@ public: QPixmap testPixmap; - virtual QVariant loadResource(int type, const QUrl &name) { + virtual QVariant loadResource(int type, const QUrl &name) override + { if (name.toString() == QLatin1String("testPixmap")) { return testPixmap; } diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index afcae2f4b7..f00d6215c3 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -1683,8 +1683,8 @@ QT_END_NAMESPACE void tst_QTextLayout::testTabDPIScale() { class MyPaintDevice : public QPaintDevice { - QPaintEngine *paintEngine () const { return 0; } - int metric (QPaintDevice::PaintDeviceMetric metric) const { + QPaintEngine *paintEngine () const override { return 0; } + int metric (QPaintDevice::PaintDeviceMetric metric) const override { switch(metric) { case QPaintDevice::PdmWidth: case QPaintDevice::PdmHeight: diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp index 2b0236339c..a848dad3d8 100644 --- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp +++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp @@ -1043,30 +1043,30 @@ public: PaintEngine() : QPaintEngine(QPaintEngine::PaintEngineFeatures{ }) {} - virtual Type type() const + virtual Type type() const override { return User; } - virtual bool begin(QPaintDevice *) + virtual bool begin(QPaintDevice *) override { return true; } - virtual bool end() + virtual bool end() override { return true; } - virtual void updateState(const QPaintEngineState &) + virtual void updateState(const QPaintEngineState &) override {} - virtual void drawRects(const QRect *, int) + virtual void drawRects(const QRect *, int) override {} - virtual void drawRects(const QRectF *r, int) + virtual void drawRects(const QRectF *r, int) override { if (painter()->brush() == QBrush(Qt::green)) { rects.append(*r); } } - virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) + virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {} }; @@ -1115,7 +1115,7 @@ public: layout.setUnits(QPageLayout::Point); setPageLayout(layout); } - virtual int metric(PaintDeviceMetric metric) const + virtual int metric(PaintDeviceMetric metric) const override { if (PdmDevicePixelRatio == metric) return 1; @@ -1131,11 +1131,11 @@ public: return 700; return 900; } - virtual QPaintEngine *paintEngine() const + virtual QPaintEngine *paintEngine() const override { return engine; } - bool newPage() + bool newPage() override { ++pages; return true; |