summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui.pro1
-rw-r--r--src/gui/itemmodels/itemmodels.pri6
-rw-r--r--src/gui/itemmodels/qstandarditemmodel.cpp (renamed from src/widgets/itemviews/qstandarditemmodel.cpp)16
-rw-r--r--src/gui/itemmodels/qstandarditemmodel.h (renamed from src/widgets/itemviews/qstandarditemmodel.h)8
-rw-r--r--src/gui/itemmodels/qstandarditemmodel_p.h (renamed from src/widgets/itemviews/qstandarditemmodel_p.h)31
-rw-r--r--src/widgets/itemviews/itemviews.pri3
-rw-r--r--src/widgets/widgets/qcombobox_p.h2
7 files changed, 49 insertions, 18 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index ab4e555f8b..277000aac1 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -28,6 +28,7 @@ include(util/util.pri)
include(math3d/math3d.pri)
include(opengl/opengl.pri)
include(animation/animation.pri)
+include(itemmodels/itemmodels.pri)
QMAKE_LIBS += $$QMAKE_LIBS_GUI
diff --git a/src/gui/itemmodels/itemmodels.pri b/src/gui/itemmodels/itemmodels.pri
new file mode 100644
index 0000000000..65bcd7c1ba
--- /dev/null
+++ b/src/gui/itemmodels/itemmodels.pri
@@ -0,0 +1,6 @@
+HEADERS += \
+ itemmodels/qstandarditemmodel.h \
+ itemmodels/qstandarditemmodel_p.h \
+
+SOURCES += \
+ itemmodels/qstandarditemmodel.cpp \
diff --git a/src/widgets/itemviews/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 45ffa249e5..2d296a0e59 100644
--- a/src/widgets/itemviews/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -189,14 +189,14 @@ void QStandardItemPrivate::setItemData(const QMap<int, QVariant> &roles)
Q_Q(QStandardItem);
//let's build the vector of new values
- QVector<QWidgetItemData> newValues;
+ QVector<QStandardItemData> newValues;
QMap<int, QVariant>::const_iterator it;
for (it = roles.begin(); it != roles.end(); ++it) {
QVariant value = it.value();
if (value.isValid()) {
int role = it.key();
role = (role == Qt::EditRole) ? Qt::DisplayRole : role;
- QWidgetItemData wid(role,it.value());
+ QStandardItemData wid(role,it.value());
newValues.append(wid);
}
}
@@ -214,7 +214,7 @@ void QStandardItemPrivate::setItemData(const QMap<int, QVariant> &roles)
const QMap<int, QVariant> QStandardItemPrivate::itemData() const
{
QMap<int, QVariant> result;
- QVector<QWidgetItemData>::const_iterator it;
+ QVector<QStandardItemData>::const_iterator it;
for (it = values.begin(); it != values.end(); ++it)
result.insert((*it).role, (*it).value);
return result;
@@ -614,7 +614,7 @@ void QStandardItemModelPrivate::columnsRemoved(QStandardItem *parent,
QStandardItemModel class.
\since 4.2
\ingroup model-view
- \inmodule QtWidgets
+ \inmodule QtGui
Items usually contain text, icons, or checkboxes.
@@ -812,7 +812,7 @@ void QStandardItem::setData(const QVariant &value, int role)
{
Q_D(QStandardItem);
role = (role == Qt::EditRole) ? Qt::DisplayRole : role;
- QVector<QWidgetItemData>::iterator it;
+ QVector<QStandardItemData>::iterator it;
for (it = d->values.begin(); it != d->values.end(); ++it) {
if ((*it).role == role) {
if (value.isValid()) {
@@ -827,7 +827,7 @@ void QStandardItem::setData(const QVariant &value, int role)
return;
}
}
- d->values.append(QWidgetItemData(role, value));
+ d->values.append(QStandardItemData(role, value));
if (d->model)
d->model->d_func()->itemChanged(this);
}
@@ -843,7 +843,7 @@ QVariant QStandardItem::data(int role) const
{
Q_D(const QStandardItem);
role = (role == Qt::EditRole) ? Qt::DisplayRole : role;
- QVector<QWidgetItemData>::const_iterator it;
+ QVector<QStandardItemData>::const_iterator it;
for (it = d->values.begin(); it != d->values.end(); ++it) {
if ((*it).role == role)
return (*it).value;
@@ -1954,7 +1954,7 @@ QDataStream &operator<<(QDataStream &out, const QStandardItem &item)
\class QStandardItemModel
\brief The QStandardItemModel class provides a generic model for storing custom data.
\ingroup model-view
- \inmodule QtWidgets
+ \inmodule QtGui
QStandardItemModel can be used as a repository for standard Qt
data types. It is one of the \l {Model/View Classes} and is part
diff --git a/src/widgets/itemviews/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h
index 2f449ab97a..8b3bc1c9be 100644
--- a/src/widgets/itemviews/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@@ -62,7 +62,7 @@ template <class T> class QList;
class QStandardItemModel;
class QStandardItemPrivate;
-class Q_WIDGETS_EXPORT QStandardItem
+class Q_GUI_EXPORT QStandardItem
{
public:
QStandardItem();
@@ -314,7 +314,7 @@ inline void QStandardItem::appendRow(QStandardItem *aitem)
class QStandardItemModelPrivate;
-class Q_WIDGETS_EXPORT QStandardItemModel : public QAbstractItemModel
+class Q_GUI_EXPORT QStandardItemModel : public QAbstractItemModel
{
Q_OBJECT
Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole)
@@ -444,8 +444,8 @@ inline bool QStandardItemModel::insertColumn(int acolumn, const QModelIndex &apa
{ return QAbstractItemModel::insertColumn(acolumn, aparent); }
#ifndef QT_NO_DATASTREAM
-Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item);
-Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item);
+Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item);
+Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item);
#endif
#endif // QT_NO_STANDARDITEMMODEL
diff --git a/src/widgets/itemviews/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index 8278bd195b..ba43bbd5dc 100644
--- a/src/widgets/itemviews/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -57,7 +57,6 @@
#ifndef QT_NO_STANDARDITEMMODEL
-#include <private/qwidgetitemdata_p.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qstack.h>
@@ -66,6 +65,34 @@
QT_BEGIN_NAMESPACE
+class QStandardItemData
+{
+public:
+ inline QStandardItemData() : role(-1) {}
+ inline QStandardItemData(int r, QVariant v) : role(r), value(v) {}
+ int role;
+ QVariant value;
+ inline bool operator==(const QStandardItemData &other) const { return role == other.role && value == other.value; }
+};
+
+#ifndef QT_NO_DATASTREAM
+
+inline QDataStream &operator>>(QDataStream &in, QStandardItemData &data)
+{
+ in >> data.role;
+ in >> data.value;
+ return in;
+}
+
+inline QDataStream &operator<<(QDataStream &out, const QStandardItemData &data)
+{
+ out << data.role;
+ out << data.value;
+ return out;
+}
+
+#endif // QT_NO_DATASTREAM
+
class QStandardItemPrivate
{
Q_DECLARE_PUBLIC(QStandardItem)
@@ -126,7 +153,7 @@ public:
QStandardItemModel *model;
QStandardItem *parent;
- QVector<QWidgetItemData> values;
+ QVector<QStandardItemData> values;
QVector<QStandardItem*> children;
int rows;
int columns;
diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
index d5a5012f83..fa44b0b997 100644
--- a/src/widgets/itemviews/itemviews.pri
+++ b/src/widgets/itemviews/itemviews.pri
@@ -25,8 +25,6 @@ HEADERS += \
itemviews/qproxymodel_p.h \
itemviews/qitemeditorfactory.h \
itemviews/qitemeditorfactory_p.h \
- itemviews/qstandarditemmodel.h \
- itemviews/qstandarditemmodel_p.h \
itemviews/qtreewidgetitemiterator.h \
itemviews/qdatawidgetmapper.h \
itemviews/qfileiconprovider.h \
@@ -50,7 +48,6 @@ SOURCES += \
itemviews/qtreewidget.cpp \
itemviews/qproxymodel.cpp \
itemviews/qitemeditorfactory.cpp \
- itemviews/qstandarditemmodel.cpp \
itemviews/qtreewidgetitemiterator.cpp \
itemviews/qdatawidgetmapper.cpp \
itemviews/qfileiconprovider.cpp \
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index 68b52aeac2..dbb23973f1 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -59,7 +59,7 @@
#include "QtWidgets/qabstractslider.h"
#include "QtWidgets/qapplication.h"
#include "QtWidgets/qitemdelegate.h"
-#include "QtWidgets/qstandarditemmodel.h"
+#include "QtGui/qstandarditemmodel.h"
#include "QtWidgets/qlineedit.h"
#include "QtWidgets/qlistview.h"
#include "QtGui/qpainter.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 12:13:26 +0000