diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 14:52:01 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-02 21:57:06 +0200 |
commit | 2a6cdec718934ca2cc7f6f9c616ebe62f6912123 (patch) | |
tree | c8b9ed8db47912dccd2e8d125d23760936820c29 /src/widgets/accessible | |
parent | d4c04acc65657d29df5b790281a8d1ba896dd868 (diff) |
Use QList instead of QVector in widgets
Task-number: QTBUG-84469
Change-Id: I3007734f8e4f164ece9dd8850ef007cbef9e12ef
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r-- | src/widgets/accessible/qaccessiblemenu.cpp | 4 | ||||
-rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/accessible/qaccessiblewidget.h | 3 | ||||
-rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 12 | ||||
-rw-r--r-- | src/widgets/accessible/simplewidgets_p.h | 6 |
5 files changed, 17 insertions, 12 deletions
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp index ccfd30428a..b9c3dbe912 100644 --- a/src/widgets/accessible/qaccessiblemenu.cpp +++ b/src/widgets/accessible/qaccessiblemenu.cpp @@ -117,8 +117,8 @@ QAccessibleInterface *QAccessibleMenu::child(int index) const QAccessibleInterface *QAccessibleMenu::parent() const { if (QAction *menuAction = menu()->menuAction()) { - QVector<QObject*> parentCandidates; - const QVector<QObject*> associatedObjects = menuAction->associatedObjects(); + QList<QObject *> parentCandidates; + const QList<QObject *> associatedObjects = menuAction->associatedObjects(); parentCandidates.reserve(associatedObjects.size() + 1); parentCandidates << menu()->parentWidget() << associatedObjects; for (QObject *object : qAsConst(parentCandidates)) { diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 26341f805d..780d54c4b7 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -299,10 +299,10 @@ static inline bool isAncestor(const QObject *obj, const QObject *child) } /*! \reimp */ -QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > +QList<QPair<QAccessibleInterface *, QAccessible::Relation>> QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRelations*/) const { - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > rels; + QList<QPair<QAccessibleInterface *, QAccessible::Relation>> rels; if (match & QAccessible::Label) { const QAccessible::Relation rel = QAccessible::Label; if (QWidget *parent = widget()->parentWidget()) { diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index 63789a595f..7b915a99ac 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -59,7 +59,8 @@ public: QWindow *window() const override; int childCount() const override; int indexOfChild(const QAccessibleInterface *child) const override; - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + QList<QPair<QAccessibleInterface *, QAccessible::Relation>> + relations(QAccessible::Relation match = QAccessible::AllRelations) const override; QAccessibleInterface *focusChild() const override; QRect rect() const override; diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index 5b09143189..65c7375430 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -519,11 +519,12 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const } /*! \reimp */ -QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > +QList<QPair<QAccessibleInterface *, QAccessible::Relation>> QAccessibleDisplay::relations(QAccessible::Relation match /* = QAccessible::AllRelations */) const { - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > rels = QAccessibleWidget::relations(match); -#if QT_CONFIG(shortcut) && QT_CONFIG(label) + QList<QPair<QAccessibleInterface *, QAccessible::Relation>> rels = + QAccessibleWidget::relations(match); +# if QT_CONFIG(shortcut) && QT_CONFIG(label) if (match & QAccessible::Labelled) { if (QLabel *label = qobject_cast<QLabel*>(object())) { const QAccessible::Relation rel = QAccessible::Labelled; @@ -630,10 +631,11 @@ QAccessible::Role QAccessibleGroupBox::role() const return groupBox()->isCheckable() ? QAccessible::CheckBox : QAccessible::Grouping; } -QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > +QList<QPair<QAccessibleInterface *, QAccessible::Relation>> QAccessibleGroupBox::relations(QAccessible::Relation match /* = QAccessible::AllRelations */) const { - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > rels = QAccessibleWidget::relations(match); + QList<QPair<QAccessibleInterface *, QAccessible::Relation>> rels = + QAccessibleWidget::relations(match); if ((match & QAccessible::Labelled) && (!groupBox()->title().isEmpty())) { const QList<QWidget*> kids = childWidgets(widget()); diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 73572e3059..dd1631d6a5 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -118,7 +118,8 @@ public: QAccessible::Role role() const override; QAccessible::State state() const override; - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + QList<QPair<QAccessibleInterface *, QAccessible::Relation>> + relations(QAccessible::Relation match = QAccessible::AllRelations) const override; void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleImageInterface @@ -137,7 +138,8 @@ public: QAccessible::Role role() const override; QString text(QAccessible::Text t) const override; - QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + QList<QPair<QAccessibleInterface *, QAccessible::Relation>> + relations(QAccessible::Relation match = QAccessible::AllRelations) const override; //QAccessibleActionInterface QStringList actionNames() const override; |