diff options
Diffstat (limited to 'src/gui/accessible/qaccessible.cpp')
-rw-r--r-- | src/gui/accessible/qaccessible.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index f85b6d1aad..858c2e1b9c 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -454,14 +454,13 @@ QT_BEGIN_NAMESPACE Synonym for unsigned, used by the QAccessibleInterface cache. */ +#ifndef QT_NO_ACCESSIBILITY /* accessible widgets plugin discovery stuff */ -#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QAccessibleFactoryInterface_iid, QLatin1String("/accessible"))) #endif -#endif // FIXME turn this into one global static struct Q_GLOBAL_STATIC(QList<QAccessible::InterfaceFactory>, qAccessibleFactories) @@ -474,13 +473,11 @@ QAccessible::RootObjectHandler QAccessible::rootObjectHandler = 0; static bool cleanupAdded = false; -#ifndef QT_NO_ACCESSIBILITY static QPlatformAccessibility *platformAccessibility() { QPlatformIntegration *pfIntegration = QGuiApplicationPrivate::platformIntegration(); return pfIntegration ? pfIntegration->accessibility() : 0; } -#endif /*! \fn QAccessible::QAccessible() @@ -496,10 +493,8 @@ static QPlatformAccessibility *platformAccessibility() */ void QAccessible::cleanup() { -#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->cleanup(); -#endif } static void qAccessibleCleanup() @@ -683,7 +678,6 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) return iface; } } -#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_LIBRARY // Find a QAccessiblePlugin (factory) for the class name. If there's // no entry in the cache try to create it using the plugin loader. @@ -707,18 +701,15 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object) return result; } #endif -#endif mo = mo->superClass(); } -#ifndef QT_NO_ACCESSIBILITY if (object == qApp) { QAccessibleInterface *appInterface = new QAccessibleApplication; QAccessibleCache::instance()->insert(object, appInterface); Q_ASSERT(QAccessibleCache::instance()->objectToId.contains(qApp)); return appInterface; } -#endif return 0; } @@ -788,10 +779,8 @@ QAccessibleInterface *QAccessible::accessibleInterface(Id id) */ bool QAccessible::isActive() { -#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) return pfAccessibility->isActive(); -#endif return false; } @@ -826,10 +815,8 @@ void QAccessible::setRootObject(QObject *object) return; } -#ifndef QT_NO_ACCESSIBILITY if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->setRootObject(object); -#endif } /*! @@ -862,7 +849,6 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event) if (!isActive() || !event->accessibleInterface()) return; -#ifndef QT_NO_ACCESSIBILITY if (event->type() == QAccessible::TableModelChanged) { QAccessibleInterface *iface = event->accessibleInterface(); if (iface && iface->tableInterface()) @@ -876,7 +862,6 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event) if (QPlatformAccessibility *pfAccessibility = platformAccessibility()) pfAccessibility->notifyAccessibilityUpdate(event); -#endif } #if QT_DEPRECATED_SINCE(5, 0) @@ -1823,7 +1808,7 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev) d.nospace() << ")"; return d.space(); } - +#endif // QT_NO_DEBUGSTREAM /*! \class QAccessibleTextInterface @@ -2724,8 +2709,7 @@ QString qAccessibleLocalizedActionDescription(const QString &actionName) return accessibleActionStrings()->localizedDescription(actionName); } - -#endif +#endif // QT_NO_ACCESSIBILITY QT_END_NAMESPACE |