From b449791c3565940e701c68b3f705014804af0c2b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 24 Jul 2013 17:20:15 +0200 Subject: Make Accessibility public MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no point in having QAccessible2, so merge it with the normal QAccessible. The header will be removed in a subsequent commit as it is still needed by declarative at this point in time. Change-Id: I1fc47d484d482f25387eba827bc5a373536b7a8b Reviewed-by: Jan Arve Sæther --- src/widgets/accessible/accessible.pri | 2 +- src/widgets/accessible/qaccessiblewidget.cpp | 4 +- src/widgets/accessible/qaccessiblewidget.h | 101 ++++++++++++++++++++++++++ src/widgets/accessible/qaccessiblewidget_p.h | 102 --------------------------- 4 files changed, 104 insertions(+), 105 deletions(-) create mode 100644 src/widgets/accessible/qaccessiblewidget.h delete mode 100644 src/widgets/accessible/qaccessiblewidget_p.h (limited to 'src/widgets/accessible') diff --git a/src/widgets/accessible/accessible.pri b/src/widgets/accessible/accessible.pri index 84d366e78a..9fb2f18950 100644 --- a/src/widgets/accessible/accessible.pri +++ b/src/widgets/accessible/accessible.pri @@ -1,6 +1,6 @@ # Qt accessibility module contains(QT_CONFIG, accessibility) { - HEADERS += accessible/qaccessiblewidget_p.h + HEADERS += accessible/qaccessiblewidget.h SOURCES += accessible/qaccessiblewidget.cpp } diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index dcbf276356..7b32cae54f 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qaccessiblewidget_p.h" +#include "qaccessiblewidget.h" #ifndef QT_NO_ACCESSIBILITY @@ -169,7 +169,6 @@ public: /*! \class QAccessibleWidget \brief The QAccessibleWidget class implements the QAccessibleInterface for QWidgets. - \internal \ingroup accessibility \inmodule QtWidgets @@ -204,6 +203,7 @@ QAccessibleWidget::QAccessibleWidget(QWidget *w, QAccessible::Role role, const Q d->name = name; } +/*! \reimp */ bool QAccessibleWidget::isValid() const { if (!object() || static_cast(object())->d_func()->data.in_destructor) diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h new file mode 100644 index 0000000000..5e983eee56 --- /dev/null +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -0,0 +1,101 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtWidgets module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QACCESSIBLEWIDGET_H +#define QACCESSIBLEWIDGET_H + +#include + +QT_BEGIN_NAMESPACE + + +#ifndef QT_NO_ACCESSIBILITY + +class QAccessibleWidgetPrivate; + +class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject, public QAccessibleActionInterface +{ +public: + explicit QAccessibleWidget(QWidget *o, QAccessible::Role r = QAccessible::Client, const QString& name = QString()); + bool isValid() const; + + QWindow *window() const; + int childCount() const; + int indexOfChild(const QAccessibleInterface *child) const; + QVector > relations(QAccessible::Relation match = QAccessible::AllRelations) const; + QAccessibleInterface *focusChild() const; + + QRect rect() const; + + QAccessibleInterface *parent() const; + QAccessibleInterface *child(int index) const; + + QString text(QAccessible::Text t) const; + QAccessible::Role role() const; + QAccessible::State state() const; + + QColor foregroundColor() const; + QColor backgroundColor() const; + + void *interface_cast(QAccessible::InterfaceType t); + + // QAccessibleActionInterface + QStringList actionNames() const; + void doAction(const QString &actionName); + QStringList keyBindingsForAction(const QString &actionName) const; +protected: + ~QAccessibleWidget(); + QWidget *widget() const; + QObject *parentObject() const; + + void addControllingSignal(const QString &signal); + +private: + QAccessibleWidgetPrivate *d; + Q_DISABLE_COPY(QAccessibleWidget) +}; + + +#endif // QT_NO_ACCESSIBILITY + +QT_END_NAMESPACE + +#endif // QACCESSIBLEWIDGET_H diff --git a/src/widgets/accessible/qaccessiblewidget_p.h b/src/widgets/accessible/qaccessiblewidget_p.h deleted file mode 100644 index cb1ce37734..0000000000 --- a/src/widgets/accessible/qaccessiblewidget_p.h +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, 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, Digia gives you certain additional -** rights. These rights are described in the Digia 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QACCESSIBLEWIDGET_H -#define QACCESSIBLEWIDGET_H - -#include -#include - -QT_BEGIN_NAMESPACE - - -#ifndef QT_NO_ACCESSIBILITY - -class QAccessibleWidgetPrivate; - -class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject, public QAccessibleActionInterface -{ -public: - explicit QAccessibleWidget(QWidget *o, QAccessible::Role r = QAccessible::Client, const QString& name = QString()); - bool isValid() const; - - QWindow *window() const; - int childCount() const; - int indexOfChild(const QAccessibleInterface *child) const; - QVector > relations(QAccessible::Relation match = QAccessible::AllRelations) const; - QAccessibleInterface *focusChild() const; - - QRect rect() const; - - QAccessibleInterface *parent() const; - QAccessibleInterface *child(int index) const; - - QString text(QAccessible::Text t) const; - QAccessible::Role role() const; - QAccessible::State state() const; - - QColor foregroundColor() const; - QColor backgroundColor() const; - - void *interface_cast(QAccessible::InterfaceType t); - - // QAccessibleActionInterface - QStringList actionNames() const; - void doAction(const QString &actionName); - QStringList keyBindingsForAction(const QString &actionName) const; -protected: - ~QAccessibleWidget(); - QWidget *widget() const; - QObject *parentObject() const; - - void addControllingSignal(const QString &signal); - -private: - QAccessibleWidgetPrivate *d; - Q_DISABLE_COPY(QAccessibleWidget) -}; - - -#endif // QT_NO_ACCESSIBILITY - -QT_END_NAMESPACE - -#endif // QACCESSIBLEWIDGET_H -- cgit v1.2.3