include(math3d/math3d.pri)
include(opengl/opengl.pri)
include(animation/animation.pri)
+include(itemmodels/itemmodels.pri)
QMAKE_LIBS += $$QMAKE_LIBS_GUI
--- /dev/null
+HEADERS += \
+ itemmodels/qstandarditemmodel.h \
+ itemmodels/qstandarditemmodel_p.h \
+
+SOURCES += \
+ itemmodels/qstandarditemmodel.cpp \
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);
}
}
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;
QStandardItemModel class.
\since 4.2
\ingroup model-view
- \inmodule QtWidgets
+ \inmodule QtGui
Items usually contain text, icons, or checkboxes.
{
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()) {
return;
}
}
- d->values.append(QWidgetItemData(role, value));
+ d->values.append(QStandardItemData(role, value));
if (d->model)
d->model->d_func()->itemChanged(this);
}
{
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;
\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
class QStandardItemModel;
class QStandardItemPrivate;
-class Q_WIDGETS_EXPORT QStandardItem
+class Q_GUI_EXPORT QStandardItem
{
public:
QStandardItem();
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)
{ 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
#ifndef QT_NO_STANDARDITEMMODEL
-#include <private/qwidgetitemdata_p.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qstack.h>
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)
QStandardItemModel *model;
QStandardItem *parent;
- QVector<QWidgetItemData> values;
+ QVector<QStandardItemData> values;
QVector<QStandardItem*> children;
int rows;
int columns;
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 \
itemviews/qtreewidget.cpp \
itemviews/qproxymodel.cpp \
itemviews/qitemeditorfactory.cpp \
- itemviews/qstandarditemmodel.cpp \
itemviews/qtreewidgetitemiterator.cpp \
itemviews/qdatawidgetmapper.cpp \
itemviews/qfileiconprovider.cpp \
#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"
"qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",
"QPlatformMenu" => "qpa/qplatformmenu.h",
"QPlatformMenuAction" => "qpa/qplatformmenu.h",
- "QPlatformMenuBar" => "qpa/qplatformmenu.h"
+ "QPlatformMenuBar" => "qpa/qplatformmenu.h",
+ "QStandardItem" => "QtGui/QStandardItem",
+ "QStandardItemModel" => "QtGui/QStandardItemModel",
+ "qstandarditem.h" => "QtGui/qstandarditem.h",
+ "qstandarditemmodel.h" => "QtGui/qstandarditemmodel.h"
},
"QtPrintSupport" => {
"qplatformprintersupport_qpa.h" => "qpa/qplatformprintersupport.h",
mtdir = ../../../other/modeltest
INCLUDEPATH += $$PWD/$${mtdir}
-QT += widgets testlib
+QT += testlib
SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
#include <QtTest/QtTest>
#include <QtCore/QCoreApplication>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
#include "dynamictreemodel.h"
#include "qidentityproxymodel.h"
#include "modeltest.h"
#include <QtCore/QCoreApplication>
-#include <QtWidgets/QStandardItem>
+#include <QtGui/QStandardItem>
#include <QtWidgets/QTreeView>
#include <QtWidgets/QTableView>
qopengl \
text \
util \
+ itemmodels \
--- /dev/null
+TEMPLATE=subdirs
+SUBDIRS= \
+ qstandarditem \
+ qstandarditemmodel \
CONFIG += testcase
CONFIG += parallel_test
TARGET = tst_qstandarditem
-QT += widgets testlib
+QT += gui testlib
SOURCES += tst_qstandarditem.cpp
qitemview \
qlistview \
qlistwidget \
- qstandarditem \
- qstandarditemmodel \
qtableview \
qtablewidget \
qtreeview \