From 24d2a00ce2b2983655e9c59705025218cd0fa345 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 14 Apr 2022 14:10:41 +0200 Subject: Printsupport: stop using QL1Char constructor for creating char literals Required for porting away from QLatin1Char/QLatin1String in scope of QTBUG-98434. Change-Id: Ia186ed178239796bdf19db5b35a36ea606baf937 Reviewed-by: Volker Hilsheimer --- src/plugins/printsupport/cups/qcupsprintengine.cpp | 2 +- src/plugins/printsupport/cups/qcupsprintersupport.cpp | 4 ++-- src/plugins/printsupport/cups/qppdprintdevice.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/printsupport') diff --git a/src/plugins/printsupport/cups/qcupsprintengine.cpp b/src/plugins/printsupport/cups/qcupsprintengine.cpp index efe71862ed..4f617e754f 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine.cpp +++ b/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -251,7 +251,7 @@ void QCupsPrintEnginePrivate::closePrintDevice() // Print the file // Cups expect the printer original name without instance, the full name is used only to retrieve the configuration - const auto parts = QStringView{printerName}.split(QLatin1Char('/')); + const auto parts = QStringView{printerName}.split(u'/'); const auto printerOriginalName = parts.at(0); cups_option_t* optPtr = cupsOptStruct.size() ? &cupsOptStruct.first() : 0; cupsPrintFile(printerOriginalName.toLocal8Bit().constData(), tempFile.toLocal8Bit().constData(), diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp index 8f7d0f1e1e..a13804b2b6 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -166,7 +166,7 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const for (int i = 0; i < count; ++i) { QString printerId = QString::fromLocal8Bit(dests[i].name); if (dests[i].instance) - printerId += QLatin1Char('/') + QString::fromLocal8Bit(dests[i].instance); + printerId += u'/' + QString::fromLocal8Bit(dests[i].instance); list.append(printerId); } cupsFreeDests(count, dests); @@ -187,7 +187,7 @@ QString QCupsPrinterSupport::staticDefaultPrintDeviceId() if (dests[i].is_default) { printerId = QString::fromLocal8Bit(dests[i].name); if (dests[i].instance) { - printerId += QLatin1Char('/') + QString::fromLocal8Bit(dests[i].instance); + printerId += u'/' + QString::fromLocal8Bit(dests[i].instance); break; } } diff --git a/src/plugins/printsupport/cups/qppdprintdevice.cpp b/src/plugins/printsupport/cups/qppdprintdevice.cpp index 6a5e7504e5..aad8c93c20 100644 --- a/src/plugins/printsupport/cups/qppdprintdevice.cpp +++ b/src/plugins/printsupport/cups/qppdprintdevice.cpp @@ -64,7 +64,7 @@ QPpdPrintDevice::QPpdPrintDevice(const QString &id) if (!id.isEmpty()) { // TODO For now each dest is an individual device - const auto parts = QStringView{id}.split(QLatin1Char('/')); + const auto parts = QStringView{id}.split(u'/'); m_cupsName = parts.at(0).toUtf8(); if (parts.size() > 1) m_cupsInstance = parts.at(1).toUtf8(); -- cgit v1.2.3