diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/gui/text/qtextdocumentlayout_p.h | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) |
Add Q_DECL_OVERRIDE in the src subdirectory
Done automatically with clang-modernize on linux
(But does not add Q_DECL_OVERRIDE to the function that are marked
as inline because it a compilation error with MSVC2010)
Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/text/qtextdocumentlayout_p.h')
-rw-r--r-- | src/gui/text/qtextdocumentlayout_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h index f72a177d13..70c256ce89 100644 --- a/src/gui/text/qtextdocumentlayout_p.h +++ b/src/gui/text/qtextdocumentlayout_p.h @@ -66,11 +66,11 @@ public: explicit QTextDocumentLayout(QTextDocument *doc); // from the abstract layout - void draw(QPainter *painter, const PaintContext &context); - int hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const; + void draw(QPainter *painter, const PaintContext &context) Q_DECL_OVERRIDE; + int hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const Q_DECL_OVERRIDE; - int pageCount() const; - QSizeF documentSize() const; + int pageCount() const Q_DECL_OVERRIDE; + QSizeF documentSize() const Q_DECL_OVERRIDE; void setCursorWidth(int width); int cursorWidth() const; @@ -81,8 +81,8 @@ public: // internal for QTextEdit's NoWrap mode void setViewport(const QRectF &viewport); - virtual QRectF frameBoundingRect(QTextFrame *frame) const; - virtual QRectF blockBoundingRect(const QTextBlock &block) const; + virtual QRectF frameBoundingRect(QTextFrame *frame) const Q_DECL_OVERRIDE; + virtual QRectF blockBoundingRect(const QTextBlock &block) const Q_DECL_OVERRIDE; QRectF tableBoundingRect(QTextTable *table) const; QRectF tableCellBoundingRect(QTextTable *table, const QTextTableCell &cell) const; @@ -97,12 +97,12 @@ public: bool contentHasAlignment() const; protected: - void documentChanged(int from, int oldLength, int length); - void resizeInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format); - void positionInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format); + void documentChanged(int from, int oldLength, int length) Q_DECL_OVERRIDE; + void resizeInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; + void positionInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; void drawInlineObject(QPainter *p, const QRectF &rect, QTextInlineObject item, - int posInDocument, const QTextFormat &format); - virtual void timerEvent(QTimerEvent *e); + int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; + virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; private: QRectF doLayout(int from, int oldLength, int length); void layoutFinished(); |