Qt Designer: Replace a few QList<> by QVector<>

Change-Id: I7f338d14e7956f5f4b3e1d21d01e84ba7d7a0224
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

7 files changed, 27 insertions, 33 deletions

diff --git a/src/designer/src/components/formeditor/formeditor_optionspage.cpp b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
index 72bd26b16..9ede312f4 100644
--- a/src/designer/src/components/formeditor/formeditor_optionspage.cpp
+++ b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
@@ -50,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QList<int> IntList;
-
 namespace qdesigner_internal {
 
 // Zoom, currently for preview only
@@ -72,12 +70,10 @@ ZoomSettingsWidget::ZoomSettingsWidget(QWidget *parent) :
     m_zoomCombo(new QComboBox)
 {
     m_zoomCombo->setEditable(false);
-    const IntList zoomValues = ZoomMenu::zoomValues();
-    const IntList::const_iterator cend = zoomValues.constEnd();
-
-    for (IntList::const_iterator it = zoomValues.constBegin(); it != cend; ++it) {
+    const QVector<int> &zoomValues = ZoomMenu::zoomValues();
+    for (int z : zoomValues) {
         //: Zoom percentage
-        m_zoomCombo->addItem(QCoreApplication::translate("FormEditorOptionsPage", "%1 %").arg(*it), QVariant(*it));
+        m_zoomCombo->addItem(QCoreApplication::translate("FormEditorOptionsPage", "%1 %").arg(z), QVariant(z));
     }
 
     // Layout
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 5e11f5b26..fcfa4ecac 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -97,11 +97,11 @@ void MainWindowBase::closeEvent(QCloseEvent *e)
     }
 }
 
-QList<QToolBar *>  MainWindowBase::createToolBars(const QDesignerActions *actions, bool singleToolBar)
+QVector<QToolBar *> MainWindowBase::createToolBars(const QDesignerActions *actions, bool singleToolBar)
 {
     // Note that whenever you want to add a new tool bar here, you also have to update the default
     // action groups added to the toolbar manager in the mainwindow constructor
-    QList<QToolBar *> rc;
+    QVector<QToolBar *> rc;
     if (singleToolBar) {
         //: Not currently used (main tool bar)
         QToolBar *main = createToolBar(tr("Main"), QStringLiteral("mainToolBar"), actions->fileActions()->actions());
@@ -203,8 +203,8 @@ ToolBarManager::ToolBarManager(QMainWindow *configureableMainWindow,
                                          QWidget *parent,
                                          QMenu *toolBarMenu,
                                          const QDesignerActions *actions,
-                                         const QList<QToolBar *> &toolbars,
-                                         const QList<QDesignerToolWindow*> &toolWindows) :
+                                         const QVector<QToolBar *> &toolbars,
+                                         const QVector<QDesignerToolWindow *> &toolWindows) :
     QObject(parent),
     m_configureableMainWindow(configureableMainWindow),
     m_parent(parent),
@@ -291,13 +291,13 @@ bool ToolBarManager::restoreState(const QByteArray &state, int version)
 
 DockedMainWindow::DockedMainWindow(QDesignerWorkbench *wb,
                                    QMenu *toolBarMenu,
-                                   const QList<QDesignerToolWindow*> &toolWindows) :
+                                   const QVector<QDesignerToolWindow *> &toolWindows) :
     m_toolBarManager(0)
 {
     setObjectName(QStringLiteral("MDIWindow"));
     setWindowTitle(mainWindowTitle());
 
-    const QList<QToolBar *> toolbars = createToolBars(wb->actionManager(), false);
+    const QVector<QToolBar *> toolbars = createToolBars(wb->actionManager(), false);
     for (QToolBar *tb : toolbars)
         addToolBar(tb);
     DockedMdiArea *dma = new DockedMdiArea(wb->actionManager()->uiExtension());
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index 5fcc5aa94..5420e619d 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -30,7 +30,7 @@
 #define MAINWINDOW_H
 
 #include <QtWidgets/QMainWindow>
-#include <QtCore/QList>
+#include <QtCore/QVector>
 #include <QtWidgets/QMdiArea>
 
 QT_BEGIN_NAMESPACE
@@ -70,7 +70,7 @@ public:
     CloseEventPolicy closeEventPolicy() const { return m_policy; }
     void setCloseEventPolicy(CloseEventPolicy pol) { m_policy = pol; }
 
-    static QList<QToolBar *> createToolBars(const QDesignerActions *actions, bool singleToolBar);
+    static QVector<QToolBar *> createToolBars(const QDesignerActions *actions, bool singleToolBar);
     static QString mainWindowTitle();
 
     // Use the minor Qt version as settings versions to avoid conflicts
@@ -117,8 +117,8 @@ public:
                             QWidget *parent,
                             QMenu *toolBarMenu,
                             const QDesignerActions *actions,
-                            const QList<QToolBar *> &toolbars,
-                            const QList<QDesignerToolWindow*> &toolWindows);
+                            const QVector<QToolBar *> &toolbars,
+                            const QVector<QDesignerToolWindow *> &toolWindows);
 
     QByteArray saveState(int version = 0) const;
     bool restoreState(const QByteArray &state, int version = 0);
@@ -133,7 +133,7 @@ private:
     QMenu *m_toolBarMenu;
     QtToolBarManager *m_manager;
     QAction *m_configureAction;
-    QList<QToolBar *> m_toolbars;
+    QVector<QToolBar *> m_toolbars;
 };
 
 /* Main window to be used for docked mode */
@@ -141,8 +141,8 @@ class DockedMainWindow : public MainWindowBase {
     Q_OBJECT
     Q_DISABLE_COPY(DockedMainWindow)
 public:
-    typedef QList<QDesignerToolWindow*> DesignerToolWindowList;
-    typedef QList<QDockWidget *> DockWidgetList;
+    typedef QVector<QDesignerToolWindow *> DesignerToolWindowList;
+    typedef QVector<QDockWidget *> DockWidgetList;
 
     explicit DockedMainWindow(QDesignerWorkbench *wb,
                               QMenu *toolBarMenu,
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index f35c7ceb0..5c919dd1c 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -769,11 +769,8 @@ void QDesignerWorkbench::updateWindowMenu(QDesignerFormWindowInterface *fwi)
     m_actionManager->minimizeAction()->setEnabled(minimizeEnabled);
     m_actionManager->minimizeAction()->setChecked(minimizeChecked);
 
-    if (!m_formWindows.empty()) {
-        const QList<QDesignerFormWindow*>::const_iterator cend = m_formWindows.constEnd();
-        for (QList<QDesignerFormWindow*>::const_iterator it = m_formWindows.constBegin(); it != cend; ++it)
-            (*it)->action()->setChecked(*it == activeFormWindow);
-    }
+    for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
+        fw->action()->setChecked(fw == activeFormWindow);
 }
 
 void QDesignerWorkbench::formWindowActionTriggered(QAction *a)
diff --git a/src/designer/src/designer/qdesigner_workbench.h b/src/designer/src/designer/qdesigner_workbench.h
index 89e438266..8f0e4cc38 100644
--- a/src/designer/src/designer/qdesigner_workbench.h
+++ b/src/designer/src/designer/qdesigner_workbench.h
@@ -34,8 +34,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QHash>
 #include <QtCore/QSet>
-#include <QtCore/QList>
 #include <QtCore/QRect>
+#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 
@@ -158,15 +158,15 @@ private:
 
     struct TopLevelData {
         ToolBarManager *toolbarManager;
-        QList<QToolBar *> toolbars;
+        QVector<QToolBar *> toolbars;
     };
     TopLevelData m_topLevelData;
 
     UIMode m_mode;
     DockedMainWindow *m_dockedMainWindow;
 
-    QList<QDesignerToolWindow*> m_toolWindows;
-    QList<QDesignerFormWindow*> m_formWindows;
+    QVector<QDesignerToolWindow *> m_toolWindows;
+    QVector<QDesignerFormWindow *> m_formWindows;
 
     QMenu *m_toolbarMenu;
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index 1fff6ed9c..12346955c 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -109,10 +109,11 @@ void ZoomMenu::slotZoomMenu(QAction *a)
     emit zoomChanged(zoomOf(a));
 }
 
-QList<int> ZoomMenu::zoomValues()
+QVector<int> ZoomMenu::zoomValues()
 {
-    QList<int> rc;
+    QVector<int> rc;
     const int nz = sizeof(menuZoomList)/sizeof(int);
+    rc.reserve(nz);
     for (int i = 0; i < nz; i++)
         rc.push_back(menuZoomList[i]);
     return rc;
diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h
index 50bbcf6bb..f9724a2ad 100644
--- a/src/designer/src/lib/shared/zoomwidget_p.h
+++ b/src/designer/src/lib/shared/zoomwidget_p.h
@@ -44,7 +44,7 @@
 
 #include <QtWidgets/QGraphicsView>
 #include <QtWidgets/QGraphicsProxyWidget>
-#include <QtCore/QList>
+#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 
@@ -68,7 +68,7 @@ public:
     int zoom() const;
 
     // Return a list of available zoom values.
-    static QList<int> zoomValues();
+    static QVector<int> zoomValues();
 
 public slots:
     void setZoom(int percent);