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/qaccessibleobject.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/qaccessibleobject.h')
-rw-r--r-- | src/widgets/accessible/qaccessibleobject.h | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/src/widgets/accessible/qaccessibleobject.h b/src/widgets/accessible/qaccessibleobject.h deleted file mode 100644 index 7d31b6e628..0000000000 --- a/src/widgets/accessible/qaccessibleobject.h +++ /dev/null @@ -1,116 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QACCESSIBLEOBJECT_H -#define QACCESSIBLEOBJECT_H - -#include <QtWidgets/qaccessible.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_ACCESSIBILITY - -class QAccessibleObjectPrivate; -class QObject; - -class Q_WIDGETS_EXPORT QAccessibleObject : public QAccessibleInterface -{ -public: - explicit QAccessibleObject(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 ¶ms); - QString actionText(int action, Text t, int child) const; - -protected: - virtual ~QAccessibleObject(); - -private: - QAccessibleObjectPrivate *d; - Q_DISABLE_COPY(QAccessibleObject) -}; - -class Q_WIDGETS_EXPORT QAccessibleApplication : public QAccessibleObject -{ -public: - QAccessibleApplication(); - - // relations - int childCount() const; - int indexOfChild(const QAccessibleInterface*) const; - Relation relationTo(int, const QAccessibleInterface *, int) const; - - // navigation - QAccessibleInterface *parent() const; - int childAt(int x, int y) const; - QAccessibleInterface *child(int index) const; - int navigate(RelationFlag, int, QAccessibleInterface **) const; - - // properties and state - QString text(Text t, int child) const; - Role role(int child) const; - State state(int child) const; - - // actions - int userActionCount(int child) const; - bool doAction(int action, int child, const QVariantList ¶ms); - QString actionText(int action, Text t, int child) const; -}; - -#endif // QT_NO_ACCESSIBILITY - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QACCESSIBLEOBJECT_H |