summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-22 18:09:08 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-23 19:38:12 +0200
commite43174755c2c9e525849652139dcb210153e8e98 (patch)
tree360d8ea7396af65e89ade7b9140e6f5c51972ff8
parentc81d0586b5f22715ce66d0f14cf079424700358b (diff)
Fix warnings about conversion from const char* to QString.
Change-Id: I6d3dca0688a94eb34b55efc841a75e4ebd3a2bd7 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: John Layt <jlayt@kde.org>
-rw-r--r--src/printsupport/kernel/qcups.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/printsupport/kernel/qcups.cpp b/src/printsupport/kernel/qcups.cpp
index c724bde4fa..21029c09e5 100644
--- a/src/printsupport/kernel/qcups.cpp
+++ b/src/printsupport/kernel/qcups.cpp
@@ -517,15 +517,15 @@ void QCUPSSupport::setPagesPerSheetLayout(QPrinter *printer, const PagesPerShee
QStringList cupsOptions = cupsOptionsList(printer);
static const char *pagesPerSheetData[] = { "1", "2", "4", "6", "9", "16", 0 };
static const char *pageLayoutData[] = {"lrtb", "lrbt", "rlbt", "rltb", "btlr", "btrl", "tblr", "tbrl", 0};
- setCupsOption(cupsOptions, QStringLiteral("number-up"), pagesPerSheetData[pagesPerSheet]);
- setCupsOption(cupsOptions, QStringLiteral("number-up-layout"), pageLayoutData[pagesPerSheetLayout]);
+ setCupsOption(cupsOptions, QStringLiteral("number-up"), QLatin1String(pagesPerSheetData[pagesPerSheet]));
+ setCupsOption(cupsOptions, QStringLiteral("number-up-layout"), QLatin1String(pageLayoutData[pagesPerSheetLayout]));
setCupsOptions(printer, cupsOptions);
}
void QCUPSSupport::setPageRange(QPrinter *printer, int pageFrom, int pageTo)
{
QStringList cupsOptions = cupsOptionsList(printer);
- setCupsOption(cupsOptions, QStringLiteral("page-ranges"), QString("%1-%2").arg(pageFrom).arg(pageTo));
+ setCupsOption(cupsOptions, QStringLiteral("page-ranges"), QStringLiteral("%1-%2").arg(pageFrom).arg(pageTo));
setCupsOptions(printer, cupsOptions);
}