diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-12 09:41:04 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-13 17:05:23 +0100 |
commit | f2cc6fd4a0734e442f1101e3277215ea9d44d0d2 (patch) | |
tree | 967d7e1fcb1e78bb5716076677fd9a6e78243879 /src/tools/uic/cpp | |
parent | 1e5d1a43dc14240b24615d4cc9a291d5237ea8bf (diff) |
uic: Remove some usages of QList
Task-number: QTBUG-79896
Change-Id: I298a434040fa903509685b7cde82bbea722f3246
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/tools/uic/cpp')
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 8 | ||||
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 0349061089..9bb2cfcfea 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2304,7 +2304,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w) QString tempName = disableSorting(w, varName); - QList<Item *> items = initializeTreeWidgetItems(w->elementItem()); + const auto items = initializeTreeWidgetItems(w->elementItem()); for (int i = 0; i < items.count(); i++) { Item *itm = items[i]; itm->writeSetupUi(varName); @@ -2326,10 +2326,10 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w) conditions an item is needed needs to be done bottom-up, the whole process makes two passes, storing the intermediate result in a recursive StringInitializerListMap. */ -QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItems(const QVector<DomItem *> &domItems) +WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QVector<DomItem *> &domItems) { // items - QList<Item *> items; + Items items; const int numDomItems = domItems.size(); items.reserve(numDomItems); @@ -2357,7 +2357,7 @@ QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItem // AbstractFromBuilder saves flags last, so they always end up in the last column's map. addQtFlagsInitializer(item, map, QLatin1String("flags")); - const QList<Item *> subItems = initializeTreeWidgetItems(domItem->elementItem()); + const auto subItems = initializeTreeWidgetItems(domItem->elementItem()); for (Item *subItem : subItems) item->addChild(subItem); } diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 6f8e352f6a..ab996a2800 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -187,7 +187,7 @@ private: }; ItemData m_setupUiData; ItemData m_retranslateUiData; - QList<Item *> m_children; + QVector<Item *> m_children; Item *m_parent = nullptr; const QString m_itemClassName; @@ -196,6 +196,7 @@ private: QTextStream &m_retranslateUiStream; Driver *m_driver; }; + using Items = QVector<Item *>; void addInitializer(Item *item, const QString &name, int column, const QString &value, const QString &directive = QString(), bool translatable = false) const; @@ -214,7 +215,7 @@ private: void initializeComboBox(DomWidget *w); void initializeListWidget(DomWidget *w); void initializeTreeWidget(DomWidget *w); - QList<Item *> initializeTreeWidgetItems(const QVector<DomItem *> &domItems); + Items initializeTreeWidgetItems(const QVector<DomItem *> &domItems); void initializeTableWidget(DomWidget *w); QString disableSorting(DomWidget *w, const QString &varName); |