diff options
author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-16 06:56:48 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 13:32:59 +0200 |
commit | 87ae97c11ab9b298c0ce6701873b45fc3992b385 (patch) | |
tree | 8f30a95f054b8bf2346a98e072ba864a7a974da5 /src/widgets/accessible/qaccessiblewidget.h | |
parent | 8ebd7d84fcdaeba152bd9812b45d5c49b1e03a23 (diff) |
Refactor accessibility for Qt5
* Moved most stuff to gui\accessible
* Moved widget-specific stuff to widgets\accessible
* Moved platform-specific code to either the bridge plugin (this was already the case)
or to the platform plugin.
* Added several classes and functions. These have not yet gone through an API
review. The plan is to do that in a later commit.
Classes:
- QPlatformAccessibility
- QWindowsAccessibility
Functions:
- QWindow *QAccessibleInterface::window();
- QPlatformAccessibility *QPlatformIntegration::accessibility()
* The bridge code can now either be a plugin or integrated into the platform plugin
* Mac accessibility is left out for now. Unix "should still work" (tm). These platforms
should be fixed soon.
Change-Id: Ib49ffa73b647ee0af90864544c2769440157f562
Reviewed-on: http://codereview.qt-project.org/5330
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidget.h')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidget.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index acf900e84b..3c63d5d6a6 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -42,7 +42,7 @@ #ifndef QACCESSIBLEWIDGET_H #define QACCESSIBLEWIDGET_H -#include <QtWidgets/qaccessibleobject.h> +#include <QtGui/qaccessibleobject.h> QT_BEGIN_HEADER @@ -59,25 +59,26 @@ class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject public: explicit QAccessibleWidget(QWidget *o, Role r = Client, const QString& name = QString()); + QWindow *window() const; 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; + QRect rect(int child = 0) const; QAccessibleInterface *parent() const; QAccessibleInterface *child(int index) 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 text(Text t, int child = 0) const; + Role role(int child = 0) const; + State state(int child = 0) const; #ifndef QT_NO_ACTION - int userActionCount(int child) const; - QString actionText(int action, Text t, int child) const; - bool doAction(int action, int child, const QVariantList ¶ms); + int userActionCount(int child = 0) const; + QString actionText(int action, Text t, int child = 0) const; + bool doAction(int action, int child = 0, const QVariantList ¶ms = QVariantList()); #endif QVariant invokeMethod(Method method, int child, const QVariantList ¶ms); |