diff options
Diffstat (limited to 'src/printsupport/kernel/qprinterinfo.cpp')
| -rw-r--r-- | src/printsupport/kernel/qprinterinfo.cpp | 89 |
1 files changed, 4 insertions, 85 deletions
diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp index 167b2361ef..59078b4df4 100644 --- a/src/printsupport/kernel/qprinterinfo.cpp +++ b/src/printsupport/kernel/qprinterinfo.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qprinterinfo.h" #include "qprinterinfo_p.h" @@ -57,7 +21,7 @@ class QPrinterInfoPrivateDeleter public: static inline void cleanup(QPrinterInfoPrivate *d) { - if (d != shared_null) + if (d != &*shared_null) delete d; } }; @@ -106,7 +70,7 @@ QPrinterInfo::QPrinterInfo() Constructs a copy of \a other. */ QPrinterInfo::QPrinterInfo(const QPrinterInfo &other) - : d_ptr((other.d_ptr.data() == shared_null) ? shared_null : new QPrinterInfoPrivate(*other.d_ptr)) + : d_ptr((other.d_ptr.data() == shared_null) ? &*shared_null : new QPrinterInfoPrivate(*other.d_ptr)) { } @@ -313,51 +277,6 @@ QPageSize QPrinterInfo::maximumPhysicalPageSize() const return QPageSize(d->m_printDevice.maximumPhysicalPageSize(), QString(), QPageSize::ExactMatch); } -#if QT_DEPRECATED_SINCE(5,3) -/*! - \obsolete Use supportedPageSizes() instead. - - Returns a list of supported paper sizes by the printer. - - Not all printer drivers support this query, so the list may be empty. - - \since 4.4 -*/ - -QList<QPrinter::PaperSize> QPrinterInfo::supportedPaperSizes() const -{ - Q_D(const QPrinterInfo); - QList<QPrinter::PaperSize> list; - const QList<QPageSize> supportedPageSizes = d->m_printDevice.supportedPageSizes(); - list.reserve(supportedPageSizes.size()); - for (const QPageSize &pageSize : supportedPageSizes) - list.append(QPrinter::PaperSize(pageSize.id())); - return list; -} - -/*! - \obsolete Use supportedPageSizes() instead. - - Returns a list of all the paper names supported by the driver with the - corresponding size in millimeters. - - Not all printer drivers support this query, so the list may be empty. - - \since 5.1 -*/ - -QList<QPair<QString, QSizeF> > QPrinterInfo::supportedSizesWithNames() const -{ - Q_D(const QPrinterInfo); - QList<QPair<QString, QSizeF> > list; - const QList<QPageSize> supportedPageSizes = d->m_printDevice.supportedPageSizes(); - list.reserve(supportedPageSizes.size()); - for (const QPageSize &pageSize : supportedPageSizes) - list.append(qMakePair(pageSize.name(), pageSize.size(QPageSize::Millimeter))); - return list; -} -#endif // QT_DEPRECATED_SINCE(5,3) - /*! Returns a list of resolutions supported by this printer. |