Git commit 32fc701e914cd7b4c90a9674ea86d0ca6b53e170 by Frederik Gladhorn. Committed on 07/02/2014 at 16:19. Pushed by gladhorn into branch 'master'. Revert "NoInterface is the same as InvalidInterface, remove the later" This broke caching of interfaces resulting in no properties. This reverts commit 2d2c968b5058edae3a0e3c9f29145702111ae990. M +3 -1 src/qaccessibilityclient/accessibleobject.h M +2 -2 src/qaccessibilityclient/cachestrategy_p.h M +1 -1 src/qaccessibilityclient/registry_p.cpp http://commits.kde.org/libkdeaccessibilityclient/32fc701e914cd7b4c90a9674ea= 86d0ca6b53e170 diff --git a/src/qaccessibilityclient/accessibleobject.h b/src/qaccessibili= tyclient/accessibleobject.h index 7a13b8a..c4913fc 100644 --- a/src/qaccessibilityclient/accessibleobject.h +++ b/src/qaccessibilityclient/accessibleobject.h @@ -86,7 +86,9 @@ public: ValueInterface =3D 0x20000, SocketInterface =3D 0x40000, EventWindowInterface =3D 0x80000, - EventFocusInterface =3D 0x100000 + EventFocusInterface =3D 0x100000, + + InvalidInterface =3D 0x80000000 }; Q_DECLARE_FLAGS(Interfaces, Interface) = diff --git a/src/qaccessibilityclient/cachestrategy_p.h b/src/qaccessibilit= yclient/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::I= nterfaces 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::I= nterfaces interfaces) diff --git a/src/qaccessibilityclient/registry_p.cpp b/src/qaccessibilitycl= ient/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::supported= Interfaces(const Accessib { if (m_cache) { AccessibleObject::Interfaces interfaces =3D m_cache->interfaces(ob= ject); - if (!(interfaces & AccessibleObject::NoInterface)) + if (!(interfaces & AccessibleObject::InvalidInterface)) return interfaces; } =