**
****************************************************************************/
-#include "qsgvisualadaptormodel_p.h"
-#include "qsgitem.h"
+#include "qquickvisualadaptormodel_p.h"
+#include "qquickitem.h"
#include <QtDeclarative/qdeclarativecontext.h>
#include <QtDeclarative/qdeclarativeengine.h>
QMetaObjectBuilder builder;
};
-class QSGVisualAdaptorModelData : public QObject
+class QQuickVisualAdaptorModelData : public QObject
{
Q_OBJECT
Q_PROPERTY(int index READ index NOTIFY indexChanged)
public:
- QSGVisualAdaptorModelData(int index, QSGVisualAdaptorModel *model);
- ~QSGVisualAdaptorModelData();
+ QQuickVisualAdaptorModelData(int index, QQuickVisualAdaptorModel *model);
+ ~QQuickVisualAdaptorModelData();
int index() const;
void setIndex(int index);
public:
int m_index;
- QDeclarativeGuard<QSGVisualAdaptorModel> m_model;
+ QDeclarativeGuard<QQuickVisualAdaptorModel> m_model;
QIntrusiveListNode m_cacheNode;
};
-typedef QIntrusiveList<QSGVisualAdaptorModelData, &QSGVisualAdaptorModelData::m_cacheNode> QSGVisualAdaptorModelDataCache;
+typedef QIntrusiveList<QQuickVisualAdaptorModelData, &QQuickVisualAdaptorModelData::m_cacheNode> QQuickVisualAdaptorModelDataCache;
-class QSGVisualAdaptorModelDataMetaObject;
-class QSGVisualAdaptorModelPrivate : public QObjectPrivate
+class QQuickVisualAdaptorModelDataMetaObject;
+class QQuickVisualAdaptorModelPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QSGVisualAdaptorModel)
+ Q_DECLARE_PUBLIC(QQuickVisualAdaptorModel)
public:
- QSGVisualAdaptorModelPrivate()
+ QQuickVisualAdaptorModelPrivate()
: m_engine(0)
, m_listAccessor(0)
, m_delegateDataType(0)
}
- static QSGVisualAdaptorModelPrivate *get(QSGVisualAdaptorModel *m) {
- return static_cast<QSGVisualAdaptorModelPrivate *>(QObjectPrivate::get(m));
+ static QQuickVisualAdaptorModelPrivate *get(QQuickVisualAdaptorModel *m) {
+ return static_cast<QQuickVisualAdaptorModelPrivate *>(QObjectPrivate::get(m));
}
void addProperty(int role, int propertyId, const char *propertyName, const char *propertyType, bool isModelData = false);
m_delegateDataType->propertyOffset = T::staticMetaObject.propertyCount();
m_delegateDataType->signalOffset = T::staticMetaObject.methodCount();
}
- QSGVisualAdaptorModelData *createMetaObject(int index, QSGVisualAdaptorModel *model);
+ QQuickVisualAdaptorModelData *createMetaObject(int index, QQuickVisualAdaptorModel *model);
- static QSGVisualAdaptorModelData *initializeModelData(int index, QSGVisualAdaptorModel *model) {
+ static QQuickVisualAdaptorModelData *initializeModelData(int index, QQuickVisualAdaptorModel *model) {
return get(model)->createMetaObject(index, model);
}
- typedef QSGVisualAdaptorModelData *(*CreateModelData)(int index, QSGVisualAdaptorModel *model);
+ typedef QQuickVisualAdaptorModelData *(*CreateModelData)(int index, QQuickVisualAdaptorModel *model);
struct PropertyData {
int role;
int m_ref;
int m_count;
- QSGVisualAdaptorModel::Flags m_flags;
+ QQuickVisualAdaptorModel::Flags m_flags;
bool m_objectList : 1;
QVariant m_modelVariant;
QList<QByteArray> watchedRoles;
QHash<QByteArray,int> m_roleNames;
QVector<PropertyData> m_propertyData;
- QSGVisualAdaptorModelDataCache m_cache;
+ QQuickVisualAdaptorModelDataCache m_cache;
};
-class QSGVisualAdaptorModelDataMetaObject : public QAbstractDynamicMetaObject
+class QQuickVisualAdaptorModelDataMetaObject : public QAbstractDynamicMetaObject
{
public:
- QSGVisualAdaptorModelDataMetaObject(QSGVisualAdaptorModelData *data, VDMDelegateDataType *type)
+ QQuickVisualAdaptorModelDataMetaObject(QQuickVisualAdaptorModelData *data, VDMDelegateDataType *type)
: m_data(data)
, m_type(type)
{
m_type->addref();
}
- ~QSGVisualAdaptorModelDataMetaObject() { m_type->release(); }
+ ~QQuickVisualAdaptorModelDataMetaObject() { m_type->release(); }
- QSGVisualAdaptorModelData *m_data;
+ QQuickVisualAdaptorModelData *m_data;
VDMDelegateDataType *m_type;
};
-class QSGVDMAbstractItemModelDataMetaObject : public QSGVisualAdaptorModelDataMetaObject
+class QQuickVDMAbstractItemModelDataMetaObject : public QQuickVisualAdaptorModelDataMetaObject
{
public:
- QSGVDMAbstractItemModelDataMetaObject(QSGVisualAdaptorModelData *object, VDMDelegateDataType *type)
- : QSGVisualAdaptorModelDataMetaObject(object, type) {}
+ QQuickVDMAbstractItemModelDataMetaObject(QQuickVisualAdaptorModelData *object, VDMDelegateDataType *type)
+ : QQuickVisualAdaptorModelDataMetaObject(object, type) {}
int metaCall(QMetaObject::Call call, int id, void **arguments)
{
if (call == QMetaObject::ReadProperty && id >= m_type->propertyOffset) {
- QSGVisualAdaptorModelPrivate *model = QSGVisualAdaptorModelPrivate::get(m_data->m_model);
+ QQuickVisualAdaptorModelPrivate *model = QQuickVisualAdaptorModelPrivate::get(m_data->m_model);
if (m_data->m_index == -1 || !model->m_abstractItemModel)
return -1;
*static_cast<QVariant *>(arguments[0]) = model->m_abstractItemModel->index(
}
};
-class QSGVDMAbstractItemModelData : public QSGVisualAdaptorModelData
+class QQuickVDMAbstractItemModelData : public QQuickVisualAdaptorModelData
{
Q_OBJECT
Q_PROPERTY(bool hasModelChildren READ hasModelChildren CONSTANT)
public:
bool hasModelChildren() const
{
- QSGVisualAdaptorModelPrivate *model = QSGVisualAdaptorModelPrivate::get(m_model);
+ QQuickVisualAdaptorModelPrivate *model = QQuickVisualAdaptorModelPrivate::get(m_model);
return model->m_abstractItemModel->hasChildren(model->m_abstractItemModel->index(m_index, 0, model->m_root));
}
- static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
- return new QSGVDMAbstractItemModelData(index, model); }
+ static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+ return new QQuickVDMAbstractItemModelData(index, model); }
private:
- QSGVDMAbstractItemModelData(int index, QSGVisualAdaptorModel *model)
- : QSGVisualAdaptorModelData(index, model)
+ QQuickVDMAbstractItemModelData(int index, QQuickVisualAdaptorModel *model)
+ : QQuickVisualAdaptorModelData(index, model)
{
- new QSGVDMAbstractItemModelDataMetaObject(
- this, QSGVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
+ new QQuickVDMAbstractItemModelDataMetaObject(
+ this, QQuickVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
}
};
-class QSGVDMListModelInterfaceDataMetaObject : public QSGVisualAdaptorModelDataMetaObject
+class QQuickVDMListModelInterfaceDataMetaObject : public QQuickVisualAdaptorModelDataMetaObject
{
public:
- QSGVDMListModelInterfaceDataMetaObject(QSGVisualAdaptorModelData *object, VDMDelegateDataType *type)
- : QSGVisualAdaptorModelDataMetaObject(object, type) {}
+ QQuickVDMListModelInterfaceDataMetaObject(QQuickVisualAdaptorModelData *object, VDMDelegateDataType *type)
+ : QQuickVisualAdaptorModelDataMetaObject(object, type) {}
int metaCall(QMetaObject::Call call, int id, void **arguments)
{
if (call == QMetaObject::ReadProperty && id >= m_type->propertyOffset) {
- QSGVisualAdaptorModelPrivate *model = QSGVisualAdaptorModelPrivate::get(m_data->m_model);
+ QQuickVisualAdaptorModelPrivate *model = QQuickVisualAdaptorModelPrivate::get(m_data->m_model);
if (m_data->m_index == -1 || !model->m_listModelInterface)
return -1;
*static_cast<QVariant *>(arguments[0]) = model->m_listModelInterface->data(
}
};
-class QSGVDMListModelInterfaceData : public QSGVisualAdaptorModelData
+class QQuickVDMListModelInterfaceData : public QQuickVisualAdaptorModelData
{
public:
- static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
- return new QSGVDMListModelInterfaceData(index, model); }
+ static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+ return new QQuickVDMListModelInterfaceData(index, model); }
private:
- QSGVDMListModelInterfaceData(int index, QSGVisualAdaptorModel *model)
- : QSGVisualAdaptorModelData(index, model)
+ QQuickVDMListModelInterfaceData(int index, QQuickVisualAdaptorModel *model)
+ : QQuickVisualAdaptorModelData(index, model)
{
- new QSGVDMListModelInterfaceDataMetaObject(
- this, QSGVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
+ new QQuickVDMListModelInterfaceDataMetaObject(
+ this, QQuickVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
}
};
-class QSGVDMListAccessorData : public QSGVisualAdaptorModelData
+class QQuickVDMListAccessorData : public QQuickVisualAdaptorModelData
{
Q_OBJECT
Q_PROPERTY(QVariant modelData READ modelData CONSTANT)
public:
QVariant modelData() const {
- return QSGVisualAdaptorModelPrivate::get(m_model)->m_listAccessor->at(m_index); }
+ return QQuickVisualAdaptorModelPrivate::get(m_model)->m_listAccessor->at(m_index); }
- static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
- return new QSGVDMListAccessorData(index, model); }
+ static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+ return new QQuickVDMListAccessorData(index, model); }
private:
- QSGVDMListAccessorData(int index, QSGVisualAdaptorModel *model)
- : QSGVisualAdaptorModelData(index, model)
+ QQuickVDMListAccessorData(int index, QQuickVisualAdaptorModel *model)
+ : QQuickVisualAdaptorModelData(index, model)
{
}
};
-class QSGVDMObjectDataMetaObject : public QSGVisualAdaptorModelDataMetaObject
+class QQuickVDMObjectDataMetaObject : public QQuickVisualAdaptorModelDataMetaObject
{
public:
- QSGVDMObjectDataMetaObject(QSGVisualAdaptorModelData *data, VDMDelegateDataType *type)
- : QSGVisualAdaptorModelDataMetaObject(data, type)
- , m_object(QSGVisualAdaptorModelPrivate::get(data->m_model)->m_listAccessor->at(data->m_index).value<QObject *>())
+ QQuickVDMObjectDataMetaObject(QQuickVisualAdaptorModelData *data, VDMDelegateDataType *type)
+ : QQuickVisualAdaptorModelDataMetaObject(data, type)
+ , m_object(QQuickVisualAdaptorModelPrivate::get(data->m_model)->m_listAccessor->at(data->m_index).value<QObject *>())
{}
int metaCall(QMetaObject::Call call, int id, void **arguments)
QDeclarativeGuard<QObject> m_object;
};
-class QSGVDMObjectData : public QSGVisualAdaptorModelData, public QSGVisualAdaptorModelProxyInterface
+class QQuickVDMObjectData : public QQuickVisualAdaptorModelData, public QQuickVisualAdaptorModelProxyInterface
{
Q_OBJECT
Q_PROPERTY(QObject *modelData READ modelData CONSTANT)
- Q_INTERFACES(QSGVisualAdaptorModelProxyInterface)
+ Q_INTERFACES(QQuickVisualAdaptorModelProxyInterface)
public:
QObject *modelData() const { return m_metaObject->m_object; }
QObject *proxiedObject() { return m_metaObject->m_object; }
- static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
- return new QSGVDMObjectData(index, model); }
+ static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+ return new QQuickVDMObjectData(index, model); }
private:
- QSGVDMObjectData(int index, QSGVisualAdaptorModel *model)
- : QSGVisualAdaptorModelData(index, model)
- , m_metaObject(new QSGVDMObjectDataMetaObject(this, QSGVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType))
+ QQuickVDMObjectData(int index, QQuickVisualAdaptorModel *model)
+ : QQuickVisualAdaptorModelData(index, model)
+ , m_metaObject(new QQuickVDMObjectDataMetaObject(this, QQuickVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType))
{
}
- QSGVDMObjectDataMetaObject *m_metaObject;
+ QQuickVDMObjectDataMetaObject *m_metaObject;
};
-void QSGVisualAdaptorModelPrivate::addProperty(
+void QQuickVisualAdaptorModelPrivate::addProperty(
int role, int propertyId, const char *propertyName, const char *propertyType, bool isModelData)
{
PropertyData propertyData;
m_propertyData.append(propertyData);
}
-QSGVisualAdaptorModelData *QSGVisualAdaptorModelPrivate::createMetaObject(int index, QSGVisualAdaptorModel *model)
+QQuickVisualAdaptorModelData *QQuickVisualAdaptorModelPrivate::createMetaObject(int index, QQuickVisualAdaptorModel *model)
{
Q_ASSERT(!m_delegateDataType);
if (m_listAccessor
&& m_listAccessor->type() != QDeclarativeListAccessor::ListProperty
&& m_listAccessor->type() != QDeclarativeListAccessor::Instance) {
- createModelData = &QSGVDMListAccessorData::create;
- m_flags = QSGVisualAdaptorModel::MetaObjectCacheable;
- return QSGVDMListAccessorData::create(index, model);
+ createModelData = &QQuickVDMListAccessorData::create;
+ m_flags = QQuickVisualAdaptorModel::MetaObjectCacheable;
+ return QQuickVDMListAccessorData::create(index, model);
}
m_delegateDataType = new VDMDelegateDataType;
if (m_listModelInterface) {
- setModelDataType<QSGVDMListModelInterfaceData>();
+ setModelDataType<QQuickVDMListModelInterfaceData>();
QList<int> roles = m_listModelInterface->roles();
for (int propertyId = 0; propertyId < roles.count(); ++propertyId) {
const int role = roles.at(propertyId);
}
if (m_propertyData.count() == 1)
addProperty(roles.first(), 1, "modelData", "QVariant", true);
- m_flags = QSGVisualAdaptorModel::MetaObjectCacheable;
+ m_flags = QQuickVisualAdaptorModel::MetaObjectCacheable;
} else if (m_abstractItemModel) {
- setModelDataType<QSGVDMAbstractItemModelData>();
+ setModelDataType<QQuickVDMAbstractItemModelData>();
QHash<int, QByteArray> roleNames = m_abstractItemModel->roleNames();
for (QHash<int, QByteArray>::const_iterator it = roleNames.begin(); it != roleNames.end(); ++it) {
addProperty(it.key(), m_propertyData.count(), it.value(), "QVariant");
}
if (m_propertyData.count() == 1)
addProperty(roleNames.begin().key(), 1, "modelData", "QVariant", true);
- m_flags = QSGVisualAdaptorModel::MetaObjectCacheable;
+ m_flags = QQuickVisualAdaptorModel::MetaObjectCacheable;
} else if (m_listAccessor) {
- setModelDataType<QSGVDMObjectData>();
+ setModelDataType<QQuickVDMObjectData>();
m_objectList = true;
- m_flags = QSGVisualAdaptorModel::ProxiedObject;
+ m_flags = QQuickVisualAdaptorModel::ProxiedObject;
} else {
Q_ASSERT(!"No model set on VisualDataModel");
return 0;
return createModelData(index, model);
}
-QSGVisualAdaptorModelData::QSGVisualAdaptorModelData(int index, QSGVisualAdaptorModel *model)
+QQuickVisualAdaptorModelData::QQuickVisualAdaptorModelData(int index, QQuickVisualAdaptorModel *model)
: m_index(index)
, m_model(model)
{
}
-QSGVisualAdaptorModelData::~QSGVisualAdaptorModelData()
+QQuickVisualAdaptorModelData::~QQuickVisualAdaptorModelData()
{
}
-int QSGVisualAdaptorModelData::index() const
+int QQuickVisualAdaptorModelData::index() const
{
return m_index;
}
// This is internal only - it should not be set from qml
-void QSGVisualAdaptorModelData::setIndex(int index)
+void QQuickVisualAdaptorModelData::setIndex(int index)
{
m_index = index;
emit indexChanged();
//---------------------------------------------------------------------------
-QSGVisualAdaptorModel::QSGVisualAdaptorModel(QObject *parent)
- : QObject(*(new QSGVisualAdaptorModelPrivate), parent)
+QQuickVisualAdaptorModel::QQuickVisualAdaptorModel(QObject *parent)
+ : QObject(*(new QQuickVisualAdaptorModelPrivate), parent)
{
}
-QSGVisualAdaptorModel::~QSGVisualAdaptorModel()
+QQuickVisualAdaptorModel::~QQuickVisualAdaptorModel()
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (d->m_listAccessor)
delete d->m_listAccessor;
if (d->m_delegateDataType)
d->m_delegateDataType->release();
}
-QSGVisualAdaptorModel::Flags QSGVisualAdaptorModel::flags() const
+QQuickVisualAdaptorModel::Flags QQuickVisualAdaptorModel::flags() const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
return d->m_flags;
}
-QVariant QSGVisualAdaptorModel::model() const
+QVariant QQuickVisualAdaptorModel::model() const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
return d->m_modelVariant;
}
-void QSGVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *engine)
+void QQuickVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *engine)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
delete d->m_listAccessor;
d->m_engine = engine;
d->m_listAccessor = 0;
d->m_roles.clear();
d->m_roleNames.clear();
- d->m_flags = QSGVisualAdaptorModel::Flags();
+ d->m_flags = QQuickVisualAdaptorModel::Flags();
if (d->m_delegateDataType)
d->m_delegateDataType->release();
d->m_delegateDataType = 0;
- d->createModelData = &QSGVisualAdaptorModelPrivate::initializeModelData;
+ d->createModelData = &QQuickVisualAdaptorModelPrivate::initializeModelData;
if (d->m_count)
emit itemsRemoved(0, d->m_count);
emit itemsInserted(0, d->m_count);
}
-QVariant QSGVisualAdaptorModel::rootIndex() const
+QVariant QQuickVisualAdaptorModel::rootIndex() const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
return QVariant::fromValue(d->m_root);
}
-void QSGVisualAdaptorModel::setRootIndex(const QVariant &root)
+void QQuickVisualAdaptorModel::setRootIndex(const QVariant &root)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
QModelIndex modelIndex = qvariant_cast<QModelIndex>(root);
if (d->m_root != modelIndex) {
int oldCount = d->modelCount();
}
}
-QVariant QSGVisualAdaptorModel::modelIndex(int idx) const
+QVariant QQuickVisualAdaptorModel::modelIndex(int idx) const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
if (d->m_abstractItemModel)
return QVariant::fromValue(d->m_abstractItemModel->index(idx, 0, d->m_root));
return QVariant::fromValue(QModelIndex());
}
-QVariant QSGVisualAdaptorModel::parentModelIndex() const
+QVariant QQuickVisualAdaptorModel::parentModelIndex() const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
if (d->m_abstractItemModel)
return QVariant::fromValue(d->m_abstractItemModel->parent(d->m_root));
return QVariant::fromValue(QModelIndex());
}
-int QSGVisualAdaptorModel::count() const
+int QQuickVisualAdaptorModel::count() const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
return d->modelCount();
}
-QObject *QSGVisualAdaptorModel::data(int index)
+QObject *QQuickVisualAdaptorModel::data(int index)
{
- Q_D(QSGVisualAdaptorModel);
- QSGVisualAdaptorModelData *data = d->createModelData(index, this);
+ Q_D(QQuickVisualAdaptorModel);
+ QQuickVisualAdaptorModelData *data = d->createModelData(index, this);
d->m_cache.insert(data);
return data;
}
-QString QSGVisualAdaptorModel::stringValue(int index, const QString &name)
+QString QQuickVisualAdaptorModel::stringValue(int index, const QString &name)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if ((!d->m_listModelInterface || !d->m_abstractItemModel) && d->m_listAccessor) {
if (QObject *object = d->m_listAccessor->at(index).value<QObject*>())
return object->property(name.toUtf8()).toString();
}
QString val;
- QSGVisualAdaptorModelData *data = d->createModelData(index, this);
+ QQuickVisualAdaptorModelData *data = d->createModelData(index, this);
QDeclarativeData *ddata = QDeclarativeData::get(data);
if (ddata && ddata->propertyCache) {
return val;
}
-int QSGVisualAdaptorModel::indexOf(QObject *object) const
+int QQuickVisualAdaptorModel::indexOf(QObject *object) const
{
- if (QSGVisualAdaptorModelData *data = qobject_cast<QSGVisualAdaptorModelData *>(object))
+ if (QQuickVisualAdaptorModelData *data = qobject_cast<QQuickVisualAdaptorModelData *>(object))
return data->index();
return -1;
}
-bool QSGVisualAdaptorModel::canFetchMore() const
+bool QQuickVisualAdaptorModel::canFetchMore() const
{
- Q_D(const QSGVisualAdaptorModel);
+ Q_D(const QQuickVisualAdaptorModel);
return d->m_abstractItemModel && d->m_abstractItemModel->canFetchMore(d->m_root);
}
-void QSGVisualAdaptorModel::fetchMore()
+void QQuickVisualAdaptorModel::fetchMore()
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (d->m_abstractItemModel)
d->m_abstractItemModel->fetchMore(d->m_root);
}
-void QSGVisualAdaptorModel::replaceWatchedRoles(const QList<QByteArray> &oldRoles, const QList<QByteArray> &newRoles)
+void QQuickVisualAdaptorModel::replaceWatchedRoles(const QList<QByteArray> &oldRoles, const QList<QByteArray> &newRoles)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
d->watchedRoleIds.clear();
foreach (const QByteArray &oldRole, oldRoles)
d->watchedRoles.removeOne(oldRole);
d->watchedRoles += newRoles;
}
-void QSGVisualAdaptorModel::_q_itemsChanged(int index, int count, const QList<int> &roles)
+void QQuickVisualAdaptorModel::_q_itemsChanged(int index, int count, const QList<int> &roles)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
bool changed = roles.isEmpty();
if (!d->watchedRoles.isEmpty() && d->watchedRoleIds.isEmpty()) {
foreach (QByteArray r, d->watchedRoles) {
signalIndexes.append(propertyId + d->m_delegateDataType->signalOffset);
}
- typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+ typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
const int idx = it->index();
if (idx >= index && idx < index + count) {
- QSGVisualAdaptorModelData *data = *it;
+ QQuickVisualAdaptorModelData *data = *it;
for (int i = 0; i < signalIndexes.count(); ++i)
QMetaObject::activate(data, signalIndexes.at(i), 0);
}
emit itemsChanged(index, count);
}
-void QSGVisualAdaptorModel::_q_itemsInserted(int index, int count)
+void QQuickVisualAdaptorModel::_q_itemsInserted(int index, int count)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (count <= 0)
return;
d->m_count += count;
- typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+ typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
if (it->index() >= index)
it->setIndex(it->index() + count);
emit itemsInserted(index, count);
}
-void QSGVisualAdaptorModel::_q_itemsRemoved(int index, int count)
+void QQuickVisualAdaptorModel::_q_itemsRemoved(int index, int count)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (count <= 0)
return;
d->m_count -= count;
- typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+ typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
if (it->index() >= index + count)
it->setIndex(it->index() - count);
emit itemsRemoved(index, count);
}
-void QSGVisualAdaptorModel::_q_itemsMoved(int from, int to, int count)
+void QQuickVisualAdaptorModel::_q_itemsMoved(int from, int to, int count)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
const int minimum = qMin(from, to);
const int maximum = qMax(from, to) + count;
const int difference = from > to ? count : -count;
- typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+ typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
if (it->index() >= from && it->index() < from + count)
it->setIndex(it->index() - from + to);
emit itemsMoved(from, to, count);
}
-void QSGVisualAdaptorModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end)
+void QQuickVisualAdaptorModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (parent == d->m_root)
_q_itemsInserted(begin, end - begin + 1);
}
-void QSGVisualAdaptorModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end)
+void QQuickVisualAdaptorModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (parent == d->m_root)
_q_itemsRemoved(begin, end - begin + 1);
}
-void QSGVisualAdaptorModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
+void QQuickVisualAdaptorModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
const int count = sourceEnd - sourceStart + 1;
if (destinationParent == d->m_root && sourceParent == d->m_root) {
_q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-count, count);
}
}
-void QSGVisualAdaptorModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end)
+void QQuickVisualAdaptorModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end)
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
if (begin.parent() == d->m_root)
_q_itemsChanged(begin.row(), end.row() - begin.row() + 1, d->m_roles);
}
-void QSGVisualAdaptorModel::_q_layoutChanged()
+void QQuickVisualAdaptorModel::_q_layoutChanged()
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
_q_itemsChanged(0, count(), d->m_roles);
}
-void QSGVisualAdaptorModel::_q_modelReset()
+void QQuickVisualAdaptorModel::_q_modelReset()
{
- Q_D(QSGVisualAdaptorModel);
+ Q_D(QQuickVisualAdaptorModel);
int oldCount = d->m_count;
d->m_root = QModelIndex();
d->m_count = d->modelCount();
QML_DECLARE_TYPE(QListModelInterface)
-#include <qsgvisualadaptormodel.moc>
+#include <qquickvisualadaptormodel.moc>
projects / profile / ivi / qtdeclarative.git / blobdiff