summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2014-12-18 16:20:42 +0100
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2015-01-16 12:08:58 +0100
commit8cbf402123285795a502b4dfafe24af799bb4887 (patch)
tree3cd2f7c3451b20462a7de251b00ebbe92fffc7b2
parent3c6a960b5bdce834faa9b1f580ea44a1f6e36542 (diff)
QComboBox: simplify code
Remove an useless check and hoist a costly call out of a loop. Change-Id: Ibd1750026af44462a4f0223a9b2f422ebcc7c0e3 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
-rw-r--r--src/widgets/widgets/qcombobox.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index b38b482295..24aef5254f 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -1990,13 +1990,12 @@ void QComboBox::setModel(QAbstractItemModel *model)
bool currentReset = false;
- if (count()) {
- for (int pos=0; pos < count(); pos++) {
- if (d->model->index(pos, d->modelColumn, d->root).flags() & Qt::ItemIsEnabled) {
- setCurrentIndex(pos);
- currentReset = true;
- break;
- }
+ const int rowCount = count();
+ for (int pos=0; pos < rowCount; pos++) {
+ if (d->model->index(pos, d->modelColumn, d->root).flags() & Qt::ItemIsEnabled) {
+ setCurrentIndex(pos);
+ currentReset = true;
+ break;
}
}