whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use meta object to get string rep of QAccessible::Role. 

Change-Id: I69320b69ea13ebc594575277e39d30a066df61fd
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
bb10
Frederik Gladhorn 2011-12-09 11:06:28 +01:00 committed by Qt by Nokia
parent 82f9ad6295
commit 9ea608cb54
3 changed files with 23 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/accessible/qaccessible.cpp
View File

@ -50,10 +50,8 @@
#include <private/qguiapplication_p.h>
#include "qplatformaccessibility_qpa.h"
#include <QtCore/QDebug>
#include <QtCore/QHash>
#include <QtCore/QMetaObject>
#include <QtCore/QMutex>
#include <QtCore/qdebug.h>
#include <QtCore/qmetaobject.h>
#include <private/qfactoryloader_p.h>
QT_BEGIN_NAMESPACE
@ -1209,6 +1207,22 @@ QVariant QAccessibleInterface::virtual_hook(const QVariant &)
return QVariant();
}
/*! \internal */
const char *qAccessibleRoleString(QAccessible::Role role)
{
if (role >=0x40)
role = QAccessible::UserRole;
static int roleEnum = QAccessible::staticMetaObject.indexOfEnumerator("Role");
return QAccessible::staticMetaObject.enumerator(roleEnum).valueToKey(role);
}
/*! \internal */
const char *qAccessibleEventString(QAccessible::Event event)
{
static int eventEnum = QAccessible::staticMetaObject.indexOfEnumerator("Event");
return QAccessible::staticMetaObject.enumerator(eventEnum).valueToKey(event);
}
#ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleInterface *iface)
{
@ -1220,7 +1234,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleInterface *iface)
d << "QAccessibleInterface(" << hex << (void *) iface << dec;
if (iface->isValid()) {
d << " name=" << iface->text(QAccessible::Name) << " ";
d << "role=" << iface->role() << " ";
d << "role=" << qAccessibleRoleString(iface->role()) << " ";
if (iface->childCount())
d << "childc=" << iface->childCount() << " ";
if (iface->object()) {

3
src/gui/accessible/qaccessible.h
View File

@ -439,6 +439,9 @@ inline QAccessibleEvent::QAccessibleEvent(Type atype)
#define QAccessibleInterface_iid "com.trolltech.Qt.QAccessibleInterface"
Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid)
Q_GUI_EXPORT const char *qAccessibleRoleString(QAccessible::Role role);
Q_GUI_EXPORT const char *qAccessibleEventString(QAccessible::Event event);
#ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleInterface *iface);
#endif

77
src/plugins/platforms/windows/qwindowsaccessibility.cpp
View File

@ -92,81 +92,6 @@ QT_BEGIN_INCLUDE_NAMESPACE
#include <qdebug.h>
QT_END_INCLUDE_NAMESPACE
static const char *roleString(QAccessible::Role role)
{
static const char *roles[] = {
"NoRole" /* = 0x00000000 */,
"TitleBar" /* = 0x00000001 */,
"MenuBar" /* = 0x00000002 */,
"ScrollBar" /* = 0x00000003 */,
"Grip" /* = 0x00000004 */,
"Sound" /* = 0x00000005 */,
"Cursor" /* = 0x00000006 */,
"Caret" /* = 0x00000007 */,
"AlertMessage" /* = 0x00000008 */,
"Window" /* = 0x00000009 */,
"Client" /* = 0x0000000A */,
"PopupMenu" /* = 0x0000000B */,
"MenuItem" /* = 0x0000000C */,
"ToolTip" /* = 0x0000000D */,
"Application" /* = 0x0000000E */,
"Document" /* = 0x0000000F */,
"Pane" /* = 0x00000010 */,
"Chart" /* = 0x00000011 */,
"Dialog" /* = 0x00000012 */,
"Border" /* = 0x00000013 */,
"Grouping" /* = 0x00000014 */,
"Separator" /* = 0x00000015 */,
"ToolBar" /* = 0x00000016 */,
"StatusBar" /* = 0x00000017 */,
"Table" /* = 0x00000018 */,
"ColumnHeader" /* = 0x00000019 */,
"RowHeader" /* = 0x0000001A */,
"Column" /* = 0x0000001B */,
"Row" /* = 0x0000001C */,
"Cell" /* = 0x0000001D */,
"Link" /* = 0x0000001E */,
"HelpBalloon" /* = 0x0000001F */,
"Assistant" /* = 0x00000020 */,
"List" /* = 0x00000021 */,
"ListItem" /* = 0x00000022 */,
"Tree" /* = 0x00000023 */,
"TreeItem" /* = 0x00000024 */,
"PageTab" /* = 0x00000025 */,
"PropertyPage" /* = 0x00000026 */,
"Indicator" /* = 0x00000027 */,
"Graphic" /* = 0x00000028 */,
"StaticText" /* = 0x00000029 */,
"EditableText" /* = 0x0000002A */, // Editable, selectable, etc.
"PushButton" /* = 0x0000002B */,
"CheckBox" /* = 0x0000002C */,
"RadioButton" /* = 0x0000002D */,
"ComboBox" /* = 0x0000002E */,
"DropList" /* = 0x0000002F */, // commented out
"ProgressBar" /* = 0x00000030 */,
"Dial" /* = 0x00000031 */,
"HotkeyField" /* = 0x00000032 */,
"Slider" /* = 0x00000033 */,
"SpinBox" /* = 0x00000034 */,
"Canvas" /* = 0x00000035 */,
"Animation" /* = 0x00000036 */,
"Equation" /* = 0x00000037 */,
"ButtonDropDown" /* = 0x00000038 */,
"ButtonMenu" /* = 0x00000039 */,
"ButtonDropGrid" /* = 0x0000003A */,
"Whitespace" /* = 0x0000003B */,
"PageTabList" /* = 0x0000003C */,
"Clock" /* = 0x0000003D */,
"Splitter" /* = 0x0000003E */,
"LayeredPane" /* = 0x0000003F */,
"UserRole" /* = 0x0000ffff*/
};
if (role >=0x40)
role = QAccessible::UserRole;
return roles[int(role)];
}
static const char *eventString(QAccessible::Event ev)
{
static const char *events[] = {
@ -269,7 +194,7 @@ static const char *eventString(QAccessible::Event ev)
void showDebug(const char* funcName, const QAccessibleInterface *iface)
{
qDebug() << "Role:" << roleString(iface->role(0))
qDebug() << "Role:" << qAccessibleRoleString(iface->role(0))
<< "Name:" << iface->text(QAccessible::Name, 0)
<< "State:" << QString::number(int(iface->state(0)), 16)
<< QLatin1String(funcName);