diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-18 16:37:31 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-08 08:11:08 +0000 |
| commit | de3454fcaaea88ad0805814c231d796c9fbed2c7 (patch) | |
| tree | ac1cd6b1601fc4ca588160e3f0ce41d695f2e84d /src/designer/src/lib/uilib/abstractformbuilder.h | |
| parent | 131d08f789237cd59d108e8ca882a797089764f9 (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/lib/uilib/abstractformbuilder.h')
| -rw-r--r-- | src/designer/src/lib/uilib/abstractformbuilder.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index 58c9aef26..d33ceb76c 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -135,7 +135,7 @@ protected: virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent); virtual void addMenuAction(QAction *action); - virtual void applyProperties(QObject *o, const QVector<DomProperty*> &properties); + virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties); bool applyPropertyInternally(QObject *o, const QString &propertyName, const QVariant &value); virtual void applyTabStops(QWidget *widget, DomTabStops *tabStops); @@ -175,7 +175,7 @@ protected: virtual DomTabStops *saveTabStops(); virtual DomResources *saveResources(); DomButtonGroups *saveButtonGroups(const QWidget *mainContainer); - virtual QVector<DomProperty*> computeProperties(QObject *obj); + virtual QList<DomProperty*> computeProperties(QObject *obj); virtual bool checkProperty(QObject *obj, const QString &prop) const; virtual DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value); @@ -210,7 +210,7 @@ protected: static QString toString(const DomString *str); using DomPropertyHash = QHash<QString, DomProperty*>; - static DomPropertyHash propertyMap(const QVector<DomProperty*> &properties); + static DomPropertyHash propertyMap(const QList<DomProperty*> &properties); void setupColorGroup(QPalette &palette, QPalette::ColorGroup colorGroup, DomColorGroup *group); DomColorGroup *saveColorGroup(const QPalette &palette); |