diff options
Diffstat (limited to 'src/gui/accessible/qaccessibleobject.cpp')
| -rw-r--r-- | src/gui/accessible/qaccessibleobject.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp index e271df2a13..b9e0ac388b 100644 --- a/src/gui/accessible/qaccessibleobject.cpp +++ b/src/gui/accessible/qaccessibleobject.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -202,7 +202,7 @@ static QObjectList topLevelObjects() if (w->windowType() != Qt::Popup && w->windowType() != Qt::Desktop) { if (QAccessibleInterface *root = w->accessibleRoot()) { if (root->object()) - list.append(w->accessibleRoot()->object()); + list.append(root->object()); delete root; } } @@ -224,20 +224,6 @@ int QAccessibleApplication::indexOfChild(const QAccessibleInterface *child) cons return tlw.indexOf(child->object()); } -/*! \reimp */ -QAccessible::Relation QAccessibleApplication::relationTo(const QAccessibleInterface *other) const -{ - QObject *o = other ? other->object() : 0; - if (!o) - return QAccessible::Unrelated; - - if(o == object()) { - return QAccessible::Self; - } - - return QAccessible::Unrelated; -} - QAccessibleInterface *QAccessibleApplication::parent() const { return 0; @@ -262,9 +248,6 @@ int QAccessibleApplication::navigate(QAccessible::RelationFlag relation, int, QObject *targetObject = 0; switch (relation) { - case QAccessible::Self: - targetObject = object(); - break; case QAccessible::FocusChild: if (QWindow *window = QGuiApplication::activeWindow()) { *target = window->accessibleRoot(); |