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

Remove AccessibleEx classes.

Browse Source 
This was a binary compatibility hack to extend the accessibility
framework towards IAccessible2. Start fixing it properly.

Change-Id: I82bb0daa6469930c5bf6e440c919159603d56a83
Reviewed-on: http://codereview.qt-project.org/4750
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
This commit is contained in:
Frederik Gladhorn 2011-08-29 13:28:23 +02:00 committed by Qt by Nokia
parent 0478349f83
commit 204108d37b
19 changed files with 204 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/accessible/widgets/complexwidgets.cpp
View File

@ -1114,7 +1114,7 @@ QAccessible::State QAccessibleItemView::state(int child) const
bool QAccessibleItemView::isValid() const
{
if (atViewport())
return QAccessibleWidgetEx::isValid();
return QAccessibleWidget::isValid();
else
return QAccessibleAbstractScrollArea::isValid();
}
@ -1353,7 +1353,7 @@ void QAccessibleItemView::cellAtIndex(int index, int *row, int *column, int *rSp
Constructs a QAccessibleHeader object for \a w.
*/
QAccessibleHeader::QAccessibleHeader(QWidget *w)
: QAccessibleWidgetEx(w)
: QAccessibleWidget(w)
{
Q_ASSERT(header());
addControllingSignal(QLatin1String("sectionClicked(int)"));
@ -1369,7 +1369,7 @@ QHeaderView *QAccessibleHeader::header() const
QRect QAccessibleHeader::rect(int child) const
{
if (!child)
return QAccessibleWidgetEx::rect(0);
return QAccessibleWidget::rect(0);
QHeaderView *h = header();
QPoint zero = h->mapToGlobal(QPoint(0, 0));
@ -1411,7 +1411,7 @@ QString QAccessibleHeader::text(Text t, int child) const
}
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, child);
str = QAccessibleWidget::text(t, child);
return str;
}
@ -1424,7 +1424,7 @@ QAccessible::Role QAccessibleHeader::role(int) const
/*! \reimp */
QAccessible::State QAccessibleHeader::state(int child) const
{
State state = QAccessibleWidgetEx::state(child);
State state = QAccessibleWidget::state(child);
if (child) {
int section = child - 1;
@ -1455,7 +1455,7 @@ QAccessible::State QAccessibleHeader::state(int child) const
Constructs a QAccessibleTabBar object for \a w.
*/
QAccessibleTabBar::QAccessibleTabBar(QWidget *w)
: QAccessibleWidgetEx(w)
: QAccessibleWidget(w)
{
Q_ASSERT(tabBar());
}
@ -1483,7 +1483,7 @@ QAbstractButton *QAccessibleTabBar::button(int child) const
QRect QAccessibleTabBar::rect(int child) const
{
if (!child || !tabBar()->isVisible())
return QAccessibleWidgetEx::rect(0);
return QAccessibleWidget::rect(0);
QPoint tp = tabBar()->mapToGlobal(QPoint(0,0));
QRect rec;
@ -1530,7 +1530,7 @@ QString QAccessibleTabBar::text(Text t, int child) const
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, child);;
str = QAccessibleWidget::text(t, child);;
return str;
}
@ -1547,7 +1547,7 @@ QAccessible::Role QAccessibleTabBar::role(int child) const
/*! \reimp */
QAccessible::State QAccessibleTabBar::state(int child) const
{
State st = QAccessibleWidgetEx::state(0);
State st = QAccessibleWidget::state(0);
if (!child)
return st;
@ -1663,7 +1663,7 @@ QVector<int> QAccessibleTabBar::selection() const
Constructs a QAccessibleComboBox object for \a w.
*/
QAccessibleComboBox::QAccessibleComboBox(QWidget *w)
: QAccessibleWidgetEx(w, ComboBox)
: QAccessibleWidget(w, ComboBox)
{
Q_ASSERT(comboBox());
}
@ -1698,7 +1698,7 @@ QRect QAccessibleComboBox::rect(int child) const
sc = QStyle::SC_ComboBoxArrow;
break;
default:
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
}
if (sc != QStyle::SC_None) {
@ -1734,7 +1734,7 @@ int QAccessibleComboBox::navigate(RelationFlag rel, int entry, QAccessibleInterf
default:
break;
}
return QAccessibleWidgetEx::navigate(rel, entry, target);
return QAccessibleWidget::navigate(rel, entry, target);
}
/*! \reimp */
@ -1780,7 +1780,7 @@ QString QAccessibleComboBox::text(Text t, int child) const
if (child == OpenList)
str = QComboBox::tr("Open");
else
str = QAccessibleWidgetEx::text(t, 0);
str = QAccessibleWidget::text(t, 0);
break;
#endif
case Value:
@ -1799,7 +1799,7 @@ QString QAccessibleComboBox::text(Text t, int child) const
break;
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, 0);
str = QAccessibleWidget::text(t, 0);
return str;
}
@ -1823,7 +1823,7 @@ QAccessible::Role QAccessibleComboBox::role(int child) const
/*! \reimp */
QAccessible::State QAccessibleComboBox::state(int /*child*/) const
{
return QAccessibleWidgetEx::state(0);
return QAccessibleWidget::state(0);
}
/*! \reimp */
@ -1864,7 +1864,7 @@ static inline void removeInvisibleWidgetsFromList(QWidgetList *list)
#ifndef QT_NO_SCROLLAREA
// ======================= QAccessibleAbstractScrollArea =======================
QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget)
: QAccessibleWidgetEx(widget, Client)
: QAccessibleWidget(widget, Client)
{
Q_ASSERT(qobject_cast<QAbstractScrollArea *>(widget));
}
@ -1872,7 +1872,7 @@ QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget)
QString QAccessibleAbstractScrollArea::text(Text textType, int child) const
{
if (child == Self)
return QAccessibleWidgetEx::text(textType, 0);
return QAccessibleWidget::text(textType, 0);
QWidgetList children = accessibleChildren();
if (child < 1 || child > children.count())
return QString();
@ -1889,7 +1889,7 @@ void QAccessibleAbstractScrollArea::setText(Text textType, int child, const QStr
if (text.isEmpty())
return;
if (child == 0) {
QAccessibleWidgetEx::setText(textType, 0, text);
QAccessibleWidget::setText(textType, 0, text);
return;
}
QWidgetList children = accessibleChildren();
@ -1905,19 +1905,19 @@ void QAccessibleAbstractScrollArea::setText(Text textType, int child, const QStr
QAccessible::State QAccessibleAbstractScrollArea::state(int child) const
{
if (child == Self)
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
QWidgetList children = accessibleChildren();
if (child < 1 || child > children.count())
return QAccessibleWidgetEx::state(Self);
return QAccessibleWidget::state(Self);
QAccessibleInterface *childInterface = queryAccessibleInterface(children.at(child - 1));
if (!childInterface)
return QAccessibleWidgetEx::state(Self);
return QAccessibleWidget::state(Self);
QAccessible::State returnState = childInterface->state(0);
delete childInterface;
return returnState;
}
QVariant QAccessibleAbstractScrollArea::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleAbstractScrollArea::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -1939,7 +1939,7 @@ int QAccessibleAbstractScrollArea::indexOfChild(const QAccessibleInterface *chil
bool QAccessibleAbstractScrollArea::isValid() const
{
return (QAccessibleWidgetEx::isValid() && abstractScrollArea() && abstractScrollArea()->viewport());
return (QAccessibleWidget::isValid() && abstractScrollArea() && abstractScrollArea()->viewport());
}
int QAccessibleAbstractScrollArea::navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const
@ -2052,7 +2052,7 @@ int QAccessibleAbstractScrollArea::navigate(RelationFlag relation, int entry, QA
break;
}
} else {
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
if (qobject_cast<const QScrollBar *>(targetWidget))
@ -2066,7 +2066,7 @@ QRect QAccessibleAbstractScrollArea::rect(int child) const
if (!abstractScrollArea()->isVisible())
return QRect();
if (child == Self)
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
QWidgetList children = accessibleChildren();
if (child < 1 || child > children.count())
return QRect();

10
src/plugins/accessible/widgets/complexwidgets.h
View File

@ -60,7 +60,7 @@ class QAbstractScrollArea;
class QScrollArea;
#ifndef QT_NO_SCROLLAREA
class QAccessibleAbstractScrollArea : public QAccessibleWidgetEx
class QAccessibleAbstractScrollArea : public QAccessibleWidget
{
public:
explicit QAccessibleAbstractScrollArea(QWidget *widget);
@ -77,7 +77,7 @@ public:
QString text(Text textType, int child) const;
void setText(Text textType, int child, const QString &text);
State state(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
bool isValid() const;
@ -103,7 +103,7 @@ public:
#endif // QT_NO_SCROLLAREA
#ifndef QT_NO_ITEMVIEWS
class QAccessibleHeader : public QAccessibleWidgetEx
class QAccessibleHeader : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
@ -229,7 +229,7 @@ private:
#endif
#ifndef QT_NO_TABBAR
class QAccessibleTabBar : public QAccessibleWidgetEx
class QAccessibleTabBar : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
@ -255,7 +255,7 @@ private:
#endif // QT_NO_TABBAR
#ifndef QT_NO_COMBOBOX
class QAccessibleComboBox : public QAccessibleWidgetEx
class QAccessibleComboBox : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:

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

@ -107,7 +107,7 @@ QAccessibleInterface *QAccessibleTable2::childFromLogical(int logicalIndex) cons
}
QAccessibleTable2::QAccessibleTable2(QWidget *w)
: QAccessibleObjectEx(w)
: QAccessibleObject(w)
{
view = qobject_cast<QAbstractItemView *>(w);
Q_ASSERT(view);
@ -368,7 +368,7 @@ QAccessible::Role QAccessibleTable2::role(int child) const
QAccessible::State QAccessibleTable2::state(int child) const
{
Q_ASSERT(child == 0);
return QAccessible::Normal | HasInvokeExtension;
return QAccessible::Normal;
}
int QAccessibleTable2::childAt(int x, int y) const

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

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
class QAccessibleTable2Cell;
class QAccessibleTable2HeaderCell;
class QAccessibleTable2: public QAccessibleTable2Interface, public QAccessibleObjectEx
class QAccessibleTable2 :public QAccessibleTable2Interface, public QAccessibleObject
{
Q_ACCESSIBLE_OBJECT
public:

18
src/plugins/accessible/widgets/main.cpp
View File

@ -224,9 +224,9 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
} else if (classname == QLatin1String("QAbstractButton")) {
iface = new QAccessibleButton(widget, PushButton);
} else if (classname == QLatin1String("QDialog")) {
iface = new QAccessibleWidgetEx(widget, Dialog);
iface = new QAccessibleWidget(widget, Dialog);
} else if (classname == QLatin1String("QMessageBox")) {
iface = new QAccessibleWidgetEx(widget, AlertMessage);
iface = new QAccessibleWidget(widget, AlertMessage);
#ifndef QT_NO_MAINWINDOW
} else if (classname == QLatin1String("QMainWindow")) {
iface = new QAccessibleMainWindow(widget);
@ -236,13 +236,13 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
} else if (classname == QLatin1String("QGroupBox")) {
iface = new QAccessibleDisplay(widget, Grouping);
} else if (classname == QLatin1String("QStatusBar")) {
iface = new QAccessibleWidgetEx(widget, StatusBar);
iface = new QAccessibleWidget(widget, StatusBar);
#ifndef QT_NO_PROGRESSBAR
} else if (classname == QLatin1String("QProgressBar")) {
iface = new QAccessibleProgressBar(widget);
#endif
} else if (classname == QLatin1String("QToolBar")) {
iface = new QAccessibleWidgetEx(widget, ToolBar, widget->windowTitle());
iface = new QAccessibleWidget(widget, ToolBar, widget->windowTitle());
#ifndef QT_NO_MENUBAR
} else if (classname == QLatin1String("QMenuBar")) {
iface = new QAccessibleMenuBar(widget);
@ -285,14 +285,14 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
iface = new QAccessibleTabBar(widget);
#endif
} else if (classname == QLatin1String("QWorkspaceChild")) {
iface = new QAccessibleWidgetEx(widget, Window);
iface = new QAccessibleWidget(widget, Window);
} else if (classname == QLatin1String("QSizeGrip")) {
iface = new QAccessibleWidgetEx(widget, Grip);
iface = new QAccessibleWidget(widget, Grip);
#ifndef QT_NO_SPLITTER
} else if (classname == QLatin1String("QSplitter")) {
iface = new QAccessibleWidgetEx(widget, Splitter);
iface = new QAccessibleWidget(widget, Splitter);
} else if (classname == QLatin1String("QSplitterHandle")) {
iface = new QAccessibleWidgetEx(widget, Grip);
iface = new QAccessibleWidget(widget, Grip);
#endif
#ifndef QT_NO_TEXTEDIT
} else if (classname == QLatin1String("QTextEdit")) {
@ -328,7 +328,7 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
#endif
#ifndef QT_NO_RUBBERBAND
} else if (classname == QLatin1String("QRubberBand")) {
iface = new QAccessibleWidgetEx(widget, QAccessible::Border);
iface = new QAccessibleWidget(widget, QAccessible::Border);
#endif
#ifndef QT_NO_TEXTBROWSER
} else if (classname == QLatin1String("QTextBrowser")) {

26
src/plugins/accessible/widgets/qaccessiblemenu.cpp
View File

@ -56,7 +56,7 @@ QString Q_GUI_EXPORT qt_accStripAmp(const QString &text);
QString Q_GUI_EXPORT qt_accHotKey(const QString &text);
QAccessibleMenu::QAccessibleMenu(QWidget *w)
: QAccessibleWidgetEx(w)
: QAccessibleWidget(w)
{
Q_ASSERT(menu());
}
@ -74,7 +74,7 @@ int QAccessibleMenu::childCount() const
QRect QAccessibleMenu::rect(int child) const
{
if (!child || child > childCount())
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
QRect r = menu()->actionGeometry(menu()->actions()[child - 1]);
QPoint tlp = menu()->mapToGlobal(QPoint(0,0));
@ -92,7 +92,7 @@ int QAccessibleMenu::childAt(int x, int y) const
QString QAccessibleMenu::text(Text t, int child) const
{
QString tx = QAccessibleWidgetEx::text(t, child);
QString tx = QAccessibleWidget::text(t, child);
if (tx.size())
return tx;
@ -126,7 +126,7 @@ QAccessible::Role QAccessibleMenu::role(int child) const
QAccessible::State QAccessibleMenu::state(int child) const
{
State s = QAccessibleWidgetEx::state(child);
State s = QAccessibleWidget::state(child);
if (!child)
return s;
@ -160,7 +160,7 @@ QString QAccessibleMenu::actionText(int action, QAccessible::Text text, int chil
return QMenu::tr("Execute");
}
return QAccessibleWidgetEx::actionText(action, text, child);
return QAccessibleWidget::actionText(action, text, child);
}
bool QAccessibleMenu::doAction(int act, int child, const QVariantList &)
@ -212,11 +212,11 @@ int QAccessibleMenu::navigate(RelationFlag relation, int entry, QAccessibleInter
delete iface;
}
} else {
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
break;}
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
@ -241,7 +241,7 @@ int QAccessibleMenu::indexOfChild( const QAccessibleInterface *child ) const
#ifndef QT_NO_MENUBAR
QAccessibleMenuBar::QAccessibleMenuBar(QWidget *w)
: QAccessibleWidgetEx(w)
: QAccessibleWidget(w)
{
Q_ASSERT(menuBar());
}
@ -259,7 +259,7 @@ int QAccessibleMenuBar::childCount() const
QRect QAccessibleMenuBar::rect(int child) const
{
if (!child)
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
QRect r = menuBar()->actionGeometry(menuBar()->actions()[child - 1]);
QPoint tlp = menuBar()->mapToGlobal(QPoint(0,0));
@ -296,7 +296,7 @@ int QAccessibleMenuBar::navigate(RelationFlag relation, int entry, QAccessibleIn
}
break;
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
@ -336,7 +336,7 @@ QString QAccessibleMenuBar::text(Text t, int child) const
}
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, child);
str = QAccessibleWidget::text(t, child);
return str;
}
@ -353,7 +353,7 @@ QAccessible::Role QAccessibleMenuBar::role(int child) const
QAccessible::State QAccessibleMenuBar::state(int child) const
{
State s = QAccessibleWidgetEx::state(child);
State s = QAccessibleWidget::state(child);
if (!child)
return s;
@ -385,7 +385,7 @@ QString QAccessibleMenuBar::actionText(int action, QAccessible::Text text, int c
return QMenu::tr("Execute");
}
return QAccessibleWidgetEx::actionText(action, text, child);
return QAccessibleWidget::actionText(action, text, child);
}
bool QAccessibleMenuBar::doAction(int act, int child, const QVariantList &)

4
src/plugins/accessible/widgets/qaccessiblemenu.h
View File

@ -53,7 +53,7 @@ class QMenu;
class QMenuBar;
class QAction;
class QAccessibleMenu : public QAccessibleWidgetEx
class QAccessibleMenu : public QAccessibleWidget
{
public:
explicit QAccessibleMenu(QWidget *w);
@ -76,7 +76,7 @@ protected:
};
#ifndef QT_NO_MENUBAR
class QAccessibleMenuBar : public QAccessibleWidgetEx
class QAccessibleMenuBar : public QAccessibleWidget
{
public:
explicit QAccessibleMenuBar(QWidget *w);

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

@ -251,10 +251,10 @@ static int qTextBlockPosition(QTextBlock block)
Constructs a QAccessibleTextEdit object for a \a widget.
*/
QAccessibleTextEdit::QAccessibleTextEdit(QWidget *o)
: QAccessibleWidgetEx(o, EditableText)
: QAccessibleWidget(o, EditableText)
{
Q_ASSERT(widget()->inherits("QTextEdit"));
childOffset = QAccessibleWidgetEx::childCount();
childOffset = QAccessibleWidget::childCount();
}
/*! Returns the text edit. */
@ -266,7 +266,7 @@ QTextEdit *QAccessibleTextEdit::textEdit() const
QRect QAccessibleTextEdit::rect(int child) const
{
if (child <= childOffset)
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
QTextEdit *edit = textEdit();
QTextBlock block = qTextBlockAt(edit->document(), child - childOffset - 1);
@ -294,7 +294,7 @@ int QAccessibleTextEdit::childAt(int x, int y) const
if (block.isValid())
return qTextBlockPosition(block) + childOffset;
return QAccessibleWidgetEx::childAt(x, y);
return QAccessibleWidget::childAt(x, y);
}
/*! \reimp */
@ -307,14 +307,14 @@ QString QAccessibleTextEdit::text(Text t, int child) const
return textEdit()->toPlainText();
}
return QAccessibleWidgetEx::text(t, child);
return QAccessibleWidget::text(t, child);
}
/*! \reimp */
void QAccessibleTextEdit::setText(Text t, int child, const QString &text)
{
if (t != Value || (child > 0 && child <= childOffset)) {
QAccessibleWidgetEx::setText(t, child, text);
QAccessibleWidget::setText(t, child, text);
return;
}
if (textEdit()->isReadOnly())
@ -338,10 +338,10 @@ QAccessible::Role QAccessibleTextEdit::role(int child) const
{
if (child > childOffset)
return EditableText;
return QAccessibleWidgetEx::role(child);
return QAccessibleWidget::role(child);
}
QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int child,
QVariant QAccessibleTextEdit::invokeMethod(QAccessible::Method method, int child,
const QVariantList &params)
{
if (child)
@ -352,7 +352,7 @@ QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int chi
QSet<QAccessible::Method> set;
set << ListSupportedMethods << SetCursorPosition << GetCursorPosition;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
QAccessibleWidget::invokeMethod(method, child, params)));
}
case SetCursorPosition:
setCursorPosition(params.value(0).toInt());
@ -360,7 +360,7 @@ QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int chi
case GetCursorPosition:
return textEdit()->textCursor().position();
default:
return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
return QAccessibleWidget::invokeMethod(method, child, params);
}
}
@ -373,12 +373,12 @@ int QAccessibleTextEdit::childCount() const
#ifndef QT_NO_STACKEDWIDGET
// ======================= QAccessibleStackedWidget ======================
QAccessibleStackedWidget::QAccessibleStackedWidget(QWidget *widget)
: QAccessibleWidgetEx(widget, LayeredPane)
: QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QStackedWidget *>(widget));
}
QVariant QAccessibleStackedWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleStackedWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -426,7 +426,7 @@ int QAccessibleStackedWidget::navigate(RelationFlag relation, int entry, QAccess
targetObject = stackedWidget()->widget(entry-1);
break;
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0 : -1;
@ -441,7 +441,7 @@ QStackedWidget *QAccessibleStackedWidget::stackedWidget() const
#ifndef QT_NO_TOOLBOX
// ======================= QAccessibleToolBox ======================
QAccessibleToolBox::QAccessibleToolBox(QWidget *widget)
: QAccessibleWidgetEx(widget, LayeredPane)
: QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QToolBox *>(widget));
}
@ -449,14 +449,14 @@ QAccessibleToolBox::QAccessibleToolBox(QWidget *widget)
QString QAccessibleToolBox::text(Text textType, int child) const
{
if (textType != Value || child <= 0 || child > toolBox()->count())
return QAccessibleWidgetEx::text(textType, child);
return QAccessibleWidget::text(textType, child);
return toolBox()->itemText(child - 1);
}
void QAccessibleToolBox::setText(Text textType, int child, const QString &text)
{
if (textType != Value || child <= 0 || child > toolBox()->count()) {
QAccessibleWidgetEx::setText(textType, child, text);
QAccessibleWidget::setText(textType, child, text);
return;
}
toolBox()->setItemText(child - 1, text);
@ -466,7 +466,7 @@ QAccessible::State QAccessibleToolBox::state(int child) const
{
QWidget *childWidget = toolBox()->widget(child - 1);
if (!childWidget)
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
QAccessible::State childState = QAccessible::Normal;
if (toolBox()->currentWidget() == childWidget)
childState |= QAccessible::Expanded;
@ -475,7 +475,7 @@ QAccessible::State QAccessibleToolBox::state(int child) const
return childState;
}
QVariant QAccessibleToolBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleToolBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -502,7 +502,7 @@ int QAccessibleToolBox::navigate(RelationFlag relation, int entry, QAccessibleIn
{
*target = 0;
if (entry <= 0 || entry > toolBox()->count())
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
int index = -1;
if (relation == QAccessible::Up)
index = entry - 2;
@ -521,7 +521,7 @@ QToolBox * QAccessibleToolBox::toolBox() const
// ======================= QAccessibleMdiArea ======================
#ifndef QT_NO_MDIAREA
QAccessibleMdiArea::QAccessibleMdiArea(QWidget *widget)
: QAccessibleWidgetEx(widget, LayeredPane)
: QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QMdiArea *>(widget));
}
@ -529,18 +529,18 @@ QAccessibleMdiArea::QAccessibleMdiArea(QWidget *widget)
QAccessible::State QAccessibleMdiArea::state(int child) const
{
if (child < 0)
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
if (child == 0)
return QAccessible::Normal;
QList<QMdiSubWindow *> subWindows = mdiArea()->subWindowList();
if (subWindows.isEmpty() || child > subWindows.count())
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
if (subWindows.at(child - 1) == mdiArea()->activeSubWindow())
return QAccessible::Focused;
return QAccessible::Normal;
}
QVariant QAccessibleMdiArea::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleMdiArea::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -580,7 +580,7 @@ int QAccessibleMdiArea::navigate(RelationFlag relation, int entry, QAccessibleIn
targetObject = mdiAreaNavigate(mdiArea(), relation, entry);
break;
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0: -1;
@ -593,7 +593,7 @@ QMdiArea *QAccessibleMdiArea::mdiArea() const
// ======================= QAccessibleMdiSubWindow ======================
QAccessibleMdiSubWindow::QAccessibleMdiSubWindow(QWidget *widget)
: QAccessibleWidgetEx(widget, QAccessible::Window)
: QAccessibleWidget(widget, QAccessible::Window)
{
Q_ASSERT(qobject_cast<QMdiSubWindow *>(widget));
}
@ -605,7 +605,7 @@ QString QAccessibleMdiSubWindow::text(Text textType, int child) const
title.replace(QLatin1String("[*]"), QLatin1String(""));
return title;
}
return QAccessibleWidgetEx::text(textType, child);
return QAccessibleWidget::text(textType, child);
}
void QAccessibleMdiSubWindow::setText(Text textType, int child, const QString &text)
@ -613,13 +613,13 @@ void QAccessibleMdiSubWindow::setText(Text textType, int child, const QString &t
if (textType == QAccessible::Name && (child == 0 || child == 1))
mdiSubWindow()->setWindowTitle(text);
else
QAccessibleWidgetEx::setText(textType, child, text);
QAccessibleWidget::setText(textType, child, text);
}
QAccessible::State QAccessibleMdiSubWindow::state(int child) const
{
if (child != 0 || !mdiSubWindow()->parent())
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
QAccessible::State state = QAccessible::Normal | QAccessible::Focusable;
if (!mdiSubWindow()->isMaximized())
state |= (QAccessible::Movable | QAccessible::Sizeable);
@ -635,7 +635,7 @@ QAccessible::State QAccessibleMdiSubWindow::state(int child) const
return state;
}
QVariant QAccessibleMdiSubWindow::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleMdiSubWindow::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -659,7 +659,7 @@ int QAccessibleMdiSubWindow::navigate(RelationFlag relation, int entry, QAccessi
*target = 0;
if (!mdiSubWindow()->parent())
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
QWidget *targetObject = 0;
QMdiSubWindow *source = mdiSubWindow();
@ -691,7 +691,7 @@ int QAccessibleMdiSubWindow::navigate(RelationFlag relation, int entry, QAccessi
break;
}
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0: -1;
@ -702,7 +702,7 @@ QRect QAccessibleMdiSubWindow::rect(int child) const
if (mdiSubWindow()->isHidden())
return QRect();
if (!mdiSubWindow()->parent())
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
const QPoint pos = mdiSubWindow()->mapToGlobal(QPoint(0, 0));
if (child == 0)
return QRect(pos, mdiSubWindow()->size());
@ -721,7 +721,7 @@ int QAccessibleMdiSubWindow::childAt(int x, int y) const
if (!mdiSubWindow()->isVisible())
return -1;
if (!mdiSubWindow()->parent())
return QAccessibleWidgetEx::childAt(x, y);
return QAccessibleWidget::childAt(x, y);
const QRect globalGeometry = rect(0);
if (!globalGeometry.isValid())
return -1;
@ -742,7 +742,7 @@ QMdiSubWindow *QAccessibleMdiSubWindow::mdiSubWindow() const
// ======================= QAccessibleWorkspace ======================
#ifndef QT_NO_WORKSPACE
QAccessibleWorkspace::QAccessibleWorkspace(QWidget *widget)
: QAccessibleWidgetEx(widget, LayeredPane)
: QAccessibleWidget(widget, LayeredPane)
{
Q_ASSERT(qobject_cast<QWorkspace *>(widget));
}
@ -750,18 +750,18 @@ QAccessibleWorkspace::QAccessibleWorkspace(QWidget *widget)
QAccessible::State QAccessibleWorkspace::state(int child) const
{
if (child < 0)
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
if (child == 0)
return QAccessible::Normal;
QWidgetList subWindows = workspace()->windowList();
if (subWindows.isEmpty() || child > subWindows.count())
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
if (subWindows.at(child - 1) == workspace()->activeWindow())
return QAccessible::Focused;
return QAccessible::Normal;
}
QVariant QAccessibleWorkspace::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleWorkspace::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -801,7 +801,7 @@ int QAccessibleWorkspace::navigate(RelationFlag relation, int entry, QAccessible
targetObject = mdiAreaNavigate(workspace(), relation, entry);
break;
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
*target = QAccessible::queryAccessibleInterface(targetObject);
return *target ? 0: -1;
@ -816,12 +816,12 @@ QWorkspace *QAccessibleWorkspace::workspace() const
#ifndef QT_NO_DIALOGBUTTONBOX
// ======================= QAccessibleDialogButtonBox ======================
QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget)
: QAccessibleWidgetEx(widget, Grouping)
: QAccessibleWidget(widget, Grouping)
{
Q_ASSERT(qobject_cast<QDialogButtonBox*>(widget));
}
QVariant QAccessibleDialogButtonBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -845,12 +845,12 @@ QAccessible::Role QAccessibleTextBrowser::role(int child) const
#ifndef QT_NO_CALENDARWIDGET
// ===================== QAccessibleCalendarWidget ========================
QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
: QAccessibleWidgetEx(widget, Table)
: QAccessibleWidget(widget, Table)
{
Q_ASSERT(qobject_cast<QCalendarWidget *>(widget));
}
QVariant QAccessibleCalendarWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -873,7 +873,7 @@ int QAccessibleCalendarWidget::navigate(RelationFlag relation, int entry, QAcces
{
*target = 0;
if (entry <= 0 || entry > childCount())
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
QWidget *targetWidget = 0;
switch (relation) {
case Child:
@ -895,7 +895,7 @@ int QAccessibleCalendarWidget::navigate(RelationFlag relation, int entry, QAcces
targetWidget = calendarView();
break;
default:
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
*target = queryAccessibleInterface(targetWidget);
return *target ? 0: -1;
@ -906,7 +906,7 @@ QRect QAccessibleCalendarWidget::rect(int child) const
if (!calendarWidget()->isVisible() || child > childCount())
return QRect();
if (child == 0)
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
QWidget *childWidget = 0;
if (childCount() == 2)
childWidget = child == 1 ? navigationBar() : calendarView();
@ -953,7 +953,7 @@ QWidget *QAccessibleCalendarWidget::navigationBar() const
#ifndef QT_NO_DOCKWIDGET
QAccessibleDockWidget::QAccessibleDockWidget(QWidget *widget)
: QAccessibleWidgetEx(widget, Window)
: QAccessibleWidget(widget, Window)
{
}
@ -972,7 +972,7 @@ int QAccessibleDockWidget::navigate(RelationFlag relation, int entry, QAccessibl
*iface = 0;
return -1;
}
return QAccessibleWidgetEx::navigate(relation, entry, iface);
return QAccessibleWidget::navigate(relation, entry, iface);
}
int QAccessibleDockWidget::childAt(int x, int y) const
@ -1020,7 +1020,7 @@ QAccessible::Role QAccessibleDockWidget::role(int child) const
QAccessible::State QAccessibleDockWidget::state(int child) const
{
//### mark tabified widgets as invisible
return QAccessibleWidgetEx::state(child);
return QAccessibleWidget::state(child);
}
QRect QAccessibleDockWidget::rect (int child ) const
@ -1050,7 +1050,7 @@ QRect QAccessibleDockWidget::rect (int child ) const
return rect;
}
QVariant QAccessibleDockWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleDockWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -1714,9 +1714,9 @@ void QAccessibleTextEdit::setAttributes(int startOffset, int endOffset, const QS
#ifndef QT_NO_MAINWINDOW
QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
: QAccessibleWidgetEx(widget, Window) { }
: QAccessibleWidget(widget, Window) { }
QVariant QAccessibleMainWindow::invokeMethodEx(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
QVariant QAccessibleMainWindow::invokeMethod(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
{
return QVariant();
}
@ -1743,7 +1743,7 @@ int QAccessibleMainWindow::navigate(RelationFlag relation, int entry, QAccessibl
return *iface ? 0 : -1;
}
}
return QAccessibleWidgetEx::navigate(relation, entry, iface);
return QAccessibleWidget::navigate(relation, entry, iface);
}
int QAccessibleMainWindow::childAt(int x, int y) const

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

@ -66,7 +66,7 @@ class QDockWidgetLayout;
class QMainWindow;
#ifndef QT_NO_TEXTEDIT
class QAccessibleTextEdit : public QAccessibleWidgetEx, public QAccessibleTextInterface,
class QAccessibleTextEdit : public QAccessibleWidget, public QAccessibleTextInterface,
public QAccessibleEditableTextInterface
{
Q_ACCESSIBLE_OBJECT
@ -77,7 +77,7 @@ public:
void setText(Text t, int control, const QString &text);
Role role(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
QRect rect(int child) const;
int childAt(int x, int y) const;
@ -122,13 +122,13 @@ private:
};
#endif // QT_NO_TEXTEDIT
class QAccessibleStackedWidget : public QAccessibleWidgetEx
class QAccessibleStackedWidget : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
explicit QAccessibleStackedWidget(QWidget *widget);
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childAt(int x, int y) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
@ -138,7 +138,7 @@ protected:
QStackedWidget *stackedWidget() const;
};
class QAccessibleToolBox : public QAccessibleWidgetEx
class QAccessibleToolBox : public QAccessibleWidget
{
Q_ACCESSIBLE_OBJECT
public:
@ -147,7 +147,7 @@ public:
QString text(Text textType, int child) const;
void setText(Text textType, int child, const QString &text);
State state(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
@ -157,13 +157,13 @@ protected:
};
#ifndef QT_NO_MDIAREA
class QAccessibleMdiArea : public QAccessibleWidgetEx
class QAccessibleMdiArea : public QAccessibleWidget
{
public:
explicit QAccessibleMdiArea(QWidget *widget);
State state(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
@ -172,7 +172,7 @@ protected:
QMdiArea *mdiArea() const;
};
class QAccessibleMdiSubWindow : public QAccessibleWidgetEx
class QAccessibleMdiSubWindow : public QAccessibleWidget
{
public:
explicit QAccessibleMdiSubWindow(QWidget *widget);
@ -180,7 +180,7 @@ public:
QString text(Text textType, int child) const;
void setText(Text textType, int child, const QString &text);
State state(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
@ -193,13 +193,13 @@ protected:
#endif // QT_NO_MDIAREA
#ifndef QT_NO_WORKSPACE
class QAccessibleWorkspace : public QAccessibleWidgetEx
class QAccessibleWorkspace : public QAccessibleWidget
{
public:
explicit QAccessibleWorkspace(QWidget *widget);
State state(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
@ -209,12 +209,12 @@ protected:
};
#endif
class QAccessibleDialogButtonBox : public QAccessibleWidgetEx
class QAccessibleDialogButtonBox : public QAccessibleWidget
{
public:
explicit QAccessibleDialogButtonBox(QWidget *widget);
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
};
#ifndef QT_NO_TEXTBROWSER
@ -228,12 +228,12 @@ public:
#endif // QT_NO_TEXTBROWSER
#ifndef QT_NO_CALENDARWIDGET
class QAccessibleCalendarWidget : public QAccessibleWidgetEx
class QAccessibleCalendarWidget : public QAccessibleWidget
{
public:
explicit QAccessibleCalendarWidget(QWidget *widget);
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
@ -250,7 +250,7 @@ private:
#endif // QT_NO_CALENDARWIDGET
#ifndef QT_NO_DOCKWIDGET
class QAccessibleDockWidget: public QAccessibleWidgetEx
class QAccessibleDockWidget: public QAccessibleWidget
{
public:
explicit QAccessibleDockWidget(QWidget *widget);
@ -262,7 +262,7 @@ public:
State state(int child) const;
int childAt(int x, int y) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
QDockWidget *dockWidget() const;
};
@ -296,12 +296,12 @@ public:
#endif // QT_NO_DOCKWIDGET
#ifndef QT_NO_MAINWINDOW
class QAccessibleMainWindow : public QAccessibleWidgetEx
class QAccessibleMainWindow : public QAccessibleWidget
{
public:
explicit QAccessibleMainWindow(QWidget *widget);
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
int childCount() const;
int navigate(RelationFlag relation, int entry, QAccessibleInterface **iface) const;
int indexOfChild(const QAccessibleInterface *iface) const;

54
src/plugins/accessible/widgets/rangecontrols.cpp
View File

@ -67,7 +67,7 @@ extern QStyleOptionSlider Q_GUI_EXPORT qt_qsliderStyleOption(QSlider *slider);
#ifndef QT_NO_SPINBOX
QAccessibleAbstractSpinBox::QAccessibleAbstractSpinBox(QWidget *w)
: QAccessibleWidgetEx(w, SpinBox)
: QAccessibleWidget(w, SpinBox)
{
Q_ASSERT(abstractSpinBox());
}
@ -134,7 +134,7 @@ int QAccessibleAbstractSpinBox::navigate(RelationFlag rel, int entry, QAccessibl
default:
break;
}
return QAccessibleWidgetEx::navigate(rel, entry, target);
return QAccessibleWidget::navigate(rel, entry, target);
}
/*! \reimp */
@ -158,7 +158,7 @@ QString QAccessibleAbstractSpinBox::text(Text t, int child) const
default:
break;
}
return QAccessibleWidgetEx::text(t, 0);
return QAccessibleWidget::text(t, 0);
}
/*! \reimp */
@ -173,7 +173,7 @@ QAccessible::Role QAccessibleAbstractSpinBox::role(int child) const
default:
break;
}
return QAccessibleWidgetEx::role(child);
return QAccessibleWidget::role(child);
}
/*! \reimp */
@ -194,7 +194,7 @@ bool QAccessibleAbstractSpinBox::doAction(int action, int child, const QVariantL
break;
}
}
return QAccessibleWidgetEx::doAction(action, 0, params);
return QAccessibleWidget::doAction(action, 0, params);
}
QVariant QAccessibleAbstractSpinBox::currentValue()
@ -225,17 +225,17 @@ QVariant QAccessibleAbstractSpinBox::minimumValue()
return abstractSpinBox()->property("minimum");
}
QVariant QAccessibleAbstractSpinBox::invokeMethodEx(Method method, int child, const QVariantList &params)
QVariant QAccessibleAbstractSpinBox::invokeMethod(Method method, int child, const QVariantList &params)
{
switch (method) {
case ListSupportedMethods: {
QSet<QAccessible::Method> set;
set << ListSupportedMethods;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
QAccessibleWidget::invokeMethod(method, child, params)));
}
default:
return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
return QAccessibleWidget::invokeMethod(method, child, params);
}
}
@ -324,7 +324,7 @@ bool QAccessibleSpinBox::doAction(int action, int child, const QVariantList &par
// ================================== QAccessibleDoubleSpinBox ==================================
QAccessibleDoubleSpinBox::QAccessibleDoubleSpinBox(QWidget *widget)
: QAccessibleWidgetEx(widget, SpinBox)
: QAccessibleWidget(widget, SpinBox)
{
Q_ASSERT(qobject_cast<QDoubleSpinBox *>(widget));
addControllingSignal(QLatin1String("valueChanged(double)"));
@ -378,7 +378,7 @@ QRect QAccessibleDoubleSpinBox::rect(int child) const
int QAccessibleDoubleSpinBox::navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const
{
if (entry <= 0)
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
*target = 0;
switch (relation) {
@ -395,10 +395,10 @@ int QAccessibleDoubleSpinBox::navigate(RelationFlag relation, int entry, QAccess
default:
break;
}
return QAccessibleWidgetEx::navigate(relation, entry, target);
return QAccessibleWidget::navigate(relation, entry, target);
}
QVariant QAccessibleDoubleSpinBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
QVariant QAccessibleDoubleSpinBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
{
return QVariant();
}
@ -420,7 +420,7 @@ QString QAccessibleDoubleSpinBox::text(Text textType, int child) const
default:
break;
}
return QAccessibleWidgetEx::text(textType, 0);
return QAccessibleWidget::text(textType, 0);
}
/*! \reimp */
@ -435,13 +435,13 @@ QAccessible::Role QAccessibleDoubleSpinBox::role(int child) const
default:
break;
}
return QAccessibleWidgetEx::role(child);
return QAccessibleWidget::role(child);
}
/*! \reimp */
QAccessible::State QAccessibleDoubleSpinBox::state(int child) const
{
State state = QAccessibleWidgetEx::state(child);
State state = QAccessibleWidget::state(child);
switch (child) {
case ValueUp:
if (doubleSpinBox()->value() >= doubleSpinBox()->maximum())
@ -482,7 +482,7 @@ QAccessible::State QAccessibleDoubleSpinBox::state(int child) const
/*!
Constructs a QAccessibleScrollBar object for \a w.
\a name is propagated to the QAccessibleWidgetEx constructor.
\a name is propagated to the QAccessibleWidget constructor.
*/
QAccessibleScrollBar::QAccessibleScrollBar(QWidget *w)
: QAccessibleAbstractSlider(w, ScrollBar)
@ -636,7 +636,7 @@ QAccessible::State QAccessibleScrollBar::state(int child) const
/*!
Constructs a QAccessibleScrollBar object for \a w.
\a name is propagated to the QAccessibleWidgetEx constructor.
\a name is propagated to the QAccessibleWidget constructor.
*/
QAccessibleSlider::QAccessibleSlider(QWidget *w)
: QAccessibleAbstractSlider(w)
@ -789,22 +789,22 @@ QString QAccessibleSlider::actionText(int /*action*/, Text /*t*/, int /*child*/)
}
QAccessibleAbstractSlider::QAccessibleAbstractSlider(QWidget *w, Role r)
: QAccessibleWidgetEx(w, r)
: QAccessibleWidget(w, r)
{
Q_ASSERT(qobject_cast<QAbstractSlider *>(w));
}
QVariant QAccessibleAbstractSlider::invokeMethodEx(Method method, int child, const QVariantList &params)
QVariant QAccessibleAbstractSlider::invokeMethod(Method method, int child, const QVariantList &params)
{
switch (method) {
case ListSupportedMethods: {
QSet<QAccessible::Method> set;
set << ListSupportedMethods;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
QAccessibleWidget::invokeMethod(method, child, params)));
}
default:
return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
return QAccessibleWidget::invokeMethod(method, child, params);
}
}
@ -838,7 +838,7 @@ QAbstractSlider *QAccessibleAbstractSlider::abstractSlider() const
#ifndef QT_NO_DIAL
// ======================================= QAccessibleDial ======================================
QAccessibleDial::QAccessibleDial(QWidget *widget)
: QAccessibleWidgetEx(widget, Dial)
: QAccessibleWidget(widget, Dial)
{
Q_ASSERT(qobject_cast<QDial *>(widget));
addControllingSignal(QLatin1String("valueChanged(int)"));
@ -851,7 +851,7 @@ QRect QAccessibleDial::rect(int child) const
return rect;
switch (child) {
case Self:
return QAccessibleWidgetEx::rect(child);
return QAccessibleWidget::rect(child);
case SpeedoMeter: {
// Mixture from qcommonstyle.cpp (focus rect).
int width = dial()->width();
@ -937,7 +937,7 @@ QString QAccessibleDial::text(Text textType, int child) const
return QDial::tr("SliderHandle");
}
}
return QAccessibleWidgetEx::text(textType, child);
return QAccessibleWidget::text(textType, child);
}
QAccessible::Role QAccessibleDial::role(int child) const
@ -946,18 +946,18 @@ QAccessible::Role QAccessibleDial::role(int child) const
return Slider;
else if (child == SliderHandle)
return Indicator;
return QAccessibleWidgetEx::role(child);
return QAccessibleWidget::role(child);
}
QAccessible::State QAccessibleDial::state(int child) const
{
const State parentState = QAccessibleWidgetEx::state(0);
const State parentState = QAccessibleWidget::state(0);
if (child == SliderHandle)
return parentState | HotTracked;
return parentState;
}
QVariant QAccessibleDial::invokeMethodEx(Method, int, const QVariantList &)
QVariant QAccessibleDial::invokeMethod(Method, int, const QVariantList &)
{
return QVariant();
}

16
src/plugins/accessible/widgets/rangecontrols.h
View File

@ -58,7 +58,7 @@ class QDoubleSpinBox;
class QDial;
#ifndef QT_NO_SPINBOX
class QAccessibleAbstractSpinBox: public QAccessibleWidgetEx, public QAccessibleValueInterface
class QAccessibleAbstractSpinBox: public QAccessibleWidget, public QAccessibleValueInterface
{
Q_ACCESSIBLE_OBJECT
public:
@ -81,7 +81,7 @@ public:
bool doAction(int action, int child, const QVariantList &params);
QVariant invokeMethodEx(Method method, int child, const QVariantList &params);
QVariant invokeMethod(Method method, int child, const QVariantList &params);
// QAccessibleValueInterface
QVariant currentValue();
@ -106,7 +106,7 @@ protected:
QSpinBox *spinBox() const;
};
class QAccessibleDoubleSpinBox : public QAccessibleWidgetEx
class QAccessibleDoubleSpinBox : public QAccessibleWidget
{
public:
explicit QAccessibleDoubleSpinBox(QWidget *widget);
@ -121,7 +121,7 @@ public:
int childCount() const;
QRect rect(int child) const;
int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
QString text(Text t, int child) const;
Role role(int child) const;
State state(int child) const;
@ -131,13 +131,13 @@ protected:
};
#endif // QT_NO_SPINBOX
class QAccessibleAbstractSlider: public QAccessibleWidgetEx, public QAccessibleValueInterface
class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleValueInterface
{
Q_ACCESSIBLE_OBJECT
public:
explicit QAccessibleAbstractSlider(QWidget *w, Role r = Slider);
QVariant invokeMethodEx(Method method, int child, const QVariantList &params);
QVariant invokeMethod(Method method, int child, const QVariantList &params);
// QAccessibleValueInterface
QVariant currentValue();
@ -205,7 +205,7 @@ protected:
#endif // QT_NO_SLIDER
#ifndef QT_NO_DIAL
class QAccessibleDial : public QAccessibleWidgetEx
class QAccessibleDial : public QAccessibleWidget
{
public:
explicit QAccessibleDial(QWidget *w);
@ -221,7 +221,7 @@ public:
QString text(Text textType, int child) const;
Role role(int child) const;
State state(int child) const;
QVariant invokeMethodEx(Method method, int child, const QVariantList &params);
QVariant invokeMethod(Method method, int child, const QVariantList &params);
protected:
QDial *dial() const;

42
src/plugins/accessible/widgets/simplewidgets.cpp
View File

@ -85,10 +85,10 @@ QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::Bounda
/*!
Creates a QAccessibleButton object for \a w.
\a role is propagated to the QAccessibleWidgetEx constructor.
\a role is propagated to the QAccessibleWidget constructor.
*/
QAccessibleButton::QAccessibleButton(QWidget *w, Role role)
: QAccessibleWidgetEx(w, role)
: QAccessibleWidget(w, role)
{
Q_ASSERT(button());
if (button()->isCheckable())
@ -132,7 +132,7 @@ QString QAccessibleButton::actionText(int action, Text text, int child) const
}
break;
}
return QAccessibleWidgetEx::actionText(action, text, child);
return QAccessibleWidget::actionText(action, text, child);
}
/*! \reimp */
@ -155,7 +155,7 @@ bool QAccessibleButton::doAction(int action, int child, const QVariantList &para
}
return true;
}
return QAccessibleWidgetEx::doAction(action, child, params);
return QAccessibleWidget::doAction(action, child, params);
}
/*! \reimp */
@ -183,14 +183,14 @@ QString QAccessibleButton::text(Text t, int child) const
break;
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, child);
str = QAccessibleWidget::text(t, child);
return qt_accStripAmp(str);
}
/*! \reimp */
QAccessible::State QAccessibleButton::state(int child) const
{
State state = QAccessibleWidgetEx::state(child);
State state = QAccessibleWidget::state(child);
QAbstractButton *b = button();
QCheckBox *cb = qobject_cast<QCheckBox *>(b);
@ -307,7 +307,7 @@ QStringList QAccessibleButton::keyBindings(int actionIndex)
/*!
Creates a QAccessibleToolButton object for \a w.
\a role is propagated to the QAccessibleWidgetEx constructor.
\a role is propagated to the QAccessibleWidget constructor.
*/
QAccessibleToolButton::QAccessibleToolButton(QWidget *w, Role role)
: QAccessibleButton(w, role)
@ -497,10 +497,10 @@ bool QAccessibleToolButton::doAction(int action, int child, const QVariantList &
/*!
Constructs a QAccessibleDisplay object for \a w.
\a role is propagated to the QAccessibleWidgetEx constructor.
\a role is propagated to the QAccessibleWidget constructor.
*/
QAccessibleDisplay::QAccessibleDisplay(QWidget *w, Role role)
: QAccessibleWidgetEx(w, role)
: QAccessibleWidget(w, role)
{
}
@ -524,7 +524,7 @@ QAccessible::Role QAccessibleDisplay::role(int child) const
return ProgressBar;
#endif
}
return QAccessibleWidgetEx::role(child);
return QAccessibleWidget::role(child);
}
/*! \reimp */
@ -562,7 +562,7 @@ QString QAccessibleDisplay::text(Text t, int child) const
break;
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, child);;
str = QAccessibleWidget::text(t, child);;
return qt_accStripAmp(str);
}
@ -570,7 +570,7 @@ QString QAccessibleDisplay::text(Text t, int child) const
QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibleInterface *other,
int otherChild) const
{
Relation relation = QAccessibleWidgetEx::relationTo(child, other, otherChild);
Relation relation = QAccessibleWidget::relationTo(child, other, otherChild);
if (child || otherChild)
return relation;
@ -615,7 +615,7 @@ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterfa
if (*target)
return 0;
}
return QAccessibleWidgetEx::navigate(rel, entry, target);
return QAccessibleWidget::navigate(rel, entry, target);
}
/*! \internal */
@ -671,10 +671,10 @@ QRect QAccessibleDisplay::imagePosition(QAccessible2::CoordinateType coordType)
/*!
Constructs a QAccessibleLineEdit object for \a w.
\a name is propagated to the QAccessibleWidgetEx constructor.
\a name is propagated to the QAccessibleWidget constructor.
*/
QAccessibleLineEdit::QAccessibleLineEdit(QWidget *w, const QString &name)
: QAccessibleWidgetEx(w, EditableText, name), QAccessibleSimpleEditableTextInterface(this)
: QAccessibleWidget(w, EditableText, name), QAccessibleSimpleEditableTextInterface(this)
{
addControllingSignal(QLatin1String("textChanged(const QString&)"));
addControllingSignal(QLatin1String("returnPressed()"));
@ -699,7 +699,7 @@ QString QAccessibleLineEdit::text(Text t, int child) const
break;
}
if (str.isEmpty())
str = QAccessibleWidgetEx::text(t, child);;
str = QAccessibleWidget::text(t, child);;
return qt_accStripAmp(str);
}
@ -707,7 +707,7 @@ QString QAccessibleLineEdit::text(Text t, int child) const
void QAccessibleLineEdit::setText(Text t, int control, const QString &text)
{
if (t != Value || control) {
QAccessibleWidgetEx::setText(t, control, text);
QAccessibleWidget::setText(t, control, text);
return;
}
@ -723,7 +723,7 @@ void QAccessibleLineEdit::setText(Text t, int control, const QString &text)
/*! \reimp */
QAccessible::State QAccessibleLineEdit::state(int child) const
{
State state = QAccessibleWidgetEx::state(child);
State state = QAccessibleWidget::state(child);
QLineEdit *l = lineEdit();
if (l->isReadOnly())
@ -741,7 +741,7 @@ QAccessible::State QAccessibleLineEdit::state(int child) const
return state;
}
QVariant QAccessibleLineEdit::invokeMethodEx(QAccessible::Method method, int child,
QVariant QAccessibleLineEdit::invokeMethod(QAccessible::Method method, int child,
const QVariantList &params)
{
if (child)
@ -752,7 +752,7 @@ QVariant QAccessibleLineEdit::invokeMethodEx(QAccessible::Method method, int chi
QSet<QAccessible::Method> set;
set << ListSupportedMethods << SetCursorPosition << GetCursorPosition;
return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
QAccessibleWidget::invokeMethod(method, child, params)));
}
case SetCursorPosition:
setCursorPosition(params.value(0).toInt());
@ -760,7 +760,7 @@ QVariant QAccessibleLineEdit::invokeMethodEx(QAccessible::Method method, int chi
case GetCursorPosition:
return cursorPosition();
default:
return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
return QAccessibleWidget::invokeMethod(method, child, params);
}
}

8
src/plugins/accessible/widgets/simplewidgets.h
View File

@ -55,7 +55,7 @@ class QLineEdit;
class QToolButton;
class QProgressBar;
class QAccessibleButton : public QAccessibleWidgetEx, public QAccessibleActionInterface
class QAccessibleButton : public QAccessibleWidget, public QAccessibleActionInterface
{
Q_ACCESSIBLE_OBJECT
Q_DECLARE_TR_FUNCTIONS(QAccessibleButton)
@ -111,7 +111,7 @@ protected:
};
#endif // QT_NO_TOOLBUTTON
class QAccessibleDisplay : public QAccessibleWidgetEx, public QAccessibleImageInterface
class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface
{
Q_ACCESSIBLE_OBJECT
public:
@ -130,7 +130,7 @@ public:
};
#ifndef QT_NO_LINEEDIT
class QAccessibleLineEdit : public QAccessibleWidgetEx, public QAccessibleTextInterface,
class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInterface,
public QAccessibleSimpleEditableTextInterface
{
Q_ACCESSIBLE_OBJECT
@ -140,7 +140,7 @@ public:
QString text(Text t, int child) const;
void setText(Text t, int control, const QString &text);
State state(int child) const;
QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
// QAccessibleTextInterface
void addSelection(int startOffset, int endOffset);

14
src/widgets/accessible/qaccessible.cpp
View File

@ -1153,13 +1153,13 @@ QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > QAccessibleInterfa
*/
QVariant QAccessibleInterface::invokeMethod(Method method, int child, const QVariantList &params)
{
if (!(state(0) & HasInvokeExtension))
return QVariant();
return static_cast<QAccessibleInterfaceEx *>(this)->invokeMethodEx(method, child, params);
Q_UNUSED(method)
Q_UNUSED(child)
Q_UNUSED(params)
return QVariant();
}
QVariant QAccessibleInterfaceEx::virtual_hook(const QVariant &)
QVariant QAccessibleInterface::virtual_hook(const QVariant &)
{
return QVariant();
}
@ -1167,9 +1167,7 @@ QVariant QAccessibleInterfaceEx::virtual_hook(const QVariant &)
/*! \internal */
QAccessible2Interface *QAccessibleInterface::cast_helper(QAccessible2::InterfaceType t)
{
if (state(0) & HasInvokeExtension)
return static_cast<QAccessibleInterfaceEx *>(this)->interface_cast(t);
return 0;
return interface_cast(t);
}
QT_END_NAMESPACE

20
src/widgets/accessible/qaccessible.h
View File

@ -177,11 +177,8 @@ public:
//AlertHigh = 0x10000000, /* reused for HasInvokeExtension */
Protected = 0x20000000,
HasPopup = 0x40000000,
Modal = 0x80000000,
Modal = 0x80000000
// #### Qt5 ManagesDescendants
// #### Qt5 remove HasInvokeExtension
HasInvokeExtension = 0x10000000 // internal
};
Q_DECLARE_FLAGS(State, StateFlag)
@ -399,7 +396,7 @@ public:
virtual QString actionText(int action, Text t, int child) const = 0;
virtual bool doAction(int action, int child, const QVariantList &params = QVariantList()) = 0;
QVariant invokeMethod(Method method, int child = 0,
virtual QVariant invokeMethod(Method method, int child = 0,
const QVariantList &params = QVariantList());
inline QSet<Method> supportedMethods()
@ -432,19 +429,14 @@ public:
inline QAccessibleTable2Interface *table2Interface()
{ return reinterpret_cast<QAccessibleTable2Interface *>(cast_helper(QAccessible2::Table2Interface)); }
private:
QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
};
class Q_WIDGETS_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface
{
public:
virtual QVariant invokeMethodEx(Method method, int child, const QVariantList &params) = 0;
// FIXME
virtual QVariant virtual_hook(const QVariant &data);
virtual QAccessible2Interface *interface_cast(QAccessible2::InterfaceType)
{ return 0; }
};
private:
QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
};
class Q_WIDGETS_EXPORT QAccessibleEvent : public QEvent
{

23
src/widgets/accessible/qaccessibleobject.cpp
View File

@ -380,29 +380,6 @@ QString QAccessibleApplication::actionText(int action, Text text, int child) con
return QAccessibleObject::actionText(action, text, child);
}
// ### Qt 5: remove me - binary compatibility hack
QAccessibleObjectEx::QAccessibleObjectEx(QObject *object)
{
d = new QAccessibleObjectPrivate;
d->object = object;
}
bool QAccessibleObjectEx::isValid() const
{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::isValid(); }
QObject *QAccessibleObjectEx::object() const
{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::object(); }
QRect QAccessibleObjectEx::rect(int child) const
{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::rect(child); }
void QAccessibleObjectEx::setText(Text t, int child, const QString &text)
{ reinterpret_cast<QAccessibleObject *>(this)->QAccessibleObject::setText(t, child, text); }
int QAccessibleObjectEx::userActionCount(int child) const
{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::userActionCount(child); }
bool QAccessibleObjectEx::doAction(int action, int child, const QVariantList &params)
{ return reinterpret_cast<QAccessibleObject *>(this)->QAccessibleObject::doAction(action, child, params); }
QString QAccessibleObjectEx::actionText(int action, Text t, int child) const
{ return reinterpret_cast<const QAccessibleObject *>(this)->QAccessibleObject::actionText(action, t, child); }
QAccessibleObjectEx::~QAccessibleObjectEx()
{ delete d; }
QT_END_NAMESPACE
#endif //QT_NO_ACCESSIBILITY

26
src/widgets/accessible/qaccessibleobject.h
View File

@ -76,36 +76,10 @@ protected:
virtual ~QAccessibleObject();
private:
friend class QAccessibleObjectEx;
QAccessibleObjectPrivate *d;
Q_DISABLE_COPY(QAccessibleObject)
};
class Q_WIDGETS_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx
{
public:
explicit QAccessibleObjectEx(QObject *object);
bool isValid() const;
QObject *object() const;
// properties
QRect rect(int child) const;
void setText(Text t, int child, const QString &text);
// actions
int userActionCount(int child) const;
bool doAction(int action, int child, const QVariantList &params);
QString actionText(int action, Text t, int child) const;
protected:
virtual ~QAccessibleObjectEx();
private:
QAccessibleObjectPrivate *d;
Q_DISABLE_COPY(QAccessibleObjectEx)
};
class Q_WIDGETS_EXPORT QAccessibleApplication : public QAccessibleObject
{
public:

58
src/widgets/accessible/qaccessiblewidget.cpp
View File

@ -953,63 +953,7 @@ QAccessible::State QAccessibleWidget::state(int child) const
return state;
}
// ### Qt 5: remove me - binary compatibility hack
QAccessibleWidgetEx::QAccessibleWidgetEx(QWidget *o, Role role, const QString& name)
: QAccessibleObjectEx(o)
{
Q_ASSERT(widget());
d = new QAccessibleWidgetPrivate();
d->role = role;
d->name = name;
d->asking = 0;
}
int QAccessibleWidgetEx::childCount() const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::childCount(); }
int QAccessibleWidgetEx::indexOfChild(const QAccessibleInterface *child) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::indexOfChild(child); }
QAccessible::Relation QAccessibleWidgetEx::relationTo(int child, const QAccessibleInterface *other, int otherChild) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::relationTo(child, other, otherChild); }
int QAccessibleWidgetEx::childAt(int x, int y) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::childAt(x, y); }
QRect QAccessibleWidgetEx::rect(int child) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::rect(child); }
int QAccessibleWidgetEx::navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::navigate(rel, entry, target); }
QString QAccessibleWidgetEx::text(Text t, int child) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::text(t, child); }
QAccessible::Role QAccessibleWidgetEx::role(int child) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::role(child); }
QAccessible::State QAccessibleWidgetEx::state(int child) const
{ return (reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::state(child))
| HasInvokeExtension; }
QString QAccessibleWidgetEx::actionText(int action, Text t, int child) const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::actionText(action, t, child); }
bool QAccessibleWidgetEx::doAction(int action, int child, const QVariantList &params)
{ return reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::doAction(action, child, params); }
QAccessibleWidgetEx::~QAccessibleWidgetEx()
{ delete d; }
QWidget *QAccessibleWidgetEx::widget() const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::widget(); }
QObject *QAccessibleWidgetEx::parentObject() const
{ return reinterpret_cast<const QAccessibleWidget *>(this)->QAccessibleWidget::parentObject(); }
void QAccessibleWidgetEx::addControllingSignal(const QString &signal)
{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::addControllingSignal(signal); }
void QAccessibleWidgetEx::setValue(const QString &value)
{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setValue(value); }
void QAccessibleWidgetEx::setDescription(const QString &desc)
{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setDescription(desc); }
void QAccessibleWidgetEx::setHelp(const QString &help)
{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setHelp(help); }
void QAccessibleWidgetEx::setAccelerator(const QString &accel)
{ reinterpret_cast<QAccessibleWidget *>(this)->QAccessibleWidget::setAccelerator(accel); }
QVariant QAccessibleWidgetEx::invokeMethodEx(Method method, int child, const QVariantList & /*params*/)
QVariant QAccessibleWidget::invokeMethod(Method method, int child, const QVariantList & /*params*/)
{
if (child)
return QVariant();

40
src/widgets/accessible/qaccessiblewidget.h
View File

@ -77,6 +77,8 @@ public:
bool doAction(int action, int child, const QVariantList &params);
#endif
QVariant invokeMethod(Method method, int child, const QVariantList &params);
protected:
~QAccessibleWidget();
QWidget *widget() const;
@ -89,48 +91,10 @@ protected:
void setAccelerator(const QString &accel);
private:
friend class QAccessibleWidgetEx;
QAccessibleWidgetPrivate *d;
Q_DISABLE_COPY(QAccessibleWidget)
};
class Q_WIDGETS_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx
{
public:
explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString());
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const;
int childAt(int x, int y) const;
QRect rect(int child) const;
int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const;
QString text(Text t, int child) const;
Role role(int child) const;
State state(int child) const;
QString actionText(int action, Text t, int child) const;
bool doAction(int action, int child, const QVariantList &params);
QVariant invokeMethodEx(Method method, int child, const QVariantList &params);
protected:
~QAccessibleWidgetEx();
QWidget *widget() const;
QObject *parentObject() const;
void addControllingSignal(const QString &signal);
void setValue(const QString &value);
void setDescription(const QString &desc);
void setHelp(const QString &help);
void setAccelerator(const QString &accel);
private:
QAccessibleWidgetPrivate *d;
Q_DISABLE_COPY(QAccessibleWidgetEx)
};
#endif // QT_NO_ACCESSIBILITY