diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-22 12:45:19 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-02 07:49:16 +0000 |
commit | 5c1e5d89379f79724905e42064190c3f27ba035b (patch) | |
tree | 932a0ab6c01142d5ec4538d37d34c821ee9e13c2 /src/designer/src/lib/uilib/formbuilderextra.cpp | |
parent | 41bb420ec19b67a1716d6fa3612f538fdcb18c22 (diff) | |
download | qttools-5c1e5d89379f79724905e42064190c3f27ba035b.tar.gz |
Qt Designer: Port Ui classes to QVector
Change the XSLT sheets to generate QVector instead of QList
for the Dom* classes with the exception of QList<DomProperty *>
since that affects the public interfaces of QAbstractFormBuilder
(virtual methods computeProperties(), applyProperties()).
Add fixme note for Qt 6.
Change-Id: I7d1fb490f4537ea5df668d97526e6f96bacf7fe0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/uilib/formbuilderextra.cpp')
-rw-r--r-- | src/designer/src/lib/uilib/formbuilderextra.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp index 17b00bb7e..b43104d27 100644 --- a/src/designer/src/lib/uilib/formbuilderextra.cpp +++ b/src/designer/src/lib/uilib/formbuilderextra.cpp @@ -250,13 +250,9 @@ void QFormBuilderExtra::clearTextBuilder() void QFormBuilderExtra::registerButtonGroups(const DomButtonGroups *domGroups) { - typedef QList<DomButtonGroup*> DomButtonGroupList; - const DomButtonGroupList domGroupList = domGroups->elementButtonGroup(); - const DomButtonGroupList::const_iterator cend = domGroupList.constEnd(); - for (DomButtonGroupList::const_iterator it = domGroupList.constBegin(); it != cend; ++it) { - DomButtonGroup *domGroup = *it; - m_buttonGroups.insert(domGroup->attributeName(), ButtonGroupEntry(domGroup, 0)); - } + const auto &domGroupList = domGroups->elementButtonGroup(); + for (DomButtonGroup *domGroup : domGroupList) + m_buttonGroups.insert(domGroup->attributeName(), ButtonGroupEntry(domGroup, nullptr)); } // Utilities for parsing per-cell integer properties that have setters and |