1 files changed, 10 insertions, 25 deletions

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index 88d053965b..b0bb12ea86 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -3,7 +3,7 @@
 
 #include "qaccessiblewidget.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 
 #include "qapplication.h"
 #if QT_CONFIG(groupbox)
@@ -34,22 +34,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static QList<QWidget*> childWidgets(const QWidget *widget)
-{
-    QList<QWidget*> widgets;
-    for (QObject *o : widget->children()) {
-        QWidget *w = qobject_cast<QWidget *>(o);
-        if (w && !w->isWindow()
-            && !qobject_cast<QFocusFrame*>(w)
-#if QT_CONFIG(menu)
-            && !qobject_cast<QMenu*>(w)
-#endif
-            && w->objectName() != "qt_rubberband"_L1
-            && w->objectName() != "qt_spinbox_lineedit"_L1)
-            widgets.append(w);
-    }
-    return widgets;
-}
+QWidgetList _q_ac_childWidgets(const QWidget *widget);
 
 static QString buddyString(const QWidget *widget)
 {
@@ -87,7 +72,7 @@ static qsizetype qt_accAmpIndex(const QString &text)
     qsizetype fa = 0;
     while ((fa = text.indexOf(u'&', fa)) != -1) {
         ++fa;
-        if (fa < text.length()) {
+        if (fa < text.size()) {
             // ignore "&&"
             if (text.at(fa) == u'&') {
 
@@ -276,7 +261,7 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel
             // first check for all siblings that are labels to us
             // ideally we would go through all objects and check, but that
             // will be too expensive
-            const QList<QWidget*> kids = childWidgets(parent);
+            const QList<QWidget*> kids = _q_ac_childWidgets(parent);
             for (QWidget *kid : kids) {
                 if (QLabel *labelSibling = qobject_cast<QLabel*>(kid)) {
                     if (labelSibling->buddy() == widget()) {
@@ -299,14 +284,14 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel
     if (match & QAccessible::Controlled) {
         QObjectList allReceivers;
         QObject *connectionObject = object();
-        for (int sig = 0; sig < d->primarySignals.count(); ++sig) {
+        for (int sig = 0; sig < d->primarySignals.size(); ++sig) {
             const QObjectList receivers = connectionObject->d_func()->receiverList(d->primarySignals.at(sig).toLatin1());
             allReceivers += receivers;
         }
 
         allReceivers.removeAll(object());  //### The object might connect to itself internally
 
-        for (int i = 0; i < allReceivers.count(); ++i) {
+        for (int i = 0; i < allReceivers.size(); ++i) {
             const QAccessible::Relation rel = QAccessible::Controlled;
             QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(allReceivers.at(i));
             if (iface)
@@ -327,7 +312,7 @@ QAccessibleInterface *QAccessibleWidget::parent() const
 QAccessibleInterface *QAccessibleWidget::child(int index) const
 {
     Q_ASSERT(widget());
-    QWidgetList childList = childWidgets(widget());
+    QWidgetList childList = _q_ac_childWidgets(widget());
     if (index >= 0 && index < childList.size())
         return QAccessible::queryAccessibleInterface(childList.at(index));
     return nullptr;
@@ -355,7 +340,7 @@ QAccessibleInterface *QAccessibleWidget::focusChild() const
 /*! \reimp */
 int QAccessibleWidget::childCount() const
 {
-    QWidgetList cl = childWidgets(widget());
+    QWidgetList cl = _q_ac_childWidgets(widget());
     return cl.size();
 }
 
@@ -364,7 +349,7 @@ int QAccessibleWidget::indexOfChild(const QAccessibleInterface *child) const
 {
     if (!child)
         return -1;
-    QWidgetList cl = childWidgets(widget());
+    QWidgetList cl = _q_ac_childWidgets(widget());
     return cl.indexOf(qobject_cast<QWidget *>(child->object()));
 }
 
@@ -498,4 +483,4 @@ void *QAccessibleWidget::interface_cast(QAccessible::InterfaceType t)
 
 QT_END_NAMESPACE
 
-#endif //QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)