summaryrefslogtreecommitdiffstats
path: root/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-26 08:21:15 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-29 12:35:09 +0200
commitb0f9c06a9b199a7474eb94a6292b5824364344b6 (patch)
tree15bfdcd6322d34b9dfeaf1f7b170219b0bab9fa0 /src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
parentbe1bb192955631c44a872014fcb631efc5fcfb8a (diff)
Use QList instead of QVector in corelib implementation
Omitting state machine and docs for now. Task-number: QTBUG-84469 Change-Id: Ibfa5e7035515773461f6cdbff35299315ef65737 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp')
-rw-r--r--src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
index 0e29714677..05baa7eed2 100644
--- a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
+++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
@@ -69,7 +69,7 @@ public:
void _q_slotColumnsInserted(const QModelIndex &parent, int, int);
void _q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
void _q_slotColumnsRemoved(const QModelIndex &parent, int, int);
- void _q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles);
+ void _q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QList<int> &roles);
void _q_slotSourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint);
void _q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint);
void _q_slotModelAboutToBeReset();
@@ -80,7 +80,7 @@ public:
bool mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent,
int *sourceRow, int *sourceColumn, QModelIndex *sourceParent, QAbstractItemModel **sourceModel) const;
- QVector<QAbstractItemModel *> m_models;
+ QList<QAbstractItemModel *> m_models;
int m_rowCount; // have to maintain it here since we can't compute during model destruction
int m_columnCount;
@@ -88,8 +88,8 @@ public:
int m_newColumnCount;
// for layoutAboutToBeChanged/layoutChanged
- QVector<QPersistentModelIndex> layoutChangePersistentIndexes;
- QVector<QModelIndex> layoutChangeProxyIndexes;
+ QList<QPersistentModelIndex> layoutChangePersistentIndexes;
+ QList<QModelIndex> layoutChangeProxyIndexes;
};
QConcatenateTablesProxyModelPrivate::QConcatenateTablesProxyModelPrivate()
@@ -470,7 +470,7 @@ void QConcatenateTablesProxyModel::addSourceModel(QAbstractItemModel *sourceMode
Q_D(QConcatenateTablesProxyModel);
Q_ASSERT(sourceModel);
Q_ASSERT(!d->m_models.contains(sourceModel));
- connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(_q_slotDataChanged(QModelIndex,QModelIndex,QVector<int>)));
+ connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), this, SLOT(_q_slotDataChanged(QModelIndex,QModelIndex,QList<int>)));
connect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(_q_slotRowsInserted(QModelIndex,int,int)));
connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(_q_slotRowsRemoved(QModelIndex,int,int)));
connect(sourceModel, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotRowsAboutToBeInserted(QModelIndex,int,int)));
@@ -617,7 +617,7 @@ void QConcatenateTablesProxyModelPrivate::_q_slotColumnsRemoved(const QModelInde
}
}
-void QConcatenateTablesProxyModelPrivate::_q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles)
+void QConcatenateTablesProxyModelPrivate::_q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QList<int> &roles)
{
Q_Q(QConcatenateTablesProxyModel);
Q_ASSERT(from.isValid());