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/simplewidgets.cpp | |
| parent | d4c04acc65657d29df5b790281a8d1ba896dd868 (diff) | |
| download | qtbase-2a6cdec718934ca2cc7f6f9c616ebe62f6912123.tar.gz | |
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/simplewidgets.cpp')
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
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()); |