From 32fc701e914cd7b4c90a9674ea86d0ca6b53e170 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 7 Feb 2014 17:19:24 +0100 Subject: [PATCH 02/12] Revert "NoInterface is the same as InvalidInterface, remove the later" This broke caching of interfaces resulting in no properties. This reverts commit 2d2c968b5058edae3a0e3c9f29145702111ae990. --- src/qaccessibilityclient/accessibleobject.h | 4 +++- src/qaccessibilityclient/cachestrategy_p.h | 4 ++-- src/qaccessibilityclient/registry_p.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qaccessibilityclient/accessibleobject.h b/src/qaccessibilityclient/accessibleobject.h index 7a13b8a..c4913fc 100644 --- a/src/qaccessibilityclient/accessibleobject.h +++ b/src/qaccessibilityclient/accessibleobject.h @@ -86,7 +86,9 @@ public: ValueInterface = 0x20000, SocketInterface = 0x40000, EventWindowInterface = 0x80000, - EventFocusInterface = 0x100000 + EventFocusInterface = 0x100000, + + InvalidInterface = 0x80000000 }; Q_DECLARE_FLAGS(Interfaces, Interface) diff --git a/src/qaccessibilityclient/cachestrategy_p.h b/src/qaccessibilityclient/cachestrategy_p.h index 1c339c5..33ba9ab 100644 --- a/src/qaccessibilityclient/cachestrategy_p.h +++ b/src/qaccessibilityclient/cachestrategy_p.h @@ -65,7 +65,7 @@ public: virtual AccessibleObject::Interfaces interfaces(const AccessibleObject &object) { if (!interfaceHash.contains(object.d.data())) - return AccessibleObject::NoInterface; + return AccessibleObject::InvalidInterface; return interfaceHash.value(object.d.data()); } void setInterfaces(const AccessibleObject &object, AccessibleObject::Interfaces interfaces) @@ -106,7 +106,7 @@ public: virtual AccessibleObject::Interfaces interfaces(const AccessibleObject &object) { if (!interfaceHash.contains(object.d.data())) - return AccessibleObject::NoInterface; + return AccessibleObject::InvalidInterface; return interfaceHash.value(object.d.data()); } void setInterfaces(const AccessibleObject &object, AccessibleObject::Interfaces interfaces) diff --git a/src/qaccessibilityclient/registry_p.cpp b/src/qaccessibilityclient/registry_p.cpp index 6ea9c58..45e0834 100644 --- a/src/qaccessibilityclient/registry_p.cpp +++ b/src/qaccessibilityclient/registry_p.cpp @@ -835,7 +835,7 @@ AccessibleObject::Interfaces RegistryPrivate::supportedInterfaces(const Accessib { if (m_cache) { AccessibleObject::Interfaces interfaces = m_cache->interfaces(object); - if (!(interfaces & AccessibleObject::NoInterface)) + if (!(interfaces & AccessibleObject::InvalidInterface)) return interfaces; } -- 2.9.4