diff options
Diffstat (limited to 'src/gui/accessible')
-rw-r--r-- | src/gui/accessible/qaccessible.cpp | 6 | ||||
-rw-r--r-- | src/gui/accessible/qaccessible.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index dd0468d9f9..6664e5d312 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -894,17 +894,19 @@ QAccessibleInterface *QAccessibleEvent::accessibleInterface() const */ QAccessible::Relation QAccessibleInterface::relationTo(const QAccessibleInterface *) const { - return QAccessible::Unrelated; + return QAccessible::Relation(); } /*! Returns the meaningful relations to other widgets. Usually this will not return parent/child relations, unless they are handled in a specific way such as in tree views. It will typically return the labelled-by and label relations. + It should never return itself. \sa relationTo(), navigate() */ -QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > QAccessibleInterface::relations() const +QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > +QAccessibleInterface::relations(QAccessible::Relation /*match = QAccessible::AllRelations*/) const { return QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >(); } diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 214ec20f9c..9fc13a827b 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -306,12 +306,11 @@ public: }; enum RelationFlag { - Unrelated = 0x00000000, Label = 0x00020000, Labelled = 0x00040000, Controller = 0x00080000, Controlled = 0x00100000, - LogicalMask = 0x00ff0000 + AllRelations = 0xffffffff }; Q_DECLARE_FLAGS(Relation, RelationFlag) @@ -380,7 +379,7 @@ public: // relations virtual QAccessible::Relation relationTo(const QAccessibleInterface *other) const; - virtual QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations() const; + virtual QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const; virtual QAccessibleInterface *focusChild() const; virtual QAccessibleInterface *childAt(int x, int y) const = 0; |