summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-22 13:44:54 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-22 13:58:30 +0200
commita298a8ea54d5bfe86b64d1ea76eefdaed1786df3 (patch)
tree84e9437921bbe828fb7472dbfbed0ed435706c3b /src/tools/uic/cpp
parentd9a260eabe4a3bd4f4e1e69f0430af2589d45a4f (diff)
Use QList instead of QVector in uic
Task-number: QTBUG-84469 Change-Id: I2ce8ca51409c8e29a84d88bdda968e6dec419bea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools/uic/cpp')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp2
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.h10
2 files changed, 6 insertions, 6 deletions
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<DomItem *> &domItems)
+WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QList<DomItem *> &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<DomProperty*>;
+ using DomPropertyList = QList<DomProperty*>;
using DomPropertyMap = QHash<QString, DomProperty*>;
WriteInitialization(Uic *uic);
@@ -190,7 +190,7 @@ private:
};
ItemData m_setupUiData;
ItemData m_retranslateUiData;
- QVector<Item *> m_children;
+ QList<Item *> m_children;
Item *m_parent = nullptr;
const QString m_itemClassName;
@@ -199,7 +199,7 @@ private:
QTextStream &m_retranslateUiStream;
Driver *m_driver;
};
- using Items = QVector<Item *>;
+ using Items = QList<Item *>;
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<DomItem *> &domItems);
+ Items initializeTreeWidgetItems(const QList<DomItem *> &domItems);
void initializeTableWidget(DomWidget *w);
QString disableSorting(DomWidget *w, const QString &varName);
@@ -263,7 +263,7 @@ private:
QStack<DomWidget*> m_widgetChain;
QStack<DomLayout*> m_layoutChain;
QStack<DomActionGroup*> m_actionGroupChain;
- QVector<Buddy> m_buddies;
+ QList<Buddy> m_buddies;
QSet<QString> m_buttonGroups;
using ColorBrushHash = QHash<uint, QString>;