summaryrefslogtreecommitdiffstats
path: root/src/widgets/itemviews
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate.cpp3
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate.h7
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate_p.h4
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp3
-rw-r--r--src/widgets/itemviews/qabstractitemview.h7
-rw-r--r--src/widgets/itemviews/qabstractitemview_p.h4
-rw-r--r--src/widgets/itemviews/qheaderview.cpp3
-rw-r--r--src/widgets/itemviews/qheaderview.h7
-rw-r--r--src/widgets/itemviews/qheaderview_p.h6
-rw-r--r--src/widgets/itemviews/qitemdelegate.cpp3
-rw-r--r--src/widgets/itemviews/qitemdelegate.h7
-rw-r--r--src/widgets/itemviews/qitemeditorfactory.cpp4
-rw-r--r--src/widgets/itemviews/qitemeditorfactory.h7
-rw-r--r--src/widgets/itemviews/qitemeditorfactory_p.h7
-rw-r--r--src/widgets/itemviews/qstyleditemdelegate.cpp3
-rw-r--r--src/widgets/itemviews/qstyleditemdelegate.h7
16 files changed, 18 insertions, 64 deletions
diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index 5b119cc79e..fd4699409c 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -39,7 +39,6 @@
#include "qabstractitemdelegate.h"
-#ifndef QT_NO_ITEMVIEWS
#include <qabstractitemmodel.h>
#include <qabstractitemview.h>
#include <qfontmetrics.h>
@@ -606,5 +605,3 @@ void QAbstractItemDelegatePrivate::_q_commitDataAndCloseEditor(QWidget *editor)
QT_END_NAMESPACE
#include "moc_qabstractitemdelegate.cpp"
-
-#endif // QT_NO_ITEMVIEWS
diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h
index 9f7a7716af..9b6bde1c87 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.h
+++ b/src/widgets/itemviews/qabstractitemdelegate.h
@@ -44,10 +44,9 @@
#include <QtCore/qobject.h>
#include <QtWidgets/qstyleoption.h>
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(itemviews);
-#ifndef QT_NO_ITEMVIEWS
+QT_BEGIN_NAMESPACE
class QPainter;
class QModelIndex;
@@ -127,8 +126,6 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_commitDataAndCloseEditor(QWidget*))
};
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QABSTRACTITEMDELEGATE_H
diff --git a/src/widgets/itemviews/qabstractitemdelegate_p.h b/src/widgets/itemviews/qabstractitemdelegate_p.h
index 0b03be63f0..da76d31e8b 100644
--- a/src/widgets/itemviews/qabstractitemdelegate_p.h
+++ b/src/widgets/itemviews/qabstractitemdelegate_p.h
@@ -55,7 +55,7 @@
#include "qabstractitemdelegate.h"
#include <private/qobject_p.h>
-#ifndef QT_NO_ITEMVIEWS
+QT_REQUIRE_CONFIG(itemviews);
QT_BEGIN_NAMESPACE
@@ -73,6 +73,4 @@ public:
QT_END_NAMESPACE
-#endif // QT_NO_ITEMVIEWS
-
#endif // QABSTRACTITEMDELEGATE_P_H
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 396016c44d..f056b7e5e5 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -39,7 +39,6 @@
#include "qabstractitemview.h"
-#ifndef QT_NO_ITEMVIEWS
#include <qpointer.h>
#include <qapplication.h>
#include <qclipboard.h>
@@ -4490,5 +4489,3 @@ QModelIndexList QAbstractItemViewPrivate::selectedDraggableIndexes() const
QT_END_NAMESPACE
#include "moc_qabstractitemview.cpp"
-
-#endif // QT_NO_ITEMVIEWS
diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h
index f315ea6e4c..6be776ec52 100644
--- a/src/widgets/itemviews/qabstractitemview.h
+++ b/src/widgets/itemviews/qabstractitemview.h
@@ -49,10 +49,9 @@
class tst_QAbstractItemView;
class tst_QTreeView;
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(itemviews);
-#ifndef QT_NO_ITEMVIEWS
+QT_BEGIN_NAMESPACE
class QMenu;
class QDrag;
@@ -381,8 +380,6 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractItemView::EditTriggers)
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QABSTRACTITEMVIEW_H
diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h
index 5e3858f491..d8af96af55 100644
--- a/src/widgets/itemviews/qabstractitemview_p.h
+++ b/src/widgets/itemviews/qabstractitemview_p.h
@@ -64,7 +64,7 @@
#include "QtCore/qbasictimer.h"
#include "QtCore/qelapsedtimer.h"
-#ifndef QT_NO_ITEMVIEWS
+QT_REQUIRE_CONFIG(itemviews);
QT_BEGIN_NAMESPACE
@@ -477,6 +477,4 @@ inline int qBinarySearch(const QVector<T> &vec, const T &item, int start, int en
QT_END_NAMESPACE
-#endif // QT_NO_ITEMVIEWS
-
#endif // QABSTRACTITEMVIEW_P_H
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 6a6991ebb8..213cc96b03 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -39,7 +39,6 @@
#include "qheaderview.h"
-#ifndef QT_NO_ITEMVIEWS
#include <qbitarray.h>
#include <qbrush.h>
#include <qdebug.h>
@@ -3949,6 +3948,4 @@ bool QHeaderViewPrivate::read(QDataStream &in)
QT_END_NAMESPACE
-#endif // QT_NO_ITEMVIEWS
-
#include "moc_qheaderview.cpp"
diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
index 4be97c0c7e..ec4500d81e 100644
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@@ -43,10 +43,9 @@
#include <QtWidgets/qtwidgetsglobal.h>
#include <QtWidgets/qabstractitemview.h>
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(itemviews);
-#ifndef QT_NO_ITEMVIEWS
+QT_BEGIN_NAMESPACE
class QHeaderViewPrivate;
class QStyleOptionHeader;
@@ -265,8 +264,6 @@ inline void QHeaderView::hideSection(int alogicalIndex)
inline void QHeaderView::showSection(int alogicalIndex)
{ setSectionHidden(alogicalIndex, false); }
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QHEADERVIEW_H
diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
index d6b119512c..8fc8b88aa5 100644
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@@ -54,14 +54,14 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#include "private/qabstractitemview_p.h"
-#ifndef QT_NO_ITEMVIEWS
-
#include "QtCore/qbitarray.h"
#include "QtWidgets/qapplication.h"
#if QT_CONFIG(label)
#include "QtWidgets/qlabel.h"
#endif
+QT_REQUIRE_CONFIG(itemviews);
+
QT_BEGIN_NAMESPACE
class QHeaderViewPrivate: public QAbstractItemViewPrivate
@@ -391,6 +391,4 @@ Q_DECLARE_TYPEINFO(QHeaderViewPrivate::SectionItem, Q_PRIMITIVE_TYPE);
QT_END_NAMESPACE
-#endif // QT_NO_ITEMVIEWS
-
#endif // QHEADERVIEW_P_H
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index 6a6220cd0a..68c02e9edb 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -39,7 +39,6 @@
#include "qitemdelegate.h"
-#ifndef QT_NO_ITEMVIEWS
#include <qabstractitemmodel.h>
#include <qapplication.h>
#include <qbrush.h>
@@ -1199,5 +1198,3 @@ QStyleOptionViewItem QItemDelegate::setOptions(const QModelIndex &index,
QT_END_NAMESPACE
#include "moc_qitemdelegate.cpp"
-
-#endif // QT_NO_ITEMVIEWS
diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h
index 3d98419c80..21594327ef 100644
--- a/src/widgets/itemviews/qitemdelegate.h
+++ b/src/widgets/itemviews/qitemdelegate.h
@@ -46,10 +46,9 @@
#include <QtGui/qpixmap.h>
#include <QtCore/qvariant.h>
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(itemviews);
-#ifndef QT_NO_ITEMVIEWS
+QT_BEGIN_NAMESPACE
class QItemDelegatePrivate;
class QItemEditorFactory;
@@ -126,8 +125,6 @@ private:
Q_DISABLE_COPY(QItemDelegate)
};
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QITEMDELEGATE_H
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index dcfe4065a6..54b7c6666f 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -41,8 +41,6 @@
#include "qitemeditorfactory.h"
#include "qitemeditorfactory_p.h"
-#ifndef QT_NO_ITEMVIEWS
-
#if QT_CONFIG(combobox)
#include <qcombobox.h>
#endif
@@ -627,5 +625,3 @@ QT_END_NAMESPACE
#endif
#include "moc_qitemeditorfactory_p.cpp"
-
-#endif // QT_NO_ITEMVIEWS
diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h
index dea9bce794..f2610ad3de 100644
--- a/src/widgets/itemviews/qitemeditorfactory.h
+++ b/src/widgets/itemviews/qitemeditorfactory.h
@@ -46,10 +46,9 @@
#include <QtCore/qhash.h>
#include <QtCore/qvariant.h>
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(itemviews);
-#ifndef QT_NO_ITEMVIEWS
+QT_BEGIN_NAMESPACE
class QWidget;
@@ -111,8 +110,6 @@ private:
QHash<int, QItemEditorCreatorBase *> creatorMap;
};
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QITEMEDITORFACTORY_H
diff --git a/src/widgets/itemviews/qitemeditorfactory_p.h b/src/widgets/itemviews/qitemeditorfactory_p.h
index 91edcf65ba..409ecc684f 100644
--- a/src/widgets/itemviews/qitemeditorfactory_p.h
+++ b/src/widgets/itemviews/qitemeditorfactory_p.h
@@ -55,12 +55,11 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#include <qlineedit.h>
-#ifndef QT_NO_ITEMVIEWS
-
#ifndef QT_NO_LINEEDIT
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(itemviews);
+QT_BEGIN_NAMESPACE
class QExpandingLineEdit : public QLineEdit
{
@@ -92,6 +91,4 @@ QT_END_NAMESPACE
#endif // QT_NO_LINEEDIT
-#endif //QT_NO_ITEMVIEWS
-
#endif //QITEMEDITORFACTORY_P_H
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 0b8019c21c..bda3325adb 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -39,7 +39,6 @@
#include "qstyleditemdelegate.h"
-#ifndef QT_NO_ITEMVIEWS
#include <qabstractitemmodel.h>
#include <qapplication.h>
#include <qbrush.h>
@@ -643,5 +642,3 @@ bool QStyledItemDelegate::editorEvent(QEvent *event,
QT_END_NAMESPACE
#include "moc_qstyleditemdelegate.cpp"
-
-#endif // QT_NO_ITEMVIEWS
diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h
index d30e6e0e9c..f3b7c4d1f4 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.h
+++ b/src/widgets/itemviews/qstyleditemdelegate.h
@@ -46,10 +46,9 @@
#include <QtGui/qpixmap.h>
#include <QtCore/qvariant.h>
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(itemviews);
-#ifndef QT_NO_ITEMVIEWS
+QT_BEGIN_NAMESPACE
class QStyledItemDelegatePrivate;
class QItemEditorFactory;
@@ -101,8 +100,6 @@ private:
Q_DISABLE_COPY(QStyledItemDelegate)
};
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QSTYLEDITEMDELEGATE_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 18:53:44 +0000