diff options
Diffstat (limited to 'src/printsupport/kernel/qprinterinfo.cpp')
-rw-r--r-- | src/printsupport/kernel/qprinterinfo.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp index 1be574891b..d271e069ad 100644 --- a/src/printsupport/kernel/qprinterinfo.cpp +++ b/src/printsupport/kernel/qprinterinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -318,7 +318,7 @@ QList<QPrinter::PaperSize> QPrinterInfo::supportedPaperSizes() const QList<QPrinter::PaperSize> list; const QList<QPageSize> supportedPageSizes = d->m_printDevice.supportedPageSizes(); list.reserve(supportedPageSizes.size()); - foreach (const QPageSize &pageSize, supportedPageSizes) + for (const QPageSize &pageSize : supportedPageSizes) list.append(QPrinter::PaperSize(pageSize.id())); return list; } @@ -340,7 +340,7 @@ QList<QPair<QString, QSizeF> > QPrinterInfo::supportedSizesWithNames() const QList<QPair<QString, QSizeF> > list; const QList<QPageSize> supportedPageSizes = d->m_printDevice.supportedPageSizes(); list.reserve(supportedPageSizes.size()); - foreach (const QPageSize &pageSize, supportedPageSizes) + for (const QPageSize &pageSize : supportedPageSizes) list.append(qMakePair(pageSize.name(), pageSize.size(QPageSize::Millimeter))); return list; } @@ -382,7 +382,7 @@ QList<QPrinter::DuplexMode> QPrinterInfo::supportedDuplexModes() const QList<QPrinter::DuplexMode> list; const QList<QPrint::DuplexMode> supportedDuplexModes = d->m_printDevice.supportedDuplexModes(); list.reserve(supportedDuplexModes.size()); - foreach (QPrint::DuplexMode mode, supportedDuplexModes) + for (QPrint::DuplexMode mode : supportedDuplexModes) list << QPrinter::DuplexMode(mode); return list; } @@ -424,7 +424,7 @@ QList<QPrinterInfo> QPrinterInfo::availablePrinters() if (ps) { const QStringList availablePrintDeviceIds = ps->availablePrintDeviceIds(); list.reserve(availablePrintDeviceIds.size()); - foreach (const QString &id, availablePrintDeviceIds) + for (const QString &id : availablePrintDeviceIds) list.append(QPrinterInfo(id)); } return list; |