diff options
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidget.cpp')
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 3a9422cc26..e540980a14 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -53,10 +53,9 @@ QT_BEGIN_NAMESPACE static QList<QWidget*> childWidgets(const QWidget *widget) { - QList<QObject*> list = widget->children(); QList<QWidget*> widgets; - for (int i = 0; i < list.size(); ++i) { - QWidget *w = qobject_cast<QWidget *>(list.at(i)); + for (QObject *o : widget->children()) { + QWidget *w = qobject_cast<QWidget *>(o); if (w && !w->isWindow() && !qobject_cast<QFocusFrame*>(w) #if !defined(QT_NO_MENU) @@ -77,9 +76,8 @@ static QString buddyString(const QWidget *widget) if (!parent) return QString(); #ifndef QT_NO_SHORTCUT - QObjectList ol = parent->children(); - for (int i = 0; i < ol.size(); ++i) { - QLabel *label = qobject_cast<QLabel*>(ol.at(i)); + for (QObject *o : parent->children()) { + QLabel *label = qobject_cast<QLabel*>(o); if (label && label->buddy() == widget) return label->text(); } @@ -274,7 +272,7 @@ public: void QAccessibleWidget::addControllingSignal(const QString &signal) { QByteArray s = QMetaObject::normalizedSignature(signal.toLatin1()); - if (object()->metaObject()->indexOfSignal(s) < 0) + if (Q_UNLIKELY(object()->metaObject()->indexOfSignal(s) < 0)) qWarning("Signal %s unknown in %s", s.constData(), object()->metaObject()->className()); d->primarySignals << QLatin1String(s); } @@ -302,8 +300,8 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel // ideally we would go through all objects and check, but that // will be too expensive const QList<QWidget*> kids = childWidgets(parent); - for (int i = 0; i < kids.count(); ++i) { - if (QLabel *labelSibling = qobject_cast<QLabel*>(kids.at(i))) { + for (QWidget *kid : kids) { + if (QLabel *labelSibling = qobject_cast<QLabel*>(kid)) { if (labelSibling->buddy() == widget()) { QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(labelSibling); rels.append(qMakePair(iface, rel)); |