AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all reimplementations of relationTo() returning Unrelated.

Browse Source 
QAccessibleInterface::relationTo() already return
QAccessible::Unrelated by default. No need to duplicate that code.

Change-Id: I40e6758b946c43ca8773cdb2d28407edf99aad49
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Jan-Arve Saether 2012-01-16 13:51:20 +01:00 committed by Qt by Nokia
parent 1f7aa83661
commit 56c80382c6
4 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/accessible/widgets/itemviews.cpp
View File

@ -450,11 +450,6 @@ int QAccessibleTable::navigate(QAccessible::RelationFlag relation, int index, QA
return -1; return -1;
} }
QAccessible::Relation QAccessibleTable::relationTo(const QAccessibleInterface *) const
{
return QAccessible::Unrelated;
}
void *QAccessibleTable::interface_cast(QAccessible::InterfaceType t) void *QAccessibleTable::interface_cast(QAccessible::InterfaceType t)
{ {
if (t == QAccessible::TableInterface) if (t == QAccessible::TableInterface)
@ -559,11 +554,6 @@ int QAccessibleTree::indexOfChild(const QAccessibleInterface *iface) const
return -1; return -1;
} }
QAccessible::Relation QAccessibleTree::relationTo(const QAccessibleInterface *) const
{
return QAccessible::Unrelated;
}
QAccessibleInterface *QAccessibleTree::cellAt(int row, int column) const QAccessibleInterface *QAccessibleTree::cellAt(int row, int column) const
{ {
QModelIndex index = indexFromLogical(row, column); QModelIndex index = indexFromLogical(row, column);
@ -924,11 +914,6 @@ int QAccessibleTableHeaderCell::navigate(QAccessible::RelationFlag relation, int
return -1; return -1;
} }
QAccessible::Relation QAccessibleTableHeaderCell::relationTo(const QAccessibleInterface *) const
{
return QAccessible::Unrelated;
}
#endif // QT_NO_ITEMVIEWS #endif // QT_NO_ITEMVIEWS
QT_END_NAMESPACE QT_END_NAMESPACE

9
src/plugins/accessible/widgets/itemviews.h
View File

@ -78,7 +78,6 @@ public:
QAccessibleInterface *parent() const; QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const; QAccessibleInterface *child(int index) const;
int navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface **iface) const; int navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface **iface) const;
QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
void *interface_cast(QAccessible::InterfaceType t); void *interface_cast(QAccessible::InterfaceType t);
@ -160,8 +159,6 @@ public:
int rowCount() const; int rowCount() const;
QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
// table interface // table interface
QAccessibleInterface *cellAt(int row, int column) const; QAccessibleInterface *cellAt(int row, int column) const;
QString rowDescription(int row) const; QString rowDescription(int row) const;
@ -240,7 +237,6 @@ public:
QAccessibleInterface *parent() const; QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const; QAccessibleInterface *child(int index) const;
int navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface **iface) const; int navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface **iface) const;
QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
private: private:
QAbstractItemView *view; QAbstractItemView *view;
@ -287,11 +283,6 @@ public:
return -1; return -1;
} }
QAccessible::Relation relationTo(const QAccessibleInterface *) const
{
return QAccessible::Unrelated;
}
private: private:
QAbstractItemView *view; QAbstractItemView *view;
}; };

5
src/plugins/accessible/widgets/qaccessiblewidgets.cpp
View File

@ -993,11 +993,6 @@ int QAccessibleTitleBar::navigate(QAccessible::RelationFlag relation, int entry,
return -1; return -1;
} }
QAccessible::Relation QAccessibleTitleBar::relationTo(const QAccessibleInterface * /*otherChild*/) const
{
return QAccessible::Unrelated; //###
}
int QAccessibleTitleBar::indexOfChild(const QAccessibleInterface * /*child*/) const int QAccessibleTitleBar::indexOfChild(const QAccessibleInterface * /*child*/) const
{ {
return -1; return -1;

1
src/plugins/accessible/widgets/qaccessiblewidgets.h
View File

@ -251,7 +251,6 @@ public:
int navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface **iface) const; int navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface **iface) const;
int indexOfChild(const QAccessibleInterface *child) const; int indexOfChild(const QAccessibleInterface *child) const;
int childCount() const; int childCount() const;
QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
QAccessibleInterface *childAt(int x, int y) const; QAccessibleInterface *childAt(int x, int y) const;
void setText(QAccessible::Text t, const QString &text); void setText(QAccessible::Text t, const QString &text);
QString text(QAccessible::Text t) const; QString text(QAccessible::Text t) const;