From 6cc471f38dd8723136c4c8002195408f0095f6f2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 20 Jul 2023 11:33:30 +0200
Subject: [PATCH] Utils: Replace QVector with QList

Make usages of QList consistent. In some cases the
declaration contained QVector arg, while the definition
had QList arg.

Remove some unneeded includes of QList.

Change-Id: I7c15b39f261cefdeec6aaaf506ff4cc981432855
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/aspects.cpp                  |  2 +-
 src/libs/utils/commandline.h                |  1 -
 src/libs/utils/differ.cpp                   |  1 -
 src/libs/utils/elfreader.h                  |  6 +++---
 src/libs/utils/environment.cpp              |  4 ++--
 src/libs/utils/environment.h                |  2 +-
 src/libs/utils/environmentfwd.h             |  4 ++--
 src/libs/utils/fuzzymatcher.h               |  6 +++---
 src/libs/utils/highlightingitemdelegate.cpp | 12 ++++++------
 src/libs/utils/highlightingitemdelegate.h   |  2 +-
 src/libs/utils/icon.cpp                     |  4 ++--
 src/libs/utils/icon.h                       |  6 +++---
 src/libs/utils/json.h                       |  5 ++---
 src/libs/utils/layoutbuilder.h              |  2 +-
 src/libs/utils/macroexpander.cpp            |  4 ++--
 src/libs/utils/macroexpander.h              |  3 +--
 src/libs/utils/namevaluedictionary.h        |  2 +-
 src/libs/utils/namevalueitem.h              |  1 -
 src/libs/utils/port.h                       |  2 +-
 src/libs/utils/terminalcommand.cpp          |  6 +++---
 src/libs/utils/terminalcommand.h            |  4 ++--
 src/libs/utils/theme/theme_p.h              |  6 +++---
 src/libs/utils/treemodel.cpp                |  2 +-
 src/libs/utils/treemodel.h                  |  4 ++--
 24 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index ae8ee76da96..860b6990d8c 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -637,7 +637,7 @@ public:
 
     SelectionAspect::DisplayStyle m_displayStyle
             = SelectionAspect::DisplayStyle::RadioButtons;
-    QVector<SelectionAspect::Option> m_options;
+    QList<SelectionAspect::Option> m_options;
 
     // These are all owned by the configuration widget.
     QList<QPointer<QRadioButton>> m_buttons;
diff --git a/src/libs/utils/commandline.h b/src/libs/utils/commandline.h
index d7fc0a066be..52ff8c5496f 100644
--- a/src/libs/utils/commandline.h
+++ b/src/libs/utils/commandline.h
@@ -8,7 +8,6 @@
 #include "filepath.h"
 #include "hostosinfo.h"
 
-#include <QList>
 #include <QPair>
 #include <QStringList>
 
diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp
index f929efbeeb0..2d27de3f80b 100644
--- a/src/libs/utils/differ.cpp
+++ b/src/libs/utils/differ.cpp
@@ -13,7 +13,6 @@ publication by Neil Fraser: http://neil.fraser.name/writing/diff/
 
 #include "utilstr.h"
 
-#include <QList>
 #include <QMap>
 #include <QPair>
 #include <QRegularExpression>
diff --git a/src/libs/utils/elfreader.h b/src/libs/utils/elfreader.h
index d1506c81f00..a254b8e221e 100644
--- a/src/libs/utils/elfreader.h
+++ b/src/libs/utils/elfreader.h
@@ -10,8 +10,8 @@
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QFile>
+#include <QList>
 #include <QSharedPointer>
-#include <QVector>
 
 namespace Utils {
 
@@ -130,8 +130,8 @@ public:
     QByteArray debugLink;
     QByteArray buildId;
     DebugSymbolsType symbolsType = UnknownSymbols;
-    QVector<ElfSectionHeader> sectionHeaders;
-    QVector<ElfProgramHeader> programHeaders;
+    QList<ElfSectionHeader> sectionHeaders;
+    QList<ElfProgramHeader> programHeaders;
 };
 
 class QTCREATOR_UTILS_EXPORT ElfReader
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index b9af2dea928..2fe99fb97f5 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -24,7 +24,7 @@ namespace Utils {
 static QReadWriteLock s_envMutex;
 Q_GLOBAL_STATIC_WITH_ARGS(Environment, staticSystemEnvironment,
                           (QProcessEnvironment::systemEnvironment().toStringList()))
-Q_GLOBAL_STATIC(QVector<EnvironmentProvider>, environmentProviders)
+Q_GLOBAL_STATIC(QList<EnvironmentProvider>, environmentProviders)
 
 Environment::Environment()
     : m_dict(HostOsInfo::hostOs())
@@ -352,7 +352,7 @@ void EnvironmentProvider::addProvider(EnvironmentProvider &&provider)
     environmentProviders->append(std::move(provider));
 }
 
-const QVector<EnvironmentProvider> EnvironmentProvider::providers()
+const QList<EnvironmentProvider> EnvironmentProvider::providers()
 {
     return *environmentProviders;
 }
diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h
index 63fe697bd6e..479778e4ce7 100644
--- a/src/libs/utils/environment.h
+++ b/src/libs/utils/environment.h
@@ -134,7 +134,7 @@ public:
     std::function<Environment()> environment;
 
     static void addProvider(EnvironmentProvider &&provider);
-    static const QVector<EnvironmentProvider> providers();
+    static const QList<EnvironmentProvider> providers();
     static std::optional<EnvironmentProvider> provider(const QByteArray &id);
 };
 
diff --git a/src/libs/utils/environmentfwd.h b/src/libs/utils/environmentfwd.h
index 2975cbb64a7..51089eeee19 100644
--- a/src/libs/utils/environmentfwd.h
+++ b/src/libs/utils/environmentfwd.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 class QTreeView;
@@ -12,7 +12,7 @@ QT_END_NAMESPACE
 namespace Utils {
 class NameValueDictionary;
 class NameValueItem;
-using NameValueItems = QVector<NameValueItem>;
+using NameValueItems = QList<NameValueItem>;
 
 class Environment;
 using EnvironmentItem = NameValueItem;
diff --git a/src/libs/utils/fuzzymatcher.h b/src/libs/utils/fuzzymatcher.h
index dc665ec8648..88c5269870d 100644
--- a/src/libs/utils/fuzzymatcher.h
+++ b/src/libs/utils/fuzzymatcher.h
@@ -7,7 +7,7 @@
 
 #include "utils_global.h"
 
-#include <QVector>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 class QRegularExpression;
@@ -26,8 +26,8 @@ public:
 
     class HighlightingPositions {
     public:
-        QVector<int> starts;
-        QVector<int> lengths;
+        QList<int> starts;
+        QList<int> lengths;
     };
 
     static QRegularExpression createRegExp(
diff --git a/src/libs/utils/highlightingitemdelegate.cpp b/src/libs/utils/highlightingitemdelegate.cpp
index 22d55e23bf0..7fe0507311a 100644
--- a/src/libs/utils/highlightingitemdelegate.cpp
+++ b/src/libs/utils/highlightingitemdelegate.cpp
@@ -134,12 +134,12 @@ void HighlightingItemDelegate::drawText(QPainter *painter,
     if (index.model()->hasChildren(index))
         text += " (" + QString::number(index.model()->rowCount(index)) + ')';
 
-    QVector<int> searchTermStarts =
-            index.model()->data(index, int(HighlightingItemRole::StartColumn)).value<QVector<int>>();
-    QVector<int> searchTermLengths =
-            index.model()->data(index, int(HighlightingItemRole::Length)).value<QVector<int>>();
+    QList<int> searchTermStarts
+        = index.model()->data(index, int(HighlightingItemRole::StartColumn)).value<QList<int>>();
+    QList<int> searchTermLengths
+        = index.model()->data(index, int(HighlightingItemRole::Length)).value<QList<int>>();
 
-    QVector<QTextLayout::FormatRange> formats;
+    QList<QTextLayout::FormatRange> formats;
 
     const QString extraText
         = index.model()->data(index, int(HighlightingItemRole::DisplayExtra)).toString();
@@ -230,7 +230,7 @@ QSizeF doTextLayout(QTextLayout *textLayout, int lineWidth)
 void HighlightingItemDelegate::drawDisplay(QPainter *painter,
                                            const QStyleOptionViewItem &option,
                                            const QRect &rect, const QString &text,
-                                           const QVector<QTextLayout::FormatRange> &format) const
+                                           const QList<QTextLayout::FormatRange> &format) const
 {
     QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
                               ? QPalette::Normal : QPalette::Disabled;
diff --git a/src/libs/utils/highlightingitemdelegate.h b/src/libs/utils/highlightingitemdelegate.h
index cbda7042c26..ed47f18cca2 100644
--- a/src/libs/utils/highlightingitemdelegate.h
+++ b/src/libs/utils/highlightingitemdelegate.h
@@ -36,7 +36,7 @@ private:
                   const QRect &rect, const QModelIndex &index) const;
     using QItemDelegate::drawDisplay;
     void drawDisplay(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect,
-                     const QString &text, const QVector<QTextLayout::FormatRange> &format) const;
+                     const QString &text, const QList<QTextLayout::FormatRange> &format) const;
     QString m_tabString;
 };
 
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index 4ce143b56c7..d2e4737d479 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -36,7 +36,7 @@ static QPixmap maskToColorAndAlpha(const QPixmap &mask, const QColor &color)
 
 using MaskAndColor = QPair<QPixmap, QColor>;
 using MasksAndColors = QList<MaskAndColor>;
-static MasksAndColors masksAndColors(const QVector<IconMaskAndColor> &icon, int dpr)
+static MasksAndColors masksAndColors(const QList<IconMaskAndColor> &icon, int dpr)
 {
     MasksAndColors result;
     for (const IconMaskAndColor &i: icon) {
@@ -134,7 +134,7 @@ static QPixmap masksToIcon(const MasksAndColors &masks, const QPixmap &combinedM
 
 Icon::Icon() = default;
 
-Icon::Icon(QVector<IconMaskAndColor> args, Icon::IconStyleOptions style)
+Icon::Icon(QList<IconMaskAndColor> args, Icon::IconStyleOptions style)
     : m_iconSourceList(std::move(args))
     , m_style(style)
 {
diff --git a/src/libs/utils/icon.h b/src/libs/utils/icon.h
index c2c5e7a3de5..ea1384ffd3c 100644
--- a/src/libs/utils/icon.h
+++ b/src/libs/utils/icon.h
@@ -9,8 +9,8 @@
 #include "theme/theme.h"
 
 #include <QIcon>
+#include <QList>
 #include <QPair>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QColor;
@@ -40,7 +40,7 @@ public:
     Q_DECLARE_FLAGS(IconStyleOptions, IconStyleOption)
 
     Icon();
-    Icon(QVector<IconMaskAndColor> args, IconStyleOptions style = ToolBarStyle);
+    Icon(QList<IconMaskAndColor> args, IconStyleOptions style = ToolBarStyle);
     Icon(const FilePath &imageFileName);
 
     QIcon icon() const;
@@ -62,7 +62,7 @@ public:
     static QIcon combinedIcon(const QList<Icon> &icons);
 
 private:
-    QVector<IconMaskAndColor> m_iconSourceList;
+    QList<IconMaskAndColor> m_iconSourceList;
     IconStyleOptions m_style = None;
     mutable int m_lastDevicePixelRatio = -1;
     mutable QIcon m_lastIcon;
diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h
index 96a06772083..4872760ed30 100644
--- a/src/libs/utils/json.h
+++ b/src/libs/utils/json.h
@@ -8,7 +8,6 @@
 #include <QDateTime>
 #include <QHash>
 #include <QStringList>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QVariant;
@@ -37,7 +36,7 @@ public:
     }
 
 private:
-    QVector<char *> _objs;
+    QList<char *> _objs;
 };
 
 /*!
@@ -359,7 +358,7 @@ private:
         int m_index;
     };
 
-    QVector<Context> m_schemas;
+    QList<Context> m_schemas;
     const JsonSchemaManager *m_manager;
 };
 
diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h
index e94fbb56c04..63eeee34d50 100644
--- a/src/libs/utils/layoutbuilder.h
+++ b/src/libs/utils/layoutbuilder.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
+#include <QFormLayout>
 #include <QList>
 #include <QString>
 #include <QtGlobal>
-#include <QFormLayout>
 
 #include <optional>
 
diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp
index 3ab7d92e9a6..f6d3dad3623 100644
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -88,10 +88,10 @@ public:
 
     QHash<QByteArray, MacroExpander::StringFunction> m_map;
     QHash<QByteArray, MacroExpander::PrefixFunction> m_prefixMap;
-    QVector<MacroExpander::ResolverFunction> m_extraResolvers;
+    QList<MacroExpander::ResolverFunction> m_extraResolvers;
     QMap<QByteArray, QString> m_descriptions;
     QString m_displayName;
-    QVector<MacroExpanderProvider> m_subProviders;
+    QList<MacroExpanderProvider> m_subProviders;
     bool m_accumulating = false;
 
     bool m_aborted = false;
diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h
index 12172a5e17e..adde4db1d3f 100644
--- a/src/libs/utils/macroexpander.h
+++ b/src/libs/utils/macroexpander.h
@@ -7,7 +7,6 @@
 
 #include <QCoreApplication>
 #include <QList>
-#include <QVector>
 
 #include <functional>
 
@@ -18,7 +17,7 @@ namespace Internal { class MacroExpanderPrivate; }
 class FilePath;
 class MacroExpander;
 using MacroExpanderProvider = std::function<MacroExpander *()>;
-using MacroExpanderProviders = QVector<MacroExpanderProvider>;
+using MacroExpanderProviders = QList<MacroExpanderProvider>;
 
 class QTCREATOR_UTILS_EXPORT MacroExpander
 {
diff --git a/src/libs/utils/namevaluedictionary.h b/src/libs/utils/namevaluedictionary.h
index 4c8b5466816..722558f8912 100644
--- a/src/libs/utils/namevaluedictionary.h
+++ b/src/libs/utils/namevaluedictionary.h
@@ -30,7 +30,7 @@ inline bool operator<(const DictKey &k1, const DictKey &k2)
 inline bool operator>(const DictKey &k1, const DictKey &k2) { return k2 < k1; }
 
 using NameValuePair = std::pair<QString, QString>;
-using NameValuePairs = QVector<NameValuePair>;
+using NameValuePairs = QList<NameValuePair>;
 using NameValueMap = QMap<DictKey, QPair<QString, bool>>;
 
 class QTCREATOR_UTILS_EXPORT NameValueDictionary
diff --git a/src/libs/utils/namevalueitem.h b/src/libs/utils/namevalueitem.h
index b1f2bc22f84..62ba9d25baf 100644
--- a/src/libs/utils/namevalueitem.h
+++ b/src/libs/utils/namevalueitem.h
@@ -10,7 +10,6 @@
 
 #include <QStringList>
 #include <QVariantList>
-#include <QVector>
 
 namespace Utils {
 
diff --git a/src/libs/utils/port.h b/src/libs/utils/port.h
index c4b46631de2..2bf561f0b94 100644
--- a/src/libs/utils/port.h
+++ b/src/libs/utils/port.h
@@ -5,8 +5,8 @@
 
 #include "utils_global.h"
 
-#include <QMetaType>
 #include <QList>
+#include <QMetaType>
 #include <QString>
 
 namespace Utils {
diff --git a/src/libs/utils/terminalcommand.cpp b/src/libs/utils/terminalcommand.cpp
index bb1492515f3..afb0c3fe546 100644
--- a/src/libs/utils/terminalcommand.cpp
+++ b/src/libs/utils/terminalcommand.cpp
@@ -45,7 +45,7 @@ void TerminalCommand::setSettings(QSettings *settings)
     s_settings = settings;
 }
 
-Q_GLOBAL_STATIC_WITH_ARGS(const QVector<TerminalCommand>, knownTerminals, (
+Q_GLOBAL_STATIC_WITH_ARGS(const QList<TerminalCommand>, knownTerminals, (
 {
     {"x-terminal-emulator", "", "-e"},
     {"xdg-terminal", "", "", true},
@@ -82,9 +82,9 @@ TerminalCommand TerminalCommand::defaultTerminalEmulator()
     return defaultTerm;
 }
 
-QVector<TerminalCommand> TerminalCommand::availableTerminalEmulators()
+QList<TerminalCommand> TerminalCommand::availableTerminalEmulators()
 {
-    QVector<TerminalCommand> result;
+    QList<TerminalCommand> result;
 
     if (HostOsInfo::isAnyUnixHost()) {
         const Environment env = Environment::systemEnvironment();
diff --git a/src/libs/utils/terminalcommand.h b/src/libs/utils/terminalcommand.h
index edb9ffcadde..92a136d9655 100644
--- a/src/libs/utils/terminalcommand.h
+++ b/src/libs/utils/terminalcommand.h
@@ -7,8 +7,8 @@
 
 #include "filepath.h"
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -35,7 +35,7 @@ public:
 
     static void setSettings(QSettings *settings);
     static TerminalCommand defaultTerminalEmulator();
-    static QVector<TerminalCommand> availableTerminalEmulators();
+    static QList<TerminalCommand> availableTerminalEmulators();
     static TerminalCommand terminalEmulator();
     static void setTerminalEmulator(const TerminalCommand &term);
 };
diff --git a/src/libs/utils/theme/theme_p.h b/src/libs/utils/theme/theme_p.h
index 6aa5fb06a6c..14483f6d58c 100644
--- a/src/libs/utils/theme/theme_p.h
+++ b/src/libs/utils/theme/theme_p.h
@@ -23,9 +23,9 @@ public:
     QStringList preferredStyles;
     QString defaultTextEditorColorScheme;
     QString enforceAccentColorOnMacOS;
-    QVector<QPair<QColor, QString> > colors;
-    QVector<QString> imageFiles;
-    QVector<bool> flags;
+    QList<QPair<QColor, QString> > colors;
+    QList<QString> imageFiles;
+    QList<bool> flags;
     QMap<QString, QColor> palette;
 };
 
diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp
index e5e5aa59b99..2691525441a 100644
--- a/src/libs/utils/treemodel.cpp
+++ b/src/libs/utils/treemodel.cpp
@@ -717,7 +717,7 @@ void TreeItem::sortChildren(const std::function<bool(const TreeItem *, const Tre
 {
     if (m_model) {
         if (const int n = childCount()) {
-            QVector<TreeItem *> tmp = m_children;
+            QList<TreeItem *> tmp = m_children;
             std::sort(tmp.begin(), tmp.end(), cmp);
             if (tmp == m_children) {
                 // Nothing changed.
diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h
index 2cff2f72414..46832ff9d94 100644
--- a/src/libs/utils/treemodel.h
+++ b/src/libs/utils/treemodel.h
@@ -49,7 +49,7 @@ public:
     TreeItem *lastChild() const;
     int level() const;
 
-    using const_iterator = QVector<TreeItem *>::const_iterator;
+    using const_iterator = QList<TreeItem *>::const_iterator;
     using value_type = TreeItem *;
     int childCount() const { return m_children.size(); }
     int indexInParent() const;
@@ -81,7 +81,7 @@ private:
 
     TreeItem *m_parent = nullptr; // Not owned.
     BaseTreeModel *m_model = nullptr; // Not owned.
-    QVector<TreeItem *> m_children; // Owned.
+    QList<TreeItem *> m_children; // Owned.
     friend class BaseTreeModel;
 };