Remove QAccessibleToolButton::text
This function actually is worse than just calling QAccessibleButton::text which it already does. It would mess up the shortcut handling in addition to that. Change-Id: I56cb95a44624da4c5fccb43e6835f6012a083337 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>bb10
parent
0c3967f92c
commit
e944b93bf1
|
|
@ -298,29 +298,6 @@ QAccessibleInterface *QAccessibleToolButton::child(int index) const
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*!
|
||||
\internal
|
||||
|
||||
Returns the button's text label, depending on the text \a t, and
|
||||
the \a child.
|
||||
*/
|
||||
QString QAccessibleToolButton::text(QAccessible::Text t) const
|
||||
{
|
||||
QString str;
|
||||
switch (t) {
|
||||
case QAccessible::Name:
|
||||
str = toolButton()->accessibleName();
|
||||
if (str.isEmpty())
|
||||
str = toolButton()->text();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (str.isEmpty())
|
||||
str = QAccessibleButton::text(t);
|
||||
return qt_accStripAmp(str);
|
||||
}
|
||||
|
||||
/*
|
||||
The three different tool button types can have the following actions:
|
||||
| DelayedPopup | ShowMenuAction + (PressedAction || CheckedAction) |
|
||||
|
|
|
|||
|
|
@ -84,8 +84,6 @@ public:
|
|||
int childCount() const Q_DECL_OVERRIDE;
|
||||
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
|
||||
|
||||
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
|
||||
|
||||
// QAccessibleActionInterface
|
||||
QStringList actionNames() const Q_DECL_OVERRIDE;
|
||||
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
|
||||
|
|
|
|||
Loading…
Reference in New Issue