summaryrefslogtreecommitdiffstats
path: root/src/designer/src/components/formeditor/qdesigner_resource.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-05-18 16:37:31 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-06-08 08:11:08 +0000
commitde3454fcaaea88ad0805814c231d796c9fbed2c7 (patch)
treeac1cd6b1601fc4ca588160e3f0ce41d695f2e84d /src/designer/src/components/formeditor/qdesigner_resource.cpp
parent131d08f789237cd59d108e8ca882a797089764f9 (diff)
Revert "Qt Designer: Migrate from QList to QVector"
This reverts commit ee87edebe6f934ec915b7cb4a0f5a28f73e9f221. The official class name will be QList. Task-number: QTBUG-84469 Change-Id: Ia6c1f0ed64b3ef3d5b8e0c0435ec76fbe76f867b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/components/formeditor/qdesigner_resource.cpp')
-rw-r--r--src/designer/src/components/formeditor/qdesigner_resource.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 0acfc4fc9..7d549f3f8 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -109,7 +109,7 @@ Q_DECLARE_METATYPE(QWidgetList)
QT_BEGIN_NAMESPACE
namespace {
- using DomPropertyList = QVector<DomProperty *>;
+ using DomPropertyList = QList<DomProperty *>;
}
static const char *currentUiVersion = "4.0";
@@ -940,7 +940,7 @@ static bool readDomEnumerationValue(const DomProperty *p,
return false;
}
-void QDesignerResource::applyProperties(QObject *o, const QVector<DomProperty*> &properties)
+void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &properties)
{
if (properties.isEmpty())
return;
@@ -1388,7 +1388,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren
designerWarning(msgUnmanagedPage(core(), widget, i, page));
continue;
}
- QVector<DomProperty*> ui_attribute_list;
+ QList<DomProperty*> ui_attribute_list;
const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
// attribute `icon'
@@ -1457,7 +1457,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW
}
// attribute `label'
- QVector<DomProperty*> ui_attribute_list;
+ QList<DomProperty*> ui_attribute_list;
const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
@@ -1890,13 +1890,13 @@ bool QDesignerResource::canCompressSpacings(QObject *object) const
return false;
}
-QVector<DomProperty*> QDesignerResource::computeProperties(QObject *object)
+QList<DomProperty*> QDesignerResource::computeProperties(QObject *object)
{
- QVector<DomProperty*> properties;
+ QList<DomProperty*> properties;
if (QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), object)) {
QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core()->extensionManager(), object);
const int count = sheet->count();
- QVector<DomProperty *> spacingProperties;
+ QList<DomProperty *> spacingProperties;
const bool compressSpacings = canCompressSpacings(object);
for (int index = 0; index < count; ++index) {
if (!sheet->isChanged(index) && (!dynamicSheet || !dynamicSheet->isDynamicProperty(index)))