diff options
Diffstat (limited to 'src/gui/painting/qpagesize.h')
| -rw-r--r-- | src/gui/painting/qpagesize.h | 63 |
1 files changed, 15 insertions, 48 deletions
diff --git a/src/gui/painting/qpagesize.h b/src/gui/painting/qpagesize.h index 1fa6c86081..b3629bb8d2 100644 --- a/src/gui/painting/qpagesize.h +++ b/src/gui/painting/qpagesize.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2014 John Layt <jlayt@kde.org> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2014 John Layt <jlayt@kde.org> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPAGESIZE_H #define QPAGESIZE_H @@ -224,7 +188,7 @@ public: }; QPageSize(); - explicit QPageSize(PageSizeId pageSizeId); + Q_IMPLICIT QPageSize(PageSizeId pageSizeId); explicit QPageSize(const QSize &pointSize, const QString &name = QString(), SizeMatchPolicy matchPolicy = FuzzyMatch); @@ -232,12 +196,12 @@ public: const QString &name = QString(), SizeMatchPolicy matchPolicy = FuzzyMatch); QPageSize(const QPageSize &other); - QPageSize &operator=(QPageSize &&other) noexcept { swap(other); return *this; } + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QPageSize) QPageSize &operator=(const QPageSize &other); ~QPageSize(); - void swap(QPageSize &other) noexcept { qSwap(d, other.d); } + void swap(QPageSize &other) noexcept { d.swap(other.d); } friend Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs); bool isEquivalentTo(const QPageSize &other) const; @@ -283,6 +247,13 @@ public: private: friend class QPageSizePrivate; friend class QPlatformPrintDevice; + + bool equals(const QPageSize &other) const; + friend inline bool operator==(const QPageSize &lhs, const QPageSize &rhs) + { return lhs.equals(rhs); } + friend inline bool operator!=(const QPageSize &lhs, const QPageSize &rhs) + { return !(lhs == rhs); } + QPageSize(const QString &key, const QSize &pointSize, const QString &name); QPageSize(int windowsId, const QSize &pointSize, const QString &name); QPageSize(QPageSizePrivate &dd); @@ -291,18 +262,14 @@ private: Q_DECLARE_SHARED(QPageSize) -Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs); -inline bool operator!=(const QPageSize &lhs, const QPageSize &rhs) -{ return !operator==(lhs, rhs); } - #ifndef QT_NO_DEBUG_STREAM Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageSize &pageSize); #endif QT_END_NAMESPACE -Q_DECLARE_METATYPE(QPageSize) -Q_DECLARE_METATYPE(QPageSize::PageSizeId) -Q_DECLARE_METATYPE(QPageSize::Unit) +QT_DECL_METATYPE_EXTERN(QPageSize, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QPageSize::PageSizeId, QPageSize__PageSizeId, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QPageSize::Unit, QPageSize__Unit, Q_GUI_EXPORT) #endif // QPAGESIZE_H |