1 files changed, 18 insertions, 18 deletions

diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h
index f72a177d13..e42443ee87 100644
--- a/src/gui/text/qtextdocumentlayout_p.h
+++ b/src/gui/text/qtextdocumentlayout_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -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();