1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uic: Remove some usages of QList

Browse Source 
Task-number: QTBUG-79896
Change-Id: I298a434040fa903509685b7cde82bbea722f3246
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Friedemann Kleint 2019-11-12 09:41:04 +01:00
parent 1e5d1a43dc
commit f2cc6fd4a0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -2304,7 +2304,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
QString tempName = disableSorting(w, varName); 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++) { for (int i = 0; i < items.count(); i++) {
Item *itm = items[i]; Item *itm = items[i];
itm->writeSetupUi(varName); 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 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. 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 // items
QList<Item *> items; Items items;
const int numDomItems = domItems.size(); const int numDomItems = domItems.size();
items.reserve(numDomItems); 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. // AbstractFromBuilder saves flags last, so they always end up in the last column's map.
addQtFlagsInitializer(item, map, QLatin1String("flags")); addQtFlagsInitializer(item, map, QLatin1String("flags"));
const QList<Item *> subItems = initializeTreeWidgetItems(domItem->elementItem()); const auto subItems = initializeTreeWidgetItems(domItem->elementItem());
for (Item *subItem : subItems) for (Item *subItem : subItems)
item->addChild(subItem); item->addChild(subItem);
} }

5
src/tools/uic/cpp/cppwriteinitialization.h
View File

@ -187,7 +187,7 @@ private:
}; };
ItemData m_setupUiData; ItemData m_setupUiData;
ItemData m_retranslateUiData; ItemData m_retranslateUiData;
QList<Item *> m_children; QVector<Item *> m_children;
Item *m_parent = nullptr; Item *m_parent = nullptr;
const QString m_itemClassName; const QString m_itemClassName;
@ -196,6 +196,7 @@ private:
QTextStream &m_retranslateUiStream; QTextStream &m_retranslateUiStream;
Driver *m_driver; Driver *m_driver;
}; };
using Items = QVector<Item *>;
void addInitializer(Item *item, void addInitializer(Item *item,
const QString &name, int column, const QString &value, const QString &directive = QString(), bool translatable = false) const; 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 initializeComboBox(DomWidget *w);
void initializeListWidget(DomWidget *w); void initializeListWidget(DomWidget *w);
void initializeTreeWidget(DomWidget *w); void initializeTreeWidget(DomWidget *w);
QList<Item *> initializeTreeWidgetItems(const QVector<DomItem *> &domItems); Items initializeTreeWidgetItems(const QVector<DomItem *> &domItems);
void initializeTableWidget(DomWidget *w); void initializeTableWidget(DomWidget *w);
QString disableSorting(DomWidget *w, const QString &varName); QString disableSorting(DomWidget *w, const QString &varName);

2
src/tools/uic/treewalker.h
View File

@ -29,7 +29,7 @@
#ifndef TREEWALKER_H #ifndef TREEWALKER_H
#define TREEWALKER_H #define TREEWALKER_H
#include <qlist.h> #include <qvector.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE