diff options
Diffstat (limited to 'src/printsupport/kernel/qcups_p.h')
-rw-r--r-- | src/printsupport/kernel/qcups_p.h | 58 |
1 files changed, 13 insertions, 45 deletions
diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h index 57ec281383..4570935ba1 100644 --- a/src/printsupport/kernel/qcups_p.h +++ b/src/printsupport/kernel/qcups_p.h @@ -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 #ifndef QCUPS_P_H #define QCUPS_P_H @@ -137,7 +101,7 @@ public: static void clearCupsOption(QPrinter *printer, const QString &option); static void clearCupsOptions(QPrinter *printer); - static void setJobHold(QPrinter *printer, const JobHoldUntil jobHold = NoHold, const QTime &holdUntilTime = QTime()); + static void setJobHold(QPrinter *printer, const JobHoldUntil jobHold = NoHold, QTime holdUntilTime = QTime()); static void setJobBilling(QPrinter *printer, const QString &jobBilling = QString()); static void setJobPriority(QPrinter *printer, int priority = 50); static void setBannerPages(QPrinter *printer, const BannerPage startBannerPage, const BannerPage endBannerPage); @@ -159,7 +123,7 @@ public: struct JobHoldUntilWithTime { - JobHoldUntilWithTime(JobHoldUntil jh = NoHold, const QTime &t = QTime()) + JobHoldUntilWithTime(JobHoldUntil jh = NoHold, QTime t = QTime()) : jobHold(jh), time(t) {} JobHoldUntil jobHold; @@ -177,10 +141,14 @@ Q_DECLARE_TYPEINFO(QCUPSSupport::PagesPerSheet, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE -Q_DECLARE_METATYPE(QCUPSSupport::JobHoldUntil) -Q_DECLARE_METATYPE(QCUPSSupport::BannerPage) -Q_DECLARE_METATYPE(QCUPSSupport::PageSet) -Q_DECLARE_METATYPE(QCUPSSupport::PagesPerSheetLayout) -Q_DECLARE_METATYPE(QCUPSSupport::PagesPerSheet) +QT_DECL_METATYPE_EXTERN_TAGGED(QCUPSSupport::JobHoldUntil, + QCUPSSupport__JobHoldUntil, Q_PRINTSUPPORT_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QCUPSSupport::BannerPage, + QCUPSSupport__BannerPage, Q_PRINTSUPPORT_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QCUPSSupport::PageSet, QCUPSSupport__PageSet, Q_PRINTSUPPORT_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QCUPSSupport::PagesPerSheetLayout, + QCUPSSupport__PagesPerSheetLayout, Q_PRINTSUPPORT_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QCUPSSupport::PagesPerSheet, + QCUPSSupport__PagesPerSheet, Q_PRINTSUPPORT_EXPORT) #endif |