diff options
Diffstat (limited to 'src/printsupport/platform/windows/qwindowsprinterinfo.cpp')
| -rw-r--r-- | src/printsupport/platform/windows/qwindowsprinterinfo.cpp | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/src/printsupport/platform/windows/qwindowsprinterinfo.cpp b/src/printsupport/platform/windows/qwindowsprinterinfo.cpp index e416dd7a21..73040de60f 100644 --- a/src/printsupport/platform/windows/qwindowsprinterinfo.cpp +++ b/src/printsupport/platform/windows/qwindowsprinterinfo.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" @@ -46,6 +10,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #ifndef QT_NO_PRINTER extern QPrinter::PaperSize mapDevmodePaperSize(int s); @@ -78,13 +44,13 @@ extern QPrinter::PaperSize mapDevmodePaperSize(int s); //QPrinterInfo QPrinterInfo::defaultPrinter() //{ -// QString noPrinters(QLatin1String("qt_no_printers")); +// QString noPrinters("qt_no_printers"_L1); // wchar_t buffer[256]; // GetProfileString(L"windows", L"device", (wchar_t*)noPrinters.utf16(), buffer, 256); // QString output = QString::fromWCharArray(buffer); // if (output != noPrinters) { // // Filter out the name of the printer, which should be everything before a comma. -// QString printerName = output.split(QLatin1Char(',')).value(0); +// QString printerName = output.split(u',').value(0); // QPrinterInfo printerInfo(printerName); // printerInfo.d_ptr->isDefault = true; // return printerInfo; |