From 99d5decbcfbce35b6d20f816a07c5ed1625aadae Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Thu, 23 Feb 2012 23:09:06 +0100 Subject: Make accessible interfaces private for Qt 5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we're not yet confident if they serve their purpose well enough, we have decided to make them internal so that we are free to tune them later Change-Id: Id79d154e0537aca07303afea5d057cfcb0773384 Reviewed-by: Morten Johan Sørvig --- src/gui/accessible/qaccessible.cpp | 4 ++++ src/gui/accessible/qaccessible2.cpp | 8 ++++++++ src/gui/accessible/qaccessiblebridge.cpp | 2 ++ src/gui/accessible/qaccessibleobject.cpp | 1 + src/gui/accessible/qaccessibleplugin.cpp | 1 + src/gui/kernel/qwindow.cpp | 2 +- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 3f1295ab5e..37e7a1dbb4 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE \class QAccessible \brief The QAccessible class provides enums and static functions related to accessibility. + \internal \ingroup accessibility \inmodule QtWidgets @@ -692,6 +693,7 @@ void QAccessible::updateAccessibility(const QAccessibleEvent &event) \class QAccessibleEvent \brief The QAccessibleEvent is use to notify about changes that are relevant for accessibility in the application. + \internal \ingroup accessibility \inmodule QtGui @@ -727,6 +729,7 @@ QAccessibleInterface *QAccessibleEvent::accessibleInterface() const \class QAccessibleInterface \brief The QAccessibleInterface class defines an interface that exposes information about accessible objects. + \internal \ingroup accessibility \inmodule QtGui @@ -1172,6 +1175,7 @@ const char *qAccessibleEventString(QAccessible::Event event) return QAccessible::staticMetaObject.enumerator(eventEnum).valueToKey(event); } +/*! \internal */ bool operator==(const QAccessible::State &first, const QAccessible::State &second) { return memcmp(&first, &second, sizeof(QAccessible::State)) == 0; diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp index 0f854c6158..db3028b371 100644 --- a/src/gui/accessible/qaccessible2.cpp +++ b/src/gui/accessible/qaccessible2.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE /*! \namespace QAccessible2 \ingroup accessibility + \internal \brief The QAccessible2 namespace defines constants relating to IAccessible2-based interfaces @@ -60,6 +61,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleTextInterface + \internal \ingroup accessibility @@ -180,6 +182,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleEditableTextInterface \ingroup accessibility + \internal \brief The QAccessibleEditableTextInterface class implements support for objects with editable text. @@ -247,6 +250,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleSimpleEditableTextInterface \ingroup accessibility + \internal \brief The QAccessibleSimpleEditableTextInterface class is a convenience class for text-based widgets. It can be inherited instead of \l QAccessibleEditableTextInterface. @@ -259,6 +263,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleValueInterface \ingroup accessibility + \internal \brief The QAccessibleValueInterface class implements support for objects that manipulate a value. @@ -323,6 +328,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleTableCellInterface \ingroup accessibility + \internal \brief The QAccessibleTableCellInterface class implements support for the IAccessibleTable2 Cell interface. @@ -333,6 +339,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleTableInterface \ingroup accessibility + \internal \brief The QAccessibleTableInterface class implements support for the IAccessibleTable2 interface. @@ -344,6 +351,7 @@ QT_BEGIN_NAMESPACE /*! \class QAccessibleActionInterface \ingroup accessibility + \internal \brief The QAccessibleActionInterface class implements support for invocable actions in the interface. diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp index 8fcf0474a1..d6d0796701 100644 --- a/src/gui/accessible/qaccessiblebridge.cpp +++ b/src/gui/accessible/qaccessiblebridge.cpp @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE \class QAccessibleBridge \brief The QAccessibleBridge class is the base class for accessibility back-ends. + \internal \ingroup accessibility \inmodule QtWidgets @@ -100,6 +101,7 @@ QT_BEGIN_NAMESPACE \class QAccessibleBridgePlugin \brief The QAccessibleBridgePlugin class provides an abstract base for accessibility bridge plugins. + \internal \ingroup plugins \ingroup accessibility diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp index d277f39c43..e587ad077c 100644 --- a/src/gui/accessible/qaccessibleobject.cpp +++ b/src/gui/accessible/qaccessibleobject.cpp @@ -92,6 +92,7 @@ QList QAccessibleObjectPrivate::actionList() const \class QAccessibleObject \brief The QAccessibleObject class implements parts of the QAccessibleInterface for QObjects. + \internal \ingroup accessibility \inmodule QtWidgets diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp index 8823d63b79..c2fe9c7a7a 100644 --- a/src/gui/accessible/qaccessibleplugin.cpp +++ b/src/gui/accessible/qaccessibleplugin.cpp @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE \class QAccessiblePlugin \brief The QAccessiblePlugin class provides an abstract base for accessibility plugins. + \internal \ingroup plugins \ingroup accessibility diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 77731f776b..04c2617838 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1192,7 +1192,7 @@ void QWindow::screenDestroyed(QObject *object) /*! Returns the accessibility interface for the object that the window represents - \preliminary + \internal \sa QAccessible */ QAccessibleInterface *QWindow::accessibleRoot() const -- cgit v1.2.3