whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCUPSSupport: Extract Method jobHoldToString() from setJobHold() 

The new function just calculates the job-hold-until cups option argument,
reducing the number of setCupsOption() calls down to one.

Effects on a stripped Linux AMD64 GCC 4.7 c++11 release build:
  text:  -552B
  data:   +-0B
  relocs: +-0

Change-Id: I4aa4118c3493cd302dd8fd7f4985c7e0f70ef071
Reviewed-by: Martin Klapetek <mklapetek@kde.org>
Reviewed-by: John Layt <jlayt@kde.org>
bb10
Marc Mutz 2014-03-24 01:00:33 +01:00 committed by The Qt Project
parent 3270b4490b
commit c36746a829
1 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/printsupport/kernel/qcups.cpp
View File

@ -67,61 +67,49 @@ void QCUPSSupport::setCupsOption(QStringList &cupsOptions, const QString &option
}
}
static inline QString jobHoldToString(const QCUPSSupport::JobHoldUntil jobHold, const QTime holdUntilTime)
{
switch (jobHold) {
case QCUPSSupport::Indefinite:
return QStringLiteral("indefinite");
case QCUPSSupport::DayTime:
return QStringLiteral("day-time");
case QCUPSSupport::Night:
return QStringLiteral("night");
case QCUPSSupport::SecondShift:
return QStringLiteral("second-shift");
case QCUPSSupport::ThirdShift:
return QStringLiteral("third-shift");
case QCUPSSupport::Weekend:
return QStringLiteral("weekend");
case QCUPSSupport::SpecificTime:
if (!holdUntilTime.isNull()) {
// CUPS expects the time in UTC, user has entered in local time, so get the UTS equivalent
QDateTime localDateTime = QDateTime::currentDateTime();
// Check if time is for tomorrow in case of DST change overnight
if (holdUntilTime < localDateTime.time())
localDateTime.addDays(1);
localDateTime.setTime(holdUntilTime);
return localDateTime.toUTC().time().toString(QStringLiteral("HH:mm"));
}
// else fall through:
case QCUPSSupport::NoHold:
return QString();
}
Q_UNREACHABLE();
return QString();
}
void QCUPSSupport::setJobHold(QPrinter *printer, const JobHoldUntil jobHold, const QTime &holdUntilTime)
{
QStringList cupsOptions = cupsOptionsList(printer);
switch (jobHold) {
case NoHold: //default
break;
case Indefinite:
const QString jobHoldUntilArgument = jobHoldToString(jobHold, holdUntilTime);
if (!jobHoldUntilArgument.isEmpty()) {
QStringList cupsOptions = cupsOptionsList(printer);
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
QStringLiteral("indefinite"));
break;
case DayTime:
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
QStringLiteral("day-time"));
break;
case Night:
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
QStringLiteral("night"));
break;
case SecondShift:
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
QStringLiteral("second-shift"));
break;
case ThirdShift:
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
QStringLiteral("third-shift"));
break;
case Weekend:
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
QStringLiteral("weekend"));
break;
case SpecificTime:
if (holdUntilTime.isNull()) {
setJobHold(printer, NoHold);
return;
}
// CUPS expects the time in UTC, user has entered in local time, so get the UTS equivalent
QDateTime localDateTime = QDateTime::currentDateTime();
// Check if time is for tomorrow in case of DST change overnight
if (holdUntilTime < localDateTime.time())
localDateTime.addDays(1);
localDateTime.setTime(holdUntilTime);
setCupsOption(cupsOptions,
QStringLiteral("job-hold-until"),
localDateTime.toUTC().time().toString(QStringLiteral("HH:mm")));
break;
jobHoldUntilArgument);
setCupsOptions(printer, cupsOptions);
}
setCupsOptions(printer, cupsOptions);
}
void QCUPSSupport::setJobBilling(QPrinter *printer, const QString &jobBilling)