diff options
Diffstat (limited to 'src/gui/image/qpicture.h')
| -rw-r--r-- | src/gui/image/qpicture.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index 1ad20a4e70..9bb193321b 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.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$ @@ -55,7 +55,7 @@ public: bool isNull() const; - int devType() const; + int devType() const Q_DECL_OVERRIDE; uint size() const; const char* data() const; virtual void setData(const char* data, uint size); @@ -88,12 +88,12 @@ public: static QStringList inputFormatList(); static QStringList outputFormatList(); - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; protected: QPicture(QPicturePrivate &data); - int metric(PaintDeviceMetric m) const; + int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE; private: bool exec(QPainter *p, QDataStream &ds, int i); |