From a298a8ea54d5bfe86b64d1ea76eefdaed1786df3 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 13:44:54 +0200 Subject: Use QList instead of QVector in uic Task-number: QTBUG-84469 Change-Id: I2ce8ca51409c8e29a84d88bdda968e6dec419bea Reviewed-by: Friedemann Kleint --- src/tools/uic/cpp/cppwriteinitialization.cpp | 2 +- src/tools/uic/cpp/cppwriteinitialization.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/tools/uic/cpp') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index a0d6bade85..6d68dc0d78 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2338,7 +2338,7 @@ 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. */ -WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QVector &domItems) +WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QList &domItems) { // items Items items; diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index ed8f29d15c..784ef6fe3e 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -88,7 +88,7 @@ namespace CPP { struct WriteInitialization : public TreeWalker { - using DomPropertyList = QVector; + using DomPropertyList = QList; using DomPropertyMap = QHash; WriteInitialization(Uic *uic); @@ -190,7 +190,7 @@ private: }; ItemData m_setupUiData; ItemData m_retranslateUiData; - QVector m_children; + QList m_children; Item *m_parent = nullptr; const QString m_itemClassName; @@ -199,7 +199,7 @@ private: QTextStream &m_retranslateUiStream; Driver *m_driver; }; - using Items = QVector; + using Items = QList; void addInitializer(Item *item, const QString &name, int column, const QString &value, const QString &directive = QString(), bool translatable = false) const; @@ -218,7 +218,7 @@ private: void initializeComboBox(DomWidget *w); void initializeListWidget(DomWidget *w); void initializeTreeWidget(DomWidget *w); - Items initializeTreeWidgetItems(const QVector &domItems); + Items initializeTreeWidgetItems(const QList &domItems); void initializeTableWidget(DomWidget *w); QString disableSorting(DomWidget *w, const QString &varName); @@ -263,7 +263,7 @@ private: QStack m_widgetChain; QStack m_layoutChain; QStack m_actionGroupChain; - QVector m_buddies; + QList m_buddies; QSet m_buttonGroups; using ColorBrushHash = QHash; -- cgit v1.2.3