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

QUnixPrintWidget: fix some poor uses of the QComboBox API 

- populate the widget with addItems(QStringList) instead of
  looping over addItem(QString)
- Use findText() instead of looping over itemText(int).
  QComboBox::findText() delegates searching to the model
  (via QAbstractItemModel::match()), so is potentially
  much faster. I say potentially, because match() isn't
  properly reimplemented in most models, yet. But that is
  something to fix in the models.

Change-Id: I6e52cf5af810ab7869c0270504a241868a5ca281
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
bb10
Marc Mutz 2015-12-29 10:04:55 +01:00
parent be94e009ae
commit 04e76ec857
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -661,18 +661,16 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p, QPrinter *
widget.setupUi(parent);
int currentPrinterIndex = 0;
QStringList printers;
QString defaultPrinter;
QPlatformPrinterSupport *ps = QPlatformPrinterSupportPlugin::get();
if (ps) {
printers = ps->availablePrintDeviceIds();
defaultPrinter = ps->defaultPrintDeviceId();
}
const QStringList printers = ps->availablePrintDeviceIds();
const QString defaultPrinter = ps->defaultPrintDeviceId();
for (int i = 0; i < printers.size(); ++i) {
widget.printers->addItem(printers.at(i));
if (printers.at(i) == defaultPrinter)
currentPrinterIndex = i;
widget.printers->addItems(printers);
const int idx = printers.indexOf(defaultPrinter);
if (idx >= 0)
currentPrinterIndex = idx;
}
widget.properties->setEnabled(true);
@ -827,12 +825,9 @@ void QUnixPrintWidgetPrivate::applyPrinterProperties()
widget.filename->setText( printer->outputFileName() );
QString printerName = printer->printerName();
if (!printerName.isEmpty()) {
for (int i = 0; i < widget.printers->count(); ++i) {
if (widget.printers->itemText(i) == printerName) {
widget.printers->setCurrentIndex(i);
break;
}
}
const int i = widget.printers->findText(printerName);
if (i >= 0)
widget.printers->setCurrentIndex(i);
}
// PDF printer not added to the dialog yet, we'll handle those cases in QUnixPrintWidgetPrivate::updateWidget