diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-09 16:55:03 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-15 16:46:38 +0000 |
commit | 773178900f39febb0509cb4170bc091c9f91d3b3 (patch) | |
tree | a0bcc17a72f075793cf2438cd260e03b577ef277 /src/widgets/accessible | |
parent | a23568be6c6859b3a149cfadb1104da4f32318f5 (diff) |
Convert features.treeview to QT_[REQUIRE_]CONFIG
Change-Id: I4a036a0410615ac563b17f7715c47acccb8abfca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 1 | ||||
-rw-r--r-- | src/widgets/accessible/itemviews.cpp | 21 | ||||
-rw-r--r-- | src/widgets/accessible/itemviews_p.h | 6 | ||||
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 6 |
4 files changed, 19 insertions, 15 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index dd9bea1aec..50aba759c3 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -53,7 +53,6 @@ #if QT_CONFIG(whatsthis) #include <qwhatsthis.h> #endif -#include <qtreeview.h> #include <private/qtabbar_p.h> #include <QAbstractScrollArea> #include <QScrollArea> diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp index 87c0a59563..4d1a4589ee 100644 --- a/src/widgets/accessible/itemviews.cpp +++ b/src/widgets/accessible/itemviews.cpp @@ -44,8 +44,11 @@ #include <qtableview.h> #endif #include <qlistview.h> +#if QT_CONFIG(treeview) #include <qtreeview.h> #include <private/qtreeview_p.h> +#endif +#include <private/qwidget_p.h> #ifndef QT_NO_ACCESSIBILITY @@ -88,7 +91,7 @@ QAccessibleTable::QAccessibleTable(QWidget *w) m_role = QAccessible::Table; } else #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) if (qobject_cast<const QTreeView*>(view())) { m_role = QAccessible::Tree; } else @@ -123,7 +126,7 @@ QHeaderView *QAccessibleTable::horizontalHeader() const } else if (const QTableView *tv = qobject_cast<const QTableView*>(view())) { header = tv->horizontalHeader(); #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) } else if (const QTreeView *tv = qobject_cast<const QTreeView*>(view())) { header = tv->header(); #endif @@ -647,7 +650,7 @@ void QAccessibleTable::modelChange(QAccessibleTableModelChangeEvent *event) } } -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) // TREE VIEW @@ -820,7 +823,7 @@ bool QAccessibleTree::selectRow(int row) return true; } -#endif // QT_NO_TREEVIEW +#endif // QT_CONFIG(treeview) // TABLE CELL @@ -872,7 +875,7 @@ QHeaderView *QAccessibleTableCell::horizontalHeader() const } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) { header = tv->horizontalHeader(); #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) } else if (const QTreeView *tv = qobject_cast<const QTreeView*>(view)) { header = tv->header(); #endif @@ -898,7 +901,7 @@ int QAccessibleTableCell::columnIndex() const int QAccessibleTableCell::rowIndex() const { -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) if (role() == QAccessible::TreeItem) { const QTreeView *treeView = qobject_cast<const QTreeView*>(view); Q_ASSERT(treeView); @@ -1034,7 +1037,7 @@ QAccessible::State QAccessibleTableCell::state() const if (view->selectionMode() == QAbstractItemView::ExtendedSelection) st.extSelectable = true; } -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) if (m_role == QAccessible::TreeItem) { const QTreeView *treeView = qobject_cast<const QTreeView*>(view); if (treeView->model()->hasChildren(m_index)) @@ -1135,7 +1138,7 @@ QRect QAccessibleTableHeaderCell::rect() const header = tv->verticalHeader(); } #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) } else if (const QTreeView *tv = qobject_cast<const QTreeView*>(view)) { header = tv->header(); #endif @@ -1202,7 +1205,7 @@ QHeaderView *QAccessibleTableHeaderCell::headerView() const header = tv->verticalHeader(); } #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) } else if (const QTreeView *tv = qobject_cast<const QTreeView*>(view)) { header = tv->header(); #endif diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h index 1b3869f2fa..9542a569db 100644 --- a/src/widgets/accessible/itemviews_p.h +++ b/src/widgets/accessible/itemviews_p.h @@ -145,7 +145,7 @@ private: QAccessible::Role m_role; }; -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) class QAccessibleTree :public QAccessibleTable { public: @@ -223,7 +223,7 @@ private: void unselectCell(); friend class QAccessibleTable; -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) friend class QAccessibleTree; #endif }; @@ -259,7 +259,7 @@ private: Qt::Orientation orientation; friend class QAccessibleTable; -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) friend class QAccessibleTree; #endif }; diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index ccd176cd04..a39674dc7a 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -46,7 +46,9 @@ #include "itemviews_p.h" #include <qtoolbutton.h> +#if QT_CONFIG(treeview) #include <qtreeview.h> +#endif #include <qvariant.h> #include <qaccessible.h> @@ -140,10 +142,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QMenu")) { iface = new QAccessibleMenu(widget); #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) } else if (classname == QLatin1String("QTreeView")) { iface = new QAccessibleTree(widget); -#endif // QT_NO_TREEVIEW +#endif // QT_CONFIG(treeview) #ifndef QT_NO_ITEMVIEWS } else if (classname == QLatin1String("QTableView") || classname == QLatin1String("QListView")) { iface = new QAccessibleTable(widget); |