diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-09 16:53:58 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-11 02:52:35 +0000 |
commit | 01703d026420cd0964bec872f7af54fd077b82ad (patch) | |
tree | 183252845f8c6220eac3c1476cacb02066533bbf /src/widgets | |
parent | 6cd46c9a61c3493b975416ec4309af75db5dafaf (diff) |
Convert features.tableview to QT_[REQUIRE_]CONFIG
Change-Id: I7ab479deff7bbf3083d1efa196e0480b181548c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 1 | ||||
-rw-r--r-- | src/widgets/accessible/itemviews.cpp | 16 | ||||
-rw-r--r-- | src/widgets/itemviews/itemviews.pri | 11 | ||||
-rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 1 | ||||
-rw-r--r-- | src/widgets/itemviews/qstyleditemdelegate.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtableview.cpp | 3 | ||||
-rw-r--r-- | src/widgets/itemviews/qtableview.h | 7 | ||||
-rw-r--r-- | src/widgets/itemviews/qtableview_p.h | 4 | ||||
-rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 4 | ||||
-rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsvistastyle_p_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 6 |
12 files changed, 34 insertions, 27 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 4770c513cf..dd9bea1aec 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -46,7 +46,6 @@ #include <qtabbar.h> #include <qcombobox.h> #include <qlistview.h> -#include <qtableview.h> #include <qlineedit.h> #include <qstyle.h> #include <qstyleoption.h> diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp index 3cef564781..87c0a59563 100644 --- a/src/widgets/accessible/itemviews.cpp +++ b/src/widgets/accessible/itemviews.cpp @@ -40,7 +40,9 @@ #include "itemviews_p.h" #include <qheaderview.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <qlistview.h> #include <qtreeview.h> #include <private/qtreeview_p.h> @@ -81,7 +83,7 @@ QAccessibleTable::QAccessibleTable(QWidget *w) { Q_ASSERT(view()); -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) if (qobject_cast<const QTableView*>(view())) { m_role = QAccessible::Table; } else @@ -117,7 +119,7 @@ QHeaderView *QAccessibleTable::horizontalHeader() const { QHeaderView *header = 0; if (false) { -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) } else if (const QTableView *tv = qobject_cast<const QTableView*>(view())) { header = tv->horizontalHeader(); #endif @@ -133,7 +135,7 @@ QHeaderView *QAccessibleTable::verticalHeader() const { QHeaderView *header = 0; if (false) { -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) } else if (const QTableView *tv = qobject_cast<const QTableView*>(view())) { header = tv->verticalHeader(); #endif @@ -866,7 +868,7 @@ QHeaderView *QAccessibleTableCell::horizontalHeader() const QHeaderView *header = 0; if (false) { -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) { header = tv->horizontalHeader(); #endif @@ -882,7 +884,7 @@ QHeaderView *QAccessibleTableCell::horizontalHeader() const QHeaderView *QAccessibleTableCell::verticalHeader() const { QHeaderView *header = 0; -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) if (const QTableView *tv = qobject_cast<const QTableView*>(view)) header = tv->verticalHeader(); #endif @@ -1125,7 +1127,7 @@ QRect QAccessibleTableHeaderCell::rect() const { QHeaderView *header = 0; if (false) { -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) { if (orientation == Qt::Horizontal) { header = tv->horizontalHeader(); @@ -1192,7 +1194,7 @@ QHeaderView *QAccessibleTableHeaderCell::headerView() const { QHeaderView *header = 0; if (false) { -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) { if (orientation == Qt::Horizontal) { header = tv->horizontalHeader(); diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri index af0a6f6898..4101be5631 100644 --- a/src/widgets/itemviews/itemviews.pri +++ b/src/widgets/itemviews/itemviews.pri @@ -9,8 +9,6 @@ HEADERS += \ itemviews/qlistview.h \ itemviews/qlistview_p.h \ itemviews/qbsptree_p.h \ - itemviews/qtableview.h \ - itemviews/qtableview_p.h \ itemviews/qtreeview.h \ itemviews/qtreeview_p.h \ itemviews/qabstractitemdelegate.h \ @@ -28,7 +26,6 @@ SOURCES += \ itemviews/qheaderview.cpp \ itemviews/qlistview.cpp \ itemviews/qbsptree.cpp \ - itemviews/qtableview.cpp \ itemviews/qtreeview.cpp \ itemviews/qabstractitemdelegate.cpp \ itemviews/qitemdelegate.cpp \ @@ -57,6 +54,14 @@ qtConfig(listwidget) { SOURCES += itemviews/qlistwidget.cpp } +qtConfig(tableview) { + HEADERS += \ + itemviews/qtableview.h \ + itemviews/qtableview_p.h + + SOURCES += itemviews/qtableview.cpp +} + qtConfig(tablewidget) { HEADERS += \ itemviews/qtablewidget.h \ diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index c8fdf06d64..f96bafdb57 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -53,7 +53,6 @@ #include <qlineedit.h> #include <qspinbox.h> #include <qtreeview.h> -#include <qtableview.h> #include <qheaderview.h> #include <qstyleditemdelegate.h> #include <private/qabstractitemview_p.h> diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 4149d3ac3a..0b8019c21c 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -67,7 +67,9 @@ #include <private/qlayoutengine_p.h> #include <qdebug.h> #include <qlocale.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <limits.h> @@ -500,7 +502,7 @@ void QStyledItemDelegate::updateEditorGeometry(QWidget *editor, // let the editor take up all available space //if the editor is not a QLineEdit //or it is in a QTableView -#if !defined(QT_NO_TABLEVIEW) && !defined(QT_NO_LINEEDIT) +#if QT_CONFIG(tableview) && !defined(QT_NO_LINEEDIT) if (qobject_cast<QExpandingLineEdit*>(editor) && !qobject_cast<const QTableView*>(widget)) opt.showDecorationSelected = editor->style()->styleHint(QStyle::SH_ItemView_ShowDecorationSelected, 0, editor); else diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index b79932327b..2d5813198c 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -39,7 +39,6 @@ #include "qtableview.h" -#ifndef QT_NO_TABLEVIEW #include <qheaderview.h> #include <qitemdelegate.h> #include <qapplication.h> @@ -3352,5 +3351,3 @@ QT_END_NAMESPACE #include "qtableview.moc" #include "moc_qtableview.cpp" - -#endif // QT_NO_TABLEVIEW diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index b1c38d521f..75f2e7b44c 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemview.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(tableview); -#ifndef QT_NO_TABLEVIEW +QT_BEGIN_NAMESPACE class QHeaderView; class QTableViewPrivate; @@ -191,8 +190,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateSpanRemovedColumns(QModelIndex,int,int)) }; -#endif // QT_NO_TABLEVIEW - QT_END_NAMESPACE #endif // QTABLEVIEW_H diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h index d2f45d557d..1a0fef9017 100644 --- a/src/widgets/itemviews/qtableview_p.h +++ b/src/widgets/itemviews/qtableview_p.h @@ -59,7 +59,7 @@ #include <QtCore/QDebug> #include "private/qabstractitemview_p.h" -#ifndef QT_NO_TABLEVIEW +QT_REQUIRE_CONFIG(tableview); QT_BEGIN_NAMESPACE @@ -261,6 +261,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_TABLEVIEW - #endif // QTABLEVIEW_P_H diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 134df0cd72..b0176e1a49 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -89,7 +89,9 @@ #include <qtoolbar.h> #include <qtoolbutton.h> #include <qtreeview.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <qoperatingsystemversion.h> #if QT_CONFIG(wizard) #include <qwizard.h> @@ -3722,7 +3724,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter HIRect bounds = qt_hirectForQRect(ir); bool noVerticalHeader = true; -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) if (w) if (const QTableView *table = qobject_cast<const QTableView *>(w->parentWidget())) noVerticalHeader = !table->verticalHeader()->isVisible(); diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 4963e3692c..514cc8a14e 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -94,7 +94,9 @@ #include <qtoolbar.h> #include <qtoolbutton.h> #include <qtreeview.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <qdebug.h> #if QT_CONFIG(datetimeedit) #include <qdatetimeedit.h> diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index db358e6f6c..01fe32c1c6 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -84,7 +84,9 @@ #include <qdialogbuttonbox.h> #endif #include <qinputdialog.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <qdatetime.h> #include <qcommandlinkbutton.h> diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 5520e9d28f..84d81fa089 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -47,7 +47,9 @@ #include <qapplication.h> #include <qdesktopwidget.h> #include <qlistview.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <qitemdelegate.h> #include <qmap.h> #include <qmenu.h> @@ -598,7 +600,7 @@ int QComboBoxPrivateContainer::topMargin() const { if (const QListView *lview = qobject_cast<const QListView*>(view)) return lview->spacing(); -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) if (const QTableView *tview = qobject_cast<const QTableView*>(view)) return tview->showGrid() ? 1 : 0; #endif @@ -613,7 +615,7 @@ int QComboBoxPrivateContainer::spacing() const QListView *lview = qobject_cast<QListView*>(view); if (lview) return 2 * lview->spacing(); // QListView::spacing is the padding around the item. -#ifndef QT_NO_TABLEVIEW +#if QT_CONFIG(tableview) QTableView *tview = qobject_cast<QTableView*>(view); if (tview) return tview->showGrid() ? 1 : 0; |