diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-09 12:52:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-15 18:03:30 +0200 |
| commit | f53f7095044275767e389d16aabad5ff7144ec9f (patch) | |
| tree | aae3ceac5dde1140c4bdf42cf2153126c9c34232 /src/widgets | |
| parent | 6dbe45c96a6b807cfc19c34cf2833504148d019f (diff) | |
Replace QT_NO_ACCESSIBILITY with QT_CONFIG(accessibility)
Pick-to: 6.4
Change-Id: Iee4bd8970810be1b23bdba65a74de912401dca65
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/widgets')
56 files changed, 143 insertions, 143 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 406d70ae09..6a3dedc162 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -36,7 +36,7 @@ #endif #include <QDebug> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE @@ -508,4 +508,4 @@ QAccessibleScrollArea::QAccessibleScrollArea(QWidget *widget) QT_END_NAMESPACE -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index aa97dbf0a8..65d995d933 100644 --- a/src/widgets/accessible/complexwidgets_p.h +++ b/src/widgets/accessible/complexwidgets_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) class QAbstractButton; class QHeaderView; @@ -113,7 +113,7 @@ protected: }; #endif // QT_CONFIG(combobox) -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp index df08c3af1e..6da2461a6a 100644 --- a/src/widgets/accessible/itemviews.cpp +++ b/src/widgets/accessible/itemviews.cpp @@ -16,7 +16,7 @@ #endif #include <private/qwidget_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE @@ -1235,4 +1235,4 @@ QHeaderView *QAccessibleTableHeaderCell::headerView() const QT_END_NAMESPACE -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h index de440bbc42..ef38b87c53 100644 --- a/src/widgets/accessible/itemviews_p.h +++ b/src/widgets/accessible/itemviews_p.h @@ -26,7 +26,7 @@ QT_REQUIRE_CONFIG(itemviews); QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) class QAccessibleTableCell; class QAccessibleTableHeaderCell; @@ -264,7 +264,7 @@ private: }; -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp index 0ce9a281d4..c193d60f10 100644 --- a/src/widgets/accessible/qaccessiblemenu.cpp +++ b/src/widgets/accessible/qaccessiblemenu.cpp @@ -12,7 +12,7 @@ #include <qstyle.h> #include <private/qwidget_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE @@ -357,5 +357,5 @@ QWidget *QAccessibleMenuItem::owner() const QT_END_NAMESPACE -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) diff --git a/src/widgets/accessible/qaccessiblemenu_p.h b/src/widgets/accessible/qaccessiblemenu_p.h index cd4c3819b3..8eb9a37e2d 100644 --- a/src/widgets/accessible/qaccessiblemenu_p.h +++ b/src/widgets/accessible/qaccessiblemenu_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #if QT_CONFIG(menu) class QMenu; @@ -103,5 +103,5 @@ private: #endif // QT_CONFIG(menu) QT_END_NAMESPACE -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) #endif // QACCESSIBLEMENU_H diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 88d053965b..01bdfc1ea2 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -3,7 +3,7 @@ #include "qaccessiblewidget.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qapplication.h" #if QT_CONFIG(groupbox) @@ -498,4 +498,4 @@ void *QAccessibleWidget::interface_cast(QAccessible::InterfaceType t) QT_END_NAMESPACE -#endif //QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index bba4f54e58..c237e25d4a 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) class QAccessibleWidgetPrivate; @@ -58,7 +58,7 @@ private: }; -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index e1ec02f750..c0a025e048 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -20,7 +20,7 @@ #include <qvariant.h> #include <qaccessible.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE @@ -199,4 +199,4 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje QT_END_NAMESPACE -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index 7ba42989c2..312204e8db 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -56,7 +56,7 @@ #include <QMenu> #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE @@ -1118,4 +1118,4 @@ QMainWindow *QAccessibleMainWindow::mainWindow() const QT_END_NAMESPACE -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 9d4ee4ea62..69bd84ea23 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -18,7 +18,7 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qaccessiblewidget.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtCore/QPointer> #include <QtCore/QPair> @@ -283,7 +283,7 @@ public: }; #endif // QT_CONFIG(mainwindow) -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 51c9bb9448..b172c10044 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #if QT_CONFIG(spinbox) QAccessibleAbstractSpinBox::QAccessibleAbstractSpinBox(QWidget *w) @@ -393,6 +393,6 @@ QDial *QAccessibleDial::dial() const } #endif // QT_CONFIG(dial) -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index 0e7ca5720a..162cbbdb34 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) class QAbstractSpinBox; class QAbstractSlider; @@ -163,7 +163,7 @@ protected: }; #endif // QT_CONFIG(dial) -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index f60678ce34..f149bad170 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) extern QList<QWidget*> childWidgets(const QWidget *widget); @@ -951,6 +951,6 @@ QWindowContainer *QAccessibleWindowContainer::container() const return static_cast<QWindowContainer *>(widget()); } -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 3810f47339..3d0a76c078 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) class QAbstractButton; class QLineEdit; @@ -189,7 +189,7 @@ private: QWindowContainer *container() const; }; -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 01bb83da00..4384df0e7f 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -34,7 +34,7 @@ #include <qpa/qplatformtheme.h> #include "private/qdialog_p.h" #include "private/qguiapplication_p.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -812,7 +812,7 @@ void QDialog::setVisible(bool visible) } } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::DialogStart); QAccessible::updateAccessibility(&event); #endif @@ -821,7 +821,7 @@ void QDialog::setVisible(bool visible) if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden)) return; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (isVisible()) { QAccessibleEvent event(this, QAccessible::DialogEnd); QAccessible::updateAccessibility(&event); diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 5c4ddfd4ce..e9682440c6 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1564,7 +1564,7 @@ void QMessageBox::showEvent(QShowEvent *e) d->detectEscapeButton(); d->updateSize(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::Alert); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index ca139c960f..57139cce61 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -30,7 +30,7 @@ #include <private/qapplication_p.h> #include <private/qguiapplication_p.h> #include <private/qscrollbar_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif #if QT_CONFIG(gestures) && QT_CONFIG(scroller) @@ -1131,7 +1131,7 @@ void QAbstractItemView::reset() setRootIndex(QModelIndex()); if (d->selectionModel) d->selectionModel->reset(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(this, QAccessibleTableModelChangeEvent::ModelReset); QAccessible::updateAccessibility(&accessibleEvent); @@ -3398,7 +3398,7 @@ void QAbstractItemView::dataChanged(const QModelIndex &topLeft, const QModelInde } } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(this, QAccessibleTableModelChangeEvent::DataChanged); accessibleEvent.setFirstRow(topLeft.row()); @@ -3526,7 +3526,7 @@ void QAbstractItemViewPrivate::_q_rowsRemoved(const QModelIndex &index, int star if (q->isVisible()) q->updateEditorGeometries(); q->setState(QAbstractItemView::NoState); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(q, QAccessibleTableModelChangeEvent::RowsRemoved); accessibleEvent.setFirstRow(start); @@ -3617,7 +3617,7 @@ void QAbstractItemViewPrivate::_q_columnsRemoved(const QModelIndex &index, int s if (q->isVisible()) q->updateEditorGeometries(); q->setState(QAbstractItemView::NoState); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(q, QAccessibleTableModelChangeEvent::ColumnsRemoved); accessibleEvent.setFirstColumn(start); @@ -3640,7 +3640,7 @@ void QAbstractItemViewPrivate::_q_rowsInserted(const QModelIndex &index, int sta Q_UNUSED(start); Q_UNUSED(end); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_Q(QAbstractItemView); if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(q, QAccessibleTableModelChangeEvent::RowsInserted); @@ -3666,7 +3666,7 @@ void QAbstractItemViewPrivate::_q_columnsInserted(const QModelIndex &index, int Q_Q(QAbstractItemView); if (q->isVisible()) q->updateEditorGeometries(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(q, QAccessibleTableModelChangeEvent::ColumnsInserted); accessibleEvent.setFirstColumn(start); @@ -3694,7 +3694,7 @@ void QAbstractItemViewPrivate::_q_modelDestroyed() void QAbstractItemViewPrivate::_q_layoutChanged() { doDelayedItemsLayout(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_Q(QAbstractItemView); if (QAccessible::isActive()) { QAccessibleTableModelChangeEvent accessibleEvent(q, QAccessibleTableModelChangeEvent::ModelReset); diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 63d0016e47..e56c510dcc 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -5,7 +5,7 @@ #include "qlistview.h" #include <qabstractitemdelegate.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif #include <qapplication.h> @@ -3392,7 +3392,7 @@ void QIconModeViewBase::updateContentsSize() */ void QListView::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { if (current.isValid()) { int entry = visualIndex(current); @@ -3411,7 +3411,7 @@ void QListView::currentChanged(const QModelIndex ¤t, const QModelIndex &pr void QListView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { // ### does not work properly for selection ranges. QModelIndex sel = selected.indexes().value(0); diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 1ba0c20361..520a6f3afc 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -19,7 +19,7 @@ #include <private/qtableview_p.h> #include <private/qheaderview_p.h> #include <private/qscrollbar_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif @@ -3457,7 +3457,7 @@ void QTableViewPrivate::selectColumn(int column, bool anchor) */ void QTableView::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { if (current.isValid()) { Q_D(QTableView); @@ -3479,7 +3479,7 @@ void QTableView::selectionChanged(const QItemSelection &selected, { Q_D(QTableView); Q_UNUSED(d); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { // ### does not work properly for selection ranges. QModelIndex sel = selected.indexes().value(0); diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index da7bbe7d34..3711a933f6 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -15,7 +15,7 @@ #include <qdebug.h> #include <QMetaMethod> #include <private/qscrollbar_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif @@ -3992,7 +3992,7 @@ void QTreeView::currentChanged(const QModelIndex ¤t, const QModelIndex &pr viewport()->update(currentRect); } } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive() && current.isValid()) { Q_D(QTreeView); @@ -4010,7 +4010,7 @@ void QTreeView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { QAbstractItemView::selectionChanged(selected, deselected); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { Q_D(QTreeView); diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 6f680da931..0812faf99a 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -48,7 +48,7 @@ #if QT_CONFIG(whatsthis) #include <QtWidgets/QWhatsThis> #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtGui/qaccessible_base.h> #endif @@ -475,7 +475,7 @@ void QApplicationPrivate::init() initialize(); eventDispatcher->startingUp(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) // factory for accessible interfaces for widgets shipped with Qt QAccessible::installFactory(&qAccessibleFactory); #endif diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 67ea6a7604..9f8656b3fb 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -20,7 +20,7 @@ #include <qpa/qplatformtheme.h> #include "private/qtextdocumentlayout_p.h" #include "qdebug.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -366,7 +366,7 @@ QWhatsThisPrivate::QWhatsThisPrivate() QGuiApplication::setOverrideCursor(Qt::WhatsThisCursor); #endif } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::ContextHelpStart); QAccessible::updateAccessibility(&event); #endif @@ -381,7 +381,7 @@ QWhatsThisPrivate::~QWhatsThisPrivate() #ifndef QT_NO_CURSOR QGuiApplication::restoreOverrideCursor(); #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::ContextHelpEnd); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 9c1cec5d8d..ebbb2dffb8 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -21,7 +21,7 @@ #include "qwidget.h" #include "qstyleoption.h" #include "qstylehints.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) # include "qaccessible.h" #endif #include <qpa/qplatformwindow.h> @@ -6512,7 +6512,7 @@ void QWidget::setFocus(Qt::FocusReason reason) f->d_func()->updateFocusChild(); QApplicationPrivate::setFocusWidget(f, reason); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) // menus update the focus manually and this would create bogus events if (!(f->inherits("QMenuBar") || f->inherits("QMenu") || f->inherits("QMenuItem"))) { @@ -6687,7 +6687,7 @@ void QWidget::clearFocus() if (hasFocus()) { // Update proxy state QApplicationPrivate::setFocusWidget(nullptr, Qt::OtherFocusReason); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::Focus); QAccessible::updateAccessibility(&event); #endif @@ -7962,7 +7962,7 @@ void QWidgetPrivate::show_helper() if (!isEmbedded && q->windowType() == Qt::Popup) qApp->d_func()->openPopup(q); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (q->windowType() != Qt::ToolTip) { // Tooltips are read aloud twice in MS narrator. QAccessibleEvent event(q, QAccessible::ObjectShow); QAccessible::updateAccessibility(&event); @@ -8108,7 +8108,7 @@ void QWidgetPrivate::hide_helper() if (QWidgetRepaintManager *repaintManager = maybeRepaintManager()) repaintManager->removeDirtyWidget(q); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (wasVisible) { QAccessibleEvent event(q, QAccessible::ObjectHide); QAccessible::updateAccessibility(&event); @@ -8356,7 +8356,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous) } } qApp->d_func()->sendSyntheticEnterLeave(widget); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (!spontaneous) { QAccessibleEvent event(widget, QAccessible::ObjectHide); QAccessible::updateAccessibility(&event); @@ -9262,7 +9262,7 @@ void QWidget::changeEvent(QEvent * event) switch(event->type()) { case QEvent::EnabledChange: { update(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::State s; s.disabled = true; QAccessibleStateChangeEvent event(this, s); @@ -11515,7 +11515,7 @@ QString QWidget::whatsThis() const } #endif // QT_CONFIG(whatsthis) -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) /*! \property QWidget::accessibleName @@ -11580,7 +11580,7 @@ QString QWidget::accessibleDescription() const Q_D(const QWidget); return d->accessibleDescription; } -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) #ifndef QT_NO_SHORTCUT /*! diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index d22beb4a6b..06ac265ede 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -161,7 +161,7 @@ class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice #if QT_CONFIG(whatsthis) Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis) #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_PROPERTY(QString accessibleName READ accessibleName WRITE setAccessibleName) Q_PROPERTY(QString accessibleDescription READ accessibleDescription WRITE setAccessibleDescription) #endif @@ -396,7 +396,7 @@ public: void setWhatsThis(const QString &); QString whatsThis() const; #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QString accessibleName() const; void setAccessibleName(const QString &name); QString accessibleDescription() const; diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 3b47349784..65e368d945 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -657,7 +657,7 @@ public: #if QT_CONFIG(whatsthis) QString whatsThis; #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QString accessibleName; QString accessibleDescription; #endif diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 3c7dddc42f..afea2eb0a9 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -7,7 +7,7 @@ #include "private/qwidget_p.h" #include "private/qapplication_p.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtGui/qaccessible.h> #endif #include <private/qwidgetrepaintmanager_p.h> @@ -136,7 +136,7 @@ QWidgetWindow::~QWidgetWindow() { } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleInterface *QWidgetWindow::accessibleRoot() const { if (m_widget) @@ -211,7 +211,7 @@ bool QWidgetWindow::event(QEvent *event) handleFocusInEvent(static_cast<QFocusEvent *>(event)); Q_FALLTHROUGH(); case QEvent::FocusOut: { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::State state; state.active = true; QAccessibleStateChangeEvent ev(m_widget, state); diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index 186f841c1c..92f1a8b6d4 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -38,7 +38,7 @@ public: ~QWidgetWindow(); QWidget *widget() const { return m_widget; } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleInterface *accessibleRoot() const override; #endif diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index 5314ab1518..2df4745627 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -89,7 +89,7 @@ Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, const QStyleOption *option) return dpiScaled(value, dpi(option)); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) bool isInstanceOf(QObject *obj, QAccessible::Role role) { bool match = false; @@ -110,7 +110,7 @@ bool hasAncestor(QObject *obj, QAccessible::Role role) } return found; } -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) #if QT_CONFIG(dial) diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h index c549b4634f..524417e405 100644 --- a/src/widgets/styles/qstylehelper_p.h +++ b/src/widgets/styles/qstylehelper_p.h @@ -56,7 +56,7 @@ namespace QStyleHelper Q_WIDGETS_EXPORT void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, int left = 0, int top = 0, int right = 0, int bottom = 0); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_WIDGETS_EXPORT bool isInstanceOf(QObject *obj, QAccessible::Role role); Q_WIDGETS_EXPORT bool hasAncestor(QObject *obj, QAccessible::Role role); #endif diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 08134b5e12..63b1e85483 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -571,12 +571,12 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid ret = 1; } } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (!ret && opt && opt->type == QStyleOption::SO_MenuItem && QStyleHelper::isInstanceOf(opt->styleObject, QAccessible::MenuItem) && opt->styleObject->property("_q_showUnderlined").toBool()) ret = 1; -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) break; } #endif // Q_OS_WIN diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 4eb871ea4b..01ff420484 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -16,7 +16,7 @@ #include "qpainter.h" #include "qapplication.h" #include "qstyle.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #include <qpa/qplatformtheme.h> @@ -490,7 +490,7 @@ void QAbstractButton::setText(const QString &text) d->sizeHint = QSize(); update(); updateGeometry(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif @@ -614,7 +614,7 @@ void QAbstractButton::setChecked(bool checked) d->emitToggled(checked); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::State s; s.checked = true; QAccessibleStateChangeEvent event(this, s); diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp index 524b274bd6..6e44b2d432 100644 --- a/src/widgets/widgets/qabstractslider.cpp +++ b/src/widgets/widgets/qabstractslider.cpp @@ -6,7 +6,7 @@ #include "qevent.h" #include "qabstractslider_p.h" #include "qdebug.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #include <limits.h> @@ -504,7 +504,7 @@ void QAbstractSlider::setValue(int value) if (d->pressed) emit sliderMoved((d->position = value)); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(this, d->value); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index fde0e62538..ff41a72fca 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -22,7 +22,7 @@ #include <qpalette.h> #include <qstylepainter.h> #include <qdebug.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) # include <qaccessible.h> #endif @@ -1020,7 +1020,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event) d->updateState(up, true); } } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(this, d->value); QAccessible::updateAccessibility(&event); #endif @@ -1651,7 +1651,7 @@ void QAbstractSpinBoxPrivate::updateState(bool up, bool fromKeyboard /* = false steps *= 10; q->stepBy(steps); spinClickThresholdTimerId = q->startTimer(spinClickThresholdTimerInterval); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(q, value); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index 7164676f96..151c8b1e94 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -9,7 +9,7 @@ #include "qstyle.h" #include "qstyleoption.h" #include "qevent.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -211,7 +211,7 @@ Qt::CheckState QCheckBox::checkState() const void QCheckBox::setCheckState(Qt::CheckState state) { Q_D(QCheckBox); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) bool noChange = d->noChange; #endif if (state == Qt::PartiallyChecked) { @@ -229,7 +229,7 @@ void QCheckBox::setCheckState(Qt::CheckState state) emit stateChanged(state); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (noChange != d->noChange) { QAccessible::State s; s.checkStateMixed = true; diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index de8f98d1da..2da6183a1e 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -45,7 +45,7 @@ # include <private/qeffects_p.h> #endif #include <private/qstyle_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -1082,7 +1082,7 @@ void QComboBoxPrivate::_q_dataChanged(const QModelIndex &topLeft, const QModelIn emit q->currentTextChanged(text); } q->update(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(q, text); QAccessible::updateAccessibility(&event); #endif @@ -1385,7 +1385,7 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index) // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here if (!lineEdit) emit q->currentTextChanged(text); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(q, text); QAccessible::updateAccessibility(&event); #endif @@ -2867,7 +2867,7 @@ void QComboBox::clear() { Q_D(QComboBox); d->model->removeRows(0, d->model->rowCount(d->root), d->root); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(this, QString()); QAccessible::updateAccessibility(&event); #endif @@ -2881,7 +2881,7 @@ void QComboBox::clearEditText() Q_D(QComboBox); if (d->lineEdit) d->lineEdit->clear(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(this, QString()); QAccessible::updateAccessibility(&event); #endif @@ -2895,7 +2895,7 @@ void QComboBox::setEditText(const QString &text) Q_D(QComboBox); if (d->lineEdit) d->lineEdit->setText(text); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleValueChangeEvent event(this, text); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index ccd5ab25b8..e16b6eadaf 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -16,7 +16,7 @@ #include <qslider.h> #include <private/qabstractslider_p.h> #include <private/qmath_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #include <qmath.h> diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index ccd8c4cd71..7da1023f04 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -708,7 +708,7 @@ void QDockWidgetPrivate::updateButtons() = qobject_cast<QAbstractButton*>(dwLayout->widgetForRole(QDockWidgetLayout::FloatButton)); button->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarNormalButton, &opt, q)); button->setVisible(canFloat && !hideButtons); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) //: Accessible name for button undocking a dock widget (floating state) button->setAccessibleName(QDockWidget::tr("Float")); button->setAccessibleDescription(QDockWidget::tr("Undocks and re-attaches the dock widget")); @@ -717,7 +717,7 @@ void QDockWidgetPrivate::updateButtons() = qobject_cast <QAbstractButton*>(dwLayout->widgetForRole(QDockWidgetLayout::CloseButton)); button->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, q)); button->setVisible(canClose && !hideButtons); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) //: Accessible name for button closing a dock widget button->setAccessibleName(QDockWidget::tr("Close")); button->setAccessibleDescription(QDockWidget::tr("Closes the dock widget")); diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 836a3c615d..8fd90f8b77 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -14,7 +14,7 @@ #include "qstyle.h" #include "qstyleoption.h" #include "qstylepainter.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #include <private/qwidget_p.h> @@ -200,7 +200,7 @@ void QGroupBox::setTitle(const QString &title) update(); updateGeometry(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif @@ -609,7 +609,7 @@ void QGroupBox::setChecked(bool b) update(); d->checked = b; d->_q_setChildrenEnabled(b); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::State st; st.checked = true; QAccessibleStateChangeEvent e(this, st); diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index be57285761..3e06360920 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -18,7 +18,7 @@ #include "private/qstylesheetstyle_p.h" #include <qmath.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif @@ -304,7 +304,7 @@ void QLabel::setText(const QString &text) d->updateLabel(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (accessibleName().isEmpty()) { QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 50e2cf7deb..bd20f9963d 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -35,7 +35,7 @@ #endif #include <private/qwidgettextcontrol_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #if QT_CONFIG(itemviews) @@ -1341,7 +1341,7 @@ void QLineEdit::setReadOnly(bool enable) QEvent event(QEvent::ReadOnlyChange); QCoreApplication::sendEvent(this, &event); update(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::State changedState; changedState.readOnly = true; QAccessibleStateChangeEvent ev(this, changedState); diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index ae5fe80d4d..cdfe6df7f6 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -15,7 +15,7 @@ # include "qwidgetaction.h" #endif #include "qclipboard.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #ifndef QT_NO_IM @@ -143,7 +143,7 @@ void QLineEditPrivate::_q_selectionChanged() } emit q->selectionChanged(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextSelectionEvent ev(q, control->selectionStart(), control->selectionEnd()); ev.setCursorPosition(control->cursorPosition()); QAccessible::updateAccessibility(&ev); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 3c49ba5af4..0c493b3f67 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -15,7 +15,7 @@ #include "qpainter.h" #include <qpa/qplatformtheme.h> #include "qapplication.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) # include "qaccessible.h" #endif #if QT_CONFIG(effects) @@ -1462,7 +1462,7 @@ void QMenuPrivate::activateAction(QAction *action, QAction::ActionEvent action_e if (action_e == QAction::Hover) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { int actionIndex = indexOf(action); QAccessibleEvent focusEvent(q, QAccessible::Focus); @@ -2540,7 +2540,7 @@ void QMenuPrivate::popup(const QPoint &p, QAction *atAction, PositionFunction po q->show(); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(q, QAccessible::PopupMenuStart); QAccessible::updateAccessibility(&event); #endif @@ -2669,7 +2669,7 @@ void QMenu::hideEvent(QHideEvent *) if (d->eventLoop) d->eventLoop->exit(); d->setCurrentAction(nullptr); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::PopupMenuEnd); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 6a628ad8d4..15c6f521b3 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -6,7 +6,7 @@ #include <qstyle.h> #include <qlayout.h> #include <qapplication.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) # include <qaccessible.h> #endif #include <qpainter.h> @@ -495,14 +495,14 @@ void QMenuBarPrivate::_q_actionHovered() Q_Q(QMenuBar); if (QAction *action = qobject_cast<QAction *>(q->sender())) { emit q->hovered(action); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { int actionIndex = actions.indexOf(action); QAccessibleEvent focusEvent(q, QAccessible::Focus); focusEvent.setChild(actionIndex); QAccessible::updateAccessibility(&focusEvent); } -#endif //QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) } } diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 49be13cebc..3fb8debaa5 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -422,7 +422,7 @@ void QPlainTextEditPrivate::_q_cursorPositionChanged() { pageUpDownLastCursorYIsValid = false; Q_Q(QPlainTextEdit); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextCursorEvent ev(q, q->textCursor().position()); QAccessible::updateAccessibility(&ev); #endif diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index b5eedde904..79cdecd22a 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -9,7 +9,7 @@ #include <qstylepainter.h> #include <qstyleoption.h> #include <private/qwidget_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif #include <limits.h> @@ -283,7 +283,7 @@ void QProgressBar::setValue(int value) return; d->value = value; emit valueChanged(value); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (isVisible()) { QAccessibleValueChangeEvent event(this, value); QAccessible::updateAccessibility(&event); diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 081964b2cd..ec882db175 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -24,7 +24,7 @@ #include "qdialogbuttonbox.h" #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -334,7 +334,7 @@ void QPushButton::setDefault(bool enable) } #endif update(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessible::State s; s.defaultButton = true; QAccessibleStateChangeEvent event(this, s); diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index dce761923c..ed456c56b8 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -14,7 +14,7 @@ #endif #include <QtCore/qelapsedtimer.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #include <limits.h> diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp index 7e3119efd1..e39521a2e9 100644 --- a/src/widgets/widgets/qslider.cpp +++ b/src/widgets/widgets/qslider.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qslider.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #include "qapplication.h" diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index 3ab7bee5ad..d5ae7d5cd2 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -18,7 +18,7 @@ #include "qmainwindow.h" #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -583,7 +583,7 @@ void QStatusBar::hideOrShow() emit messageChanged(d->tempItem); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 6dd7babbc8..0672987adc 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -21,7 +21,7 @@ #include "qwhatsthis.h" #endif #include "private/qtextengine_p.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif #ifdef Q_OS_MACOS @@ -390,7 +390,7 @@ void QTabBarPrivate::init() #endif q->setFocusPolicy(Qt::TabFocus); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) leftB->setAccessibleName(QTabBar::tr("Scroll Left")); rightB->setAccessibleName(QTabBar::tr("Scroll Right")); #endif @@ -1416,7 +1416,7 @@ void QTabBar::setCurrentIndex(int index) d->layoutTab(oldIndex); } d->layoutTab(index); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (QAccessible::isActive()) { if (hasFocus()) { QAccessibleEvent focusEvent(this, QAccessible::Focus); @@ -2803,7 +2803,7 @@ QWidget *QTabBar::tabButton(int index, ButtonPosition position) const return nullptr; } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) /*! Sets the accessibleName of the tab at position \a index to \a name. */ @@ -2829,7 +2829,7 @@ QString QTabBar::accessibleTabName(int index) const return tab->accessibleName; return QString(); } -#endif // QT_NO_ACCESSIBILITY +#endif // QT_CONFIG(accessibility) CloseButton::CloseButton(QWidget *parent) : QAbstractButton(parent) diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index 17e655120c..2d3179e2d0 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -140,7 +140,7 @@ public: bool changeCurrentOnDrag() const; void setChangeCurrentOnDrag(bool change); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QString accessibleTabName(int index) const; void setAccessibleTabName(int index, const QString &name); #endif @@ -179,7 +179,7 @@ protected: void timerEvent(QTimerEvent *event) override; virtual void initStyleOption(QStyleOptionTab *option, int tabIndex) const; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) friend class QAccessibleTabBar; #endif private: diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 71ac772182..e38b1ef6f9 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -119,7 +119,7 @@ public: #if QT_CONFIG(whatsthis) QString whatsThis; #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QString accessibleName; #endif QIcon icon; diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index c11b87c6bb..1c94ba66ae 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -22,7 +22,7 @@ #endif #include <qstyle.h> #include <qtimer.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <qaccessible.h> #endif #include "private/qtextdocumentlayout_p.h" @@ -192,7 +192,7 @@ void QTextEditPrivate::_q_cursorPositionChanged() { Q_Q(QTextEdit); emit q->cursorPositionChanged(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextCursorEvent event(q, q->textCursor().position()); QAccessible::updateAccessibility(&event); #endif diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 6805492143..e95509ae89 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -13,7 +13,7 @@ #endif #include <qpa/qplatformtheme.h> #include <qstylehints.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -749,7 +749,7 @@ void QWidgetLineControl::internalSetText(const QString &txt, int pos, bool edite m_textDirty = (oldText != m_text); const bool changed = finishChange(-1, true, edited); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (changed) { if (oldText.isEmpty()) { QAccessibleTextInsertEvent event(accessibleObject(), 0, txt); @@ -819,7 +819,7 @@ void QWidgetLineControl::internalInsert(const QString &s) QString ms = maskString(m_cursor, s); if (ms.isEmpty() && !s.isEmpty()) emit inputRejected(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextInsertEvent insertEvent(accessibleObject(), m_cursor, ms); QAccessible::updateAccessibility(&insertEvent); #endif @@ -831,14 +831,14 @@ void QWidgetLineControl::internalInsert(const QString &s) m_cursor += ms.length(); m_cursor = nextMaskBlank(m_cursor); m_textDirty = true; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextCursorEvent event(accessibleObject(), m_cursor); QAccessible::updateAccessibility(&event); #endif } else { int remaining = m_maxLength - m_text.length(); if (remaining != 0) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextInsertEvent insertEvent(accessibleObject(), m_cursor, s); QAccessible::updateAccessibility(&insertEvent); #endif @@ -871,7 +871,7 @@ void QWidgetLineControl::internalDelete(bool wasBackspace) addCommand(Command(SetSelection, m_cursor, u'\0', m_selstart, m_selend)); addCommand(Command((CommandType)((m_maskData ? 2 : 0) + (wasBackspace ? Remove : Delete)), m_cursor, m_text.at(m_cursor), -1, -1)); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextRemoveEvent event(accessibleObject(), m_cursor, m_text.at(m_cursor)); QAccessible::updateAccessibility(&event); #endif @@ -912,7 +912,7 @@ void QWidgetLineControl::removeSelectedText() for (i = m_selend-1; i >= m_selstart; --i) addCommand (Command(RemoveSelection, i, m_text.at(i), -1, -1)); } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleTextRemoveEvent event(accessibleObject(), m_selstart, m_text.mid(m_selstart, m_selend - m_selstart)); QAccessible::updateAccessibility(&event); #endif @@ -1397,7 +1397,7 @@ void QWidgetLineControl::emitCursorPositionChanged() const int oldLast = m_lastCursorPos; m_lastCursorPos = m_cursor; cursorPositionChanged(oldLast, m_cursor); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) // otherwise we send a selection update which includes the cursor if (!hasSelectedText()) { QAccessibleTextCursorEvent event(accessibleObject(), m_cursor); diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index e73975f9e2..586942b5fd 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -578,7 +578,7 @@ void QWidgetTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged Q_Q(QWidgetTextControl); if (forceEmitSelectionChanged) { emit q->selectionChanged(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (q->parent() && q->parent()->isWidgetType()) { QAccessibleTextSelectionEvent ev(q->parent(), cursor.anchor(), cursor.position()); QAccessible::updateAccessibility(&ev); @@ -601,7 +601,7 @@ void QWidgetTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged && (cursor.position() != lastSelectionPosition || cursor.anchor() != lastSelectionAnchor)))) { emit q->selectionChanged(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) if (q->parent() && q->parent()->isWidgetType()) { QAccessibleTextSelectionEvent ev(q->parent(), cursor.anchor(), cursor.position()); QAccessible::updateAccessibility(&ev); @@ -642,7 +642,7 @@ void QWidgetTextControlPrivate::_q_emitCursorPosChanged(const QTextCursor &someC void QWidgetTextControlPrivate::_q_contentsChanged(int from, int charsRemoved, int charsAdded) { -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) Q_Q(QWidgetTextControl); if (QAccessible::isActive() && q->parent() && q->parent()->isWidgetType()) { |