summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/text/qtextdocument
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/text/qtextdocument')
-rw-r--r--tests/auto/gui/text/qtextdocument/common.h14
-rw-r--r--tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp18
2 files changed, 16 insertions, 16 deletions
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);