diff options
Diffstat (limited to 'src/gui/painting/qpainterpath.h')
-rw-r--r-- | src/gui/painting/qpainterpath.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 39b65dd1e9..4a7bd98234 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.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$ @@ -81,16 +81,16 @@ public: inline bool operator!=(const Element &e) const { return !operator==(e); } }; - QPainterPath(); + QPainterPath() Q_DECL_NOEXCEPT; explicit QPainterPath(const QPointF &startPoint); QPainterPath(const QPainterPath &other); QPainterPath &operator=(const QPainterPath &other); #ifdef Q_COMPILER_RVALUE_REFS - inline QPainterPath &operator=(QPainterPath &&other) + inline QPainterPath &operator=(QPainterPath &&other) Q_DECL_NOEXCEPT { qSwap(d_ptr, other.d_ptr); return *this; } #endif ~QPainterPath(); - inline void swap(QPainterPath &other) { d_ptr.swap(other.d_ptr); } + inline void swap(QPainterPath &other) Q_DECL_NOEXCEPT { d_ptr.swap(other.d_ptr); } void closeSubpath(); @@ -147,8 +147,8 @@ public: void translate(qreal dx, qreal dy); inline void translate(const QPointF &offset); - QPainterPath translated(qreal dx, qreal dy) const; - inline QPainterPath translated(const QPointF &offset) const; + QPainterPath translated(qreal dx, qreal dy) const Q_REQUIRED_RESULT; + inline QPainterPath translated(const QPointF &offset) const Q_REQUIRED_RESULT; QRectF boundingRect() const; QRectF controlPointRect() const; @@ -158,7 +158,7 @@ public: bool isEmpty() const; - QPainterPath toReversed() const; + QPainterPath toReversed() const Q_REQUIRED_RESULT; QList<QPolygonF> toSubpathPolygons(const QMatrix &matrix = QMatrix()) const; QList<QPolygonF> toFillPolygons(const QMatrix &matrix = QMatrix()) const; QPolygonF toFillPolygon(const QMatrix &matrix = QMatrix()) const; @@ -178,12 +178,12 @@ public: bool intersects(const QPainterPath &p) const; bool contains(const QPainterPath &p) const; - QPainterPath united(const QPainterPath &r) const; - QPainterPath intersected(const QPainterPath &r) const; - QPainterPath subtracted(const QPainterPath &r) const; - QPainterPath subtractedInverted(const QPainterPath &r) const; + QPainterPath united(const QPainterPath &r) const Q_REQUIRED_RESULT; + QPainterPath intersected(const QPainterPath &r) const Q_REQUIRED_RESULT; + QPainterPath subtracted(const QPainterPath &r) const Q_REQUIRED_RESULT; + QPainterPath subtractedInverted(const QPainterPath &r) const Q_REQUIRED_RESULT; - QPainterPath simplified() const; + QPainterPath simplified() const Q_REQUIRED_RESULT; bool operator==(const QPainterPath &other) const; bool operator!=(const QPainterPath &other) const; |