diff options
Diffstat (limited to 'examples/widgets/itemviews')
16 files changed, 46 insertions, 49 deletions
diff --git a/examples/widgets/itemviews/addressbook/addresswidget.cpp b/examples/widgets/itemviews/addressbook/addresswidget.cpp index b1b65174ee..25706d1abe 100644 --- a/examples/widgets/itemviews/addressbook/addresswidget.cpp +++ b/examples/widgets/itemviews/addressbook/addresswidget.cpp @@ -201,7 +201,7 @@ void AddressWidget::readFromFile(const QString &fileName) return; } - QVector<Contact> contacts; + QList<Contact> contacts; QDataStream in(&file); in >> contacts; diff --git a/examples/widgets/itemviews/addressbook/tablemodel.cpp b/examples/widgets/itemviews/addressbook/tablemodel.cpp index ddf79a3fa3..aac4c92060 100644 --- a/examples/widgets/itemviews/addressbook/tablemodel.cpp +++ b/examples/widgets/itemviews/addressbook/tablemodel.cpp @@ -56,9 +56,8 @@ TableModel::TableModel(QObject *parent) { } -TableModel::TableModel(const QVector<Contact> &contacts, QObject *parent) - : QAbstractTableModel(parent), - contacts(contacts) +TableModel::TableModel(const QList<Contact> &contacts, QObject *parent) + : QAbstractTableModel(parent), contacts(contacts) { } //! [0] @@ -186,7 +185,7 @@ Qt::ItemFlags TableModel::flags(const QModelIndex &index) const //! [7] //! [8] -const QVector<Contact> &TableModel::getContacts() const +const QList<Contact> &TableModel::getContacts() const { return contacts; } diff --git a/examples/widgets/itemviews/addressbook/tablemodel.h b/examples/widgets/itemviews/addressbook/tablemodel.h index e4025fc734..c5bac4f4a4 100644 --- a/examples/widgets/itemviews/addressbook/tablemodel.h +++ b/examples/widgets/itemviews/addressbook/tablemodel.h @@ -52,7 +52,7 @@ #define TABLEMODEL_H #include <QAbstractTableModel> -#include <QVector> +#include <QList> //! [0] @@ -83,7 +83,7 @@ class TableModel : public QAbstractTableModel public: TableModel(QObject *parent = nullptr); - TableModel(const QVector<Contact> &contacts, QObject *parent = nullptr); + TableModel(const QList<Contact> &contacts, QObject *parent = nullptr); int rowCount(const QModelIndex &parent) const override; int columnCount(const QModelIndex &parent) const override; @@ -93,10 +93,10 @@ public: bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) override; bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) override; - const QVector<Contact> &getContacts() const; + const QList<Contact> &getContacts() const; private: - QVector<Contact> contacts; + QList<Contact> contacts; }; //! [0] diff --git a/examples/widgets/itemviews/chart/pieview.cpp b/examples/widgets/itemviews/chart/pieview.cpp index c640c78f3e..af77970633 100644 --- a/examples/widgets/itemviews/chart/pieview.cpp +++ b/examples/widgets/itemviews/chart/pieview.cpp @@ -59,9 +59,8 @@ PieView::PieView(QWidget *parent) verticalScrollBar()->setRange(0, 0); } -void PieView::dataChanged(const QModelIndex &topLeft, - const QModelIndex &bottomRight, - const QVector<int> &roles) +void PieView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, + const QList<int> &roles) { QAbstractItemView::dataChanged(topLeft, bottomRight, roles); diff --git a/examples/widgets/itemviews/chart/pieview.h b/examples/widgets/itemviews/chart/pieview.h index 22c74dde81..f92a443463 100644 --- a/examples/widgets/itemviews/chart/pieview.h +++ b/examples/widgets/itemviews/chart/pieview.h @@ -67,7 +67,7 @@ public: protected slots: void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector<int> &roles = QVector<int>()) override; + const QList<int> &roles = QList<int>()) override; void rowsInserted(const QModelIndex &parent, int start, int end) override; void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; diff --git a/examples/widgets/itemviews/coloreditorfactory/window.cpp b/examples/widgets/itemviews/coloreditorfactory/window.cpp index 25e196a80c..fde82accfd 100644 --- a/examples/widgets/itemviews/coloreditorfactory/window.cpp +++ b/examples/widgets/itemviews/coloreditorfactory/window.cpp @@ -71,10 +71,9 @@ Window::Window() void Window::createGUI() { - const QVector<QPair<QString, QColor> > list = - {{ tr("Alice"), QColor("aliceblue") }, - { tr("Neptun"), QColor("aquamarine") }, - { tr("Ferdinand"), QColor("springgreen") }}; + const QList<QPair<QString, QColor>> list = { { tr("Alice"), QColor("aliceblue") }, + { tr("Neptun"), QColor("aquamarine") }, + { tr("Ferdinand"), QColor("springgreen") } }; QTableWidget *table = new QTableWidget(3, 2); table->setHorizontalHeaderLabels({ tr("Name"), tr("Hair Color") }); diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp index 027a5f8849..e82c84a424 100644 --- a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp +++ b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp @@ -57,9 +57,8 @@ #include "treeitem.h" //! [0] -TreeItem::TreeItem(const QVector<QVariant> &data, TreeItem *parent) - : itemData(data), - parentItem(parent) +TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent) + : itemData(data), parentItem(parent) {} //! [0] @@ -118,7 +117,7 @@ bool TreeItem::insertChildren(int position, int count, int columns) return false; for (int row = 0; row < count; ++row) { - QVector<QVariant> data(columns); + QList<QVariant> data(columns); TreeItem *item = new TreeItem(data, this); childItems.insert(position, item); } diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.h b/examples/widgets/itemviews/editabletreemodel/treeitem.h index 867be5f380..b23697efe3 100644 --- a/examples/widgets/itemviews/editabletreemodel/treeitem.h +++ b/examples/widgets/itemviews/editabletreemodel/treeitem.h @@ -52,13 +52,13 @@ #define TREEITEM_H #include <QVariant> -#include <QVector> +#include <QList> //! [0] class TreeItem { public: - explicit TreeItem(const QVector<QVariant> &data, TreeItem *parent = nullptr); + explicit TreeItem(const QList<QVariant> &data, TreeItem *parent = nullptr); ~TreeItem(); TreeItem *child(int number); @@ -74,8 +74,8 @@ public: bool setData(int column, const QVariant &value); private: - QVector<TreeItem*> childItems; - QVector<QVariant> itemData; + QList<TreeItem *> childItems; + QList<QVariant> itemData; TreeItem *parentItem; }; //! [0] diff --git a/examples/widgets/itemviews/editabletreemodel/treemodel.cpp b/examples/widgets/itemviews/editabletreemodel/treemodel.cpp index 9678e45be7..1161a8b5d2 100644 --- a/examples/widgets/itemviews/editabletreemodel/treemodel.cpp +++ b/examples/widgets/itemviews/editabletreemodel/treemodel.cpp @@ -57,7 +57,7 @@ TreeModel::TreeModel(const QStringList &headers, const QString &data, QObject *parent) : QAbstractItemModel(parent) { - QVector<QVariant> rootData; + QList<QVariant> rootData; for (const QString &header : headers) rootData << header; @@ -248,8 +248,8 @@ bool TreeModel::setHeaderData(int section, Qt::Orientation orientation, void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent) { - QVector<TreeItem*> parents; - QVector<int> indentations; + QList<TreeItem *> parents; + QList<int> indentations; parents << parent; indentations << 0; @@ -269,7 +269,7 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent) // Read the column data from the rest of the line. const QStringList columnStrings = lineData.split(QLatin1Char('\t'), Qt::SkipEmptyParts); - QVector<QVariant> columnData; + QList<QVariant> columnData; columnData.reserve(columnStrings.size()); for (const QString &columnString : columnStrings) columnData << columnString; diff --git a/examples/widgets/itemviews/interview/model.cpp b/examples/widgets/itemviews/interview/model.cpp index 519164999d..5422757d95 100644 --- a/examples/widgets/itemviews/interview/model.cpp +++ b/examples/widgets/itemviews/interview/model.cpp @@ -55,8 +55,9 @@ Model::Model(int rows, int columns, QObject *parent) : QAbstractItemModel(parent), services(QPixmap(":/images/services.png")), - rc(rows), cc(columns), - tree(new QVector<Node>(rows, Node())) + rc(rows), + cc(columns), + tree(new QList<Node>(rows, Node())) { } @@ -139,8 +140,8 @@ Qt::ItemFlags Model::flags(const QModelIndex &index) const Model::Node *Model::node(int row, Node *parent) const { if (parent && !parent->children) - parent->children = new QVector<Node>(rc, Node(parent)); - QVector<Node> *v = parent ? parent->children : tree; + parent->children = new QList<Node>(rc, Node(parent)); + QList<Node> *v = parent ? parent->children : tree; return const_cast<Node*>(&(v->at(row))); } diff --git a/examples/widgets/itemviews/interview/model.h b/examples/widgets/itemviews/interview/model.h index 132f1d01aa..ee64a32f93 100644 --- a/examples/widgets/itemviews/interview/model.h +++ b/examples/widgets/itemviews/interview/model.h @@ -54,7 +54,7 @@ #include <QAbstractItemModel> #include <QFileIconProvider> #include <QIcon> -#include <QVector> +#include <QList> class Model : public QAbstractItemModel { @@ -83,7 +83,7 @@ private: Node(Node *parent = nullptr) : parent(parent), children(nullptr) {} ~Node() { delete children; } Node *parent; - QVector<Node> *children; + QList<Node> *children; }; Node *node(int row, Node *parent) const; @@ -93,7 +93,7 @@ private: QIcon services; int rc; int cc; - QVector<Node> *tree; + QList<Node> *tree; QFileIconProvider iconProvider; }; diff --git a/examples/widgets/itemviews/puzzle/piecesmodel.h b/examples/widgets/itemviews/puzzle/piecesmodel.h index 2a96603707..99cd7677b5 100644 --- a/examples/widgets/itemviews/puzzle/piecesmodel.h +++ b/examples/widgets/itemviews/puzzle/piecesmodel.h @@ -55,7 +55,7 @@ #include <QPixmap> #include <QPoint> #include <QStringList> -#include <QVector> +#include <QList> QT_BEGIN_NAMESPACE class QMimeData; @@ -83,8 +83,8 @@ public: void addPieces(const QPixmap &pixmap); private: - QVector<QPoint> locations; - QVector<QPixmap> pixmaps; + QList<QPoint> locations; + QList<QPixmap> pixmaps; int m_PieceSize; }; diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.h b/examples/widgets/itemviews/puzzle/puzzlewidget.h index 40dd654af6..0ac4719d74 100644 --- a/examples/widgets/itemviews/puzzle/puzzlewidget.h +++ b/examples/widgets/itemviews/puzzle/puzzlewidget.h @@ -53,7 +53,7 @@ #include <QPoint> #include <QPixmap> -#include <QVector> +#include <QList> #include <QWidget> QT_BEGIN_NAMESPACE @@ -94,7 +94,7 @@ private: int findPiece(const QRect &pieceRect) const; const QRect targetSquare(const QPoint &position) const; - QVector<Piece> pieces; + QList<Piece> pieces; QRect highlightedRect; int inPlace; int m_ImageSize; diff --git a/examples/widgets/itemviews/simpletreemodel/treeitem.cpp b/examples/widgets/itemviews/simpletreemodel/treeitem.cpp index 41fe24e737..f998432252 100644 --- a/examples/widgets/itemviews/simpletreemodel/treeitem.cpp +++ b/examples/widgets/itemviews/simpletreemodel/treeitem.cpp @@ -57,7 +57,7 @@ #include "treeitem.h" //! [0] -TreeItem::TreeItem(const QVector<QVariant> &data, TreeItem *parent) +TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent) : m_itemData(data), m_parentItem(parent) {} //! [0] diff --git a/examples/widgets/itemviews/simpletreemodel/treeitem.h b/examples/widgets/itemviews/simpletreemodel/treeitem.h index 390433597d..10c5dda35c 100644 --- a/examples/widgets/itemviews/simpletreemodel/treeitem.h +++ b/examples/widgets/itemviews/simpletreemodel/treeitem.h @@ -52,13 +52,13 @@ #define TREEITEM_H #include <QVariant> -#include <QVector> +#include <QList> //! [0] class TreeItem { public: - explicit TreeItem(const QVector<QVariant> &data, TreeItem *parentItem = nullptr); + explicit TreeItem(const QList<QVariant> &data, TreeItem *parentItem = nullptr); ~TreeItem(); void appendChild(TreeItem *child); @@ -71,8 +71,8 @@ public: TreeItem *parentItem(); private: - QVector<TreeItem*> m_childItems; - QVector<QVariant> m_itemData; + QList<TreeItem *> m_childItems; + QList<QVariant> m_itemData; TreeItem *m_parentItem; }; //! [0] diff --git a/examples/widgets/itemviews/simpletreemodel/treemodel.cpp b/examples/widgets/itemviews/simpletreemodel/treemodel.cpp index 28640d6433..d94fdb08cd 100644 --- a/examples/widgets/itemviews/simpletreemodel/treemodel.cpp +++ b/examples/widgets/itemviews/simpletreemodel/treemodel.cpp @@ -175,8 +175,8 @@ int TreeModel::rowCount(const QModelIndex &parent) const void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent) { - QVector<TreeItem*> parents; - QVector<int> indentations; + QList<TreeItem *> parents; + QList<int> indentations; parents << parent; indentations << 0; @@ -196,7 +196,7 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent) // Read the column data from the rest of the line. const QStringList columnStrings = lineData.split(QLatin1Char('\t'), Qt::SkipEmptyParts); - QVector<QVariant> columnData; + QList<QVariant> columnData; columnData.reserve(columnStrings.count()); for (const QString &columnString : columnStrings) columnData << columnString; |