diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2017-12-28 17:51:43 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2018-01-12 12:04:46 +0000 |
| commit | e35878bf57f4107fa1a49a8a4d552ea5ce1b53a9 (patch) | |
| tree | 7909e5eeddd4ce6d2f279b4a2bb6c870a016e0fc /src/printsupport/dialogs | |
| parent | 608301d4c81ce65804a088aaebbd5433a56d69d7 (diff) | |
CUPS: Rework set/clearCupsOption API
Previously it was a bit awkward to use, you had to do
QStringList cupsOptions = QCUPSSupport::cupsOptionsList(printer);
QCUPSSupport::setCupsOption(cupsOptions, option, value);
QCUPSSupport::setCupsOptions(printer, cupsOptions);
now you simply have to do
QCUPSSupport::setCupsOption(printer, option, value);
Change-Id: Id31583f1ec72644791d82776debbae5583a2be54
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/printsupport/dialogs')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 47e2fa58f0..ab38c240e3 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -1417,9 +1417,7 @@ void QPPDOptionsModel::setCupsOptionsFromItems(QPrinter *printer, QOptionTreeIte QOptionTreeItemOption *itmOption = static_cast<QOptionTreeItemOption *>(itm); const ppd_option_t *opt = static_cast<const ppd_option_t*>(itm->ptr); if (qstrcmp(opt->defchoice, opt->choices[itmOption->selected].choice) != 0) { - QStringList cupsOptions = QCUPSSupport::cupsOptionsList(printer); - QCUPSSupport::setCupsOption(cupsOptions, QString::fromLatin1(opt->keyword), QString::fromLatin1(opt->choices[itmOption->selected].choice)); - QCUPSSupport::setCupsOptions(printer, cupsOptions); + QCUPSSupport::setCupsOption(printer, QString::fromLatin1(opt->keyword), QString::fromLatin1(opt->choices[itmOption->selected].choice)); } } else { setCupsOptionsFromItems(printer, itm); |