summaryrefslogtreecommitdiffstats
path: root/src/designer/src/designer
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-26 09:27:26 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-12-09 14:33:45 +0100
commitee87edebe6f934ec915b7cb4a0f5a28f73e9f221 (patch)
treee1e7108b4d8dd9de4ed390f1421a57bb4f455c0d /src/designer/src/designer
parentaa40303166b8596bf21cdcf4286cb3d548b7ac9e (diff)
Qt Designer: Migrate from QList to QVector
Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/designer')
-rw-r--r--src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp2
-rw-r--r--src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp8
-rw-r--r--src/designer/src/designer/mainwindow.cpp2
-rw-r--r--src/designer/src/designer/preferencesdialog.h2
-rw-r--r--src/designer/src/designer/qdesigner_actions.cpp4
-rw-r--r--src/designer/src/designer/qdesigner_workbench.cpp2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp b/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp
index 259eb4668..03e1a96bd 100644
--- a/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp
+++ b/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp
@@ -55,7 +55,7 @@
//! [1]
- QList<QDesignerFormWindowInterface *> forms;
+ QVector<QDesignerFormWindowInterface *> forms;
QDesignerFormWindowInterface *formWindow;
QDesignerFormWindowManagerInterface *manager = formEditor->formWindowManager();
diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
index 1f76bc71d..f7d789ed6 100644
--- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
+++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
@@ -183,7 +183,7 @@ public:
MyTaskMenuExtension(MyCustomWidget *widget, QObject *parent);
QAction *preferredEditAction() const;
- QList<QAction *> taskActions() const;
+ QVector<QAction *> taskActions() const;
private slots:
void mySlot();
@@ -246,10 +246,10 @@ class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInt
public:
MyCustomWidgets(QObject *parent = 0);
- QList<QDesignerCustomWidgetInterface*> customWidgets() const override;
+ QVector<QDesignerCustomWidgetInterface*> customWidgets() const override;
private:
- QList<QDesignerCustomWidgetInterface*> widgets;
+ QVector<QDesignerCustomWidgetInterface*> widgets;
};
//! [12]
@@ -263,7 +263,7 @@ MyCustomWidgets::MyCustomWidgets(QObject *parent)
widgets.append(new CustomWidgetThreeInterface(this));
}
-QList<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const
+QVector<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const
{
return widgets;
}
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index dba96fd86..8e2e4dc0f 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -56,7 +56,7 @@ static const char *uriListMimeFormatC = "text/uri-list";
QT_BEGIN_NAMESPACE
-using ActionList = QList<QAction *>;
+using ActionList = QVector<QAction *>;
// Helpers for creating toolbars and menu
diff --git a/src/designer/src/designer/preferencesdialog.h b/src/designer/src/designer/preferencesdialog.h
index 654e93388..b7b20d90e 100644
--- a/src/designer/src/designer/preferencesdialog.h
+++ b/src/designer/src/designer/preferencesdialog.h
@@ -61,7 +61,7 @@ private:
Ui::PreferencesDialog *m_ui;
QDesignerFormEditorInterface *m_core;
- QList<QDesignerOptionsPageInterface*> m_optionsPages;
+ QVector<QDesignerOptionsPageInterface*> m_optionsPages;
};
QT_END_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index ea296fc27..cfb9e5cac 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -120,7 +120,7 @@ static QActionGroup *createActionGroup(QObject *parent, bool exclusive = false)
return rc;
}
-static void fixActionContext(const QList<QAction *> &actions)
+static void fixActionContext(const QVector<QAction *> &actions)
{
for (QAction *a : actions)
a->setShortcutContext(Qt::ApplicationShortcut);
@@ -315,7 +315,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
//
m_editWidgetsAction->setCheckable(true);
- QList<QKeySequence> shortcuts;
+ QVector<QKeySequence> shortcuts;
shortcuts.append(QKeySequence(Qt::Key_F3));
shortcuts.append(QKeySequence(Qt::Key_Escape));
m_editWidgetsAction->setShortcuts(shortcuts);
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index d18d2a179..b3b14d1c0 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
static const char *appFontPrefixC = "AppFonts";
-using ActionList = QList<QAction *>;
+using ActionList = QVector<QAction *>;
static QMdiSubWindow *mdiSubWindowOf(const QWidget *w)
{