summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/treewalker.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-03-22 11:04:42 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-04-13 12:43:00 +0000
commit46458ce3ef4aeb01fef97348dcd317f0edd7e5fb (patch)
tree6c0fca3fcadde2abb1d1875f81ff1f48018c740e /src/tools/uic/treewalker.cpp
parent11361f903a2f04c308a547ad83612b9b54248185 (diff)
uic: Port Ui classes to QVector
Regenerate the ui4* files after a change in qttools replacing QList by QVector in the Dom* classes with the exception of QList<DomProperty *> since that affects the public interfaces of QAbstractFormBuilder. Change-Id: I0922127fb911a5abc125d93ef97a0b22ff94788a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/tools/uic/treewalker.cpp')
-rw-r--r--src/tools/uic/treewalker.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/tools/uic/treewalker.cpp b/src/tools/uic/treewalker.cpp
index eb9f1c02f8..044d0f0228 100644
--- a/src/tools/uic/treewalker.cpp
+++ b/src/tools/uic/treewalker.cpp
@@ -113,8 +113,7 @@ void TreeWalker::acceptWidget(DomWidget *widget)
if (!widget->elementLayout().isEmpty())
acceptLayout(widget->elementLayout().at(0));
- const DomScripts scripts(widget->elementScript());
- acceptWidgetScripts(scripts, widget, childWidgets);
+ acceptWidgetScripts(widget->elementScript(), widget, childWidgets);
}
void TreeWalker::acceptSpacer(DomSpacer *spacer)
@@ -301,11 +300,9 @@ void TreeWalker::acceptWidgetScripts(const DomScripts &, DomWidget *, const Dom
void TreeWalker::acceptButtonGroups(const DomButtonGroups *domButtonGroups)
{
- typedef QList<DomButtonGroup*> DomButtonGroupList;
- const DomButtonGroupList domGroups = domButtonGroups->elementButtonGroup();
- const DomButtonGroupList::const_iterator cend = domGroups.constEnd();
- for (DomButtonGroupList::const_iterator it = domGroups.constBegin(); it != cend; ++it)
- acceptButtonGroup(*it);
+ const auto &domGroups = domButtonGroups->elementButtonGroup();
+ for (const DomButtonGroup *g : domGroups)
+ acceptButtonGroup(g);
}
void TreeWalker::acceptButtonGroup(const DomButtonGroup *)