From bf0041919bcfb1bbf8f5c4498938e8aebffbe290 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 31 Jul 2024 08:13:55 +0200
Subject: [PATCH] Debugger: Replace QVector with QList

The QContainer Naming War is over. QList won.

Change-Id: I8193b1b51619502533b74d6e965ec9b664f8dbce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggerengine.h             |  4 ++--
 src/plugins/debugger/debuggermainwindow.cpp       |  2 +-
 src/plugins/debugger/debuggerplugin.cpp           |  2 +-
 src/plugins/debugger/debuggerprotocol.h           |  3 +--
 src/plugins/debugger/debuggertooltipmanager.cpp   |  2 +-
 src/plugins/debugger/disassemblerlines.h          |  8 ++++----
 src/plugins/debugger/gdb/gdbengine.cpp            |  2 +-
 src/plugins/debugger/moduleshandler.h             |  6 +++---
 src/plugins/debugger/peripheralregisterhandler.h  |  6 +++---
 src/plugins/debugger/qml/interactiveinterpreter.h |  2 +-
 src/plugins/debugger/stackhandler.cpp             |  2 +-
 src/plugins/debugger/threaddata.h                 | 14 ++++----------
 src/plugins/debugger/uvsc/uvscclient.cpp          |  2 +-
 src/plugins/debugger/uvsc/uvscengine.cpp          |  2 +-
 src/plugins/debugger/watchhandler.cpp             |  2 +-
 src/plugins/debugger/watchhandler.h               | 10 +++-------
 16 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index b5e8a3cba8d..a1339b0c21e 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -464,8 +464,8 @@ public:
 
     void openMemoryEditor();
 
-    static void showModuleSymbols(const Utils::FilePath &moduleName, const QVector<Symbol> &symbols);
-    static void showModuleSections(const Utils::FilePath &moduleName, const QVector<Section> &sections);
+    static void showModuleSymbols(const Utils::FilePath &moduleName, const QList<Symbol> &symbols);
+    static void showModuleSections(const Utils::FilePath &moduleName, const QList<Section> &sections);
 
     void handleExecDetach();
     void handleExecContinue();
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index ff16ff6d3b4..0d7f6775644 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -97,7 +97,7 @@ public:
     QString m_name;
     QString m_parentPerspectiveId;
     QString m_settingsId;
-    QVector<DockOperation> m_dockOperations;
+    QList<DockOperation> m_dockOperations;
     QPointer<QWidget> m_centralWidget;
     Perspective::Callback m_aboutToActivateCallback;
     QPointer<QWidget> m_innerToolBar;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 0422bd34a2f..6a640f07e9c 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -656,7 +656,7 @@ public:
 
     ActionContainer *m_menu = nullptr;
 
-    QVector<DebuggerRunTool *> m_scheduledStarts;
+    QList<DebuggerRunTool *> m_scheduledStarts;
 
     ProxyAction m_visibleStartAction; // The fat debug button
     ProxyAction m_hiddenStopAction;
diff --git a/src/plugins/debugger/debuggerprotocol.h b/src/plugins/debugger/debuggerprotocol.h
index 702da98c9ac..8e2ff03a648 100644
--- a/src/plugins/debugger/debuggerprotocol.h
+++ b/src/plugins/debugger/debuggerprotocol.h
@@ -9,7 +9,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QVarLengthArray>
-#include <QVector>
 
 #include <utils/filepath.h>
 #include <utils/textutils.h>
@@ -143,7 +142,7 @@ public:
     QString m_name;
     QString m_data;
 
-    using Children = QVector<GdbMi>;
+    using Children = QList<GdbMi>;
     enum Type { Invalid, Const, Tuple, List };
     Type m_type = Invalid;
 
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index d327cec9b43..6f57ff8e286 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -99,7 +99,7 @@ public:
 
 public:
     DebuggerEngine *m_engine;
-    QVector<QPointer<DebuggerToolTipWidget>> m_tooltips;
+    QList<QPointer<DebuggerToolTipWidget>> m_tooltips;
     bool m_debugModeActive = false;
 };
 
diff --git a/src/plugins/debugger/disassemblerlines.h b/src/plugins/debugger/disassemblerlines.h
index 5e1675f06ca..c6bbbf8f60a 100644
--- a/src/plugins/debugger/disassemblerlines.h
+++ b/src/plugins/debugger/disassemblerlines.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QStringList>
 #include <QHash>
-#include <QVector>
+#include <QList>
+#include <QString>
 
 namespace Debugger::Internal {
 
@@ -54,7 +54,7 @@ public:
     int size() const { return m_data.size(); }
     const DisassemblerLine &at(int i) const { return m_data.at(i); }
     int lineForAddress(quint64 address) const;
-    QVector<DisassemblerLine> data() const { return m_data; }
+    QList<DisassemblerLine> data() const { return m_data; }
 
     quint64 startAddress() const;
     quint64 endAddress() const;
@@ -62,7 +62,7 @@ public:
 private:
     QString m_lastFunction;
     int m_bytesLength = 0;
-    QVector<DisassemblerLine> m_data;
+    QList<DisassemblerLine> m_data;
     QHash<quint64, int> m_rowCache;
 };
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 41d26962c96..92667c9c388 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3766,7 +3766,7 @@ bool GdbEngine::handleCliDisassemblerResult(const QString &output, DisassemblerA
     for (const QString &line : lineList)
         dlines.appendUnparsed(line);
 
-    QVector<DisassemblerLine> lines = dlines.data();
+    QList<DisassemblerLine> lines = dlines.data();
 
     using LineMap = QMap<quint64, LineData>;
     LineMap lineMap;
diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h
index 97ab677b359..46047907c44 100644
--- a/src/plugins/debugger/moduleshandler.h
+++ b/src/plugins/debugger/moduleshandler.h
@@ -32,7 +32,7 @@ public:
     QString demangled;
 };
 
-using Symbols = QVector<Symbol>;
+using Symbols = QList<Symbol>;
 
 //////////////////////////////////////////////////////////////////
 //
@@ -50,7 +50,7 @@ public:
     QString flags;
 };
 
-using Sections = QVector<Section>;
+using Sections = QList<Section>;
 
 //////////////////////////////////////////////////////////////////
 //
@@ -79,7 +79,7 @@ public:
     Utils::ElfData elfData;
 };
 
-using Modules = QVector<Module>;
+using Modules = QList<Module>;
 
 //////////////////////////////////////////////////////////////////
 //
diff --git a/src/plugins/debugger/peripheralregisterhandler.h b/src/plugins/debugger/peripheralregisterhandler.h
index fa71fea3147..845b67c5280 100644
--- a/src/plugins/debugger/peripheralregisterhandler.h
+++ b/src/plugins/debugger/peripheralregisterhandler.h
@@ -88,7 +88,7 @@ public:
     PeripheralRegisterAccess access = PeripheralRegisterAccess::Unknown;
     PeripheralRegisterFormat format = PeripheralRegisterFormat::Hexadecimal;
 
-    QVector<PeripheralRegisterField> fields;
+    QList<PeripheralRegisterField> fields;
 
     PeripheralRegisterValue currentValue;
     PeripheralRegisterValue previousValue;
@@ -107,12 +107,12 @@ public:
     int size = 0; // in bits
     PeripheralRegisterAccess access = PeripheralRegisterAccess::Unknown;
     bool active = false;
-    QVector<PeripheralRegister> registers;
+    QList<PeripheralRegister> registers;
 };
 
 // PeripheralRegisterGroups
 
-using PeripheralRegisterGroups = QVector<PeripheralRegisterGroup>;
+using PeripheralRegisterGroups = QList<PeripheralRegisterGroup>;
 
 // PeripheralRegisterItem's
 
diff --git a/src/plugins/debugger/qml/interactiveinterpreter.h b/src/plugins/debugger/qml/interactiveinterpreter.h
index 10824b5416a..9b4d0142117 100644
--- a/src/plugins/debugger/qml/interactiveinterpreter.h
+++ b/src/plugins/debugger/qml/interactiveinterpreter.h
@@ -26,7 +26,7 @@ public:
 
 private:
     QmlJS::Engine m_engine;
-    QVector<int> m_stateStack;
+    QList<int> m_stateStack;
     QList<int> m_tokens;
     QString m_code;
 };
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index d8ca3cad06b..fa39d3c62fc 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -346,7 +346,7 @@ static QString selectedText(QWidget *widget, bool useAll)
     QTC_ASSERT(model, return {});
 
     const int ncols = model->columnCount(QModelIndex());
-    QVector<int> largestColumnWidths(ncols, 0);
+    QList<int> largestColumnWidths(ncols, 0);
 
     QSet<QModelIndex> selected;
     if (QItemSelectionModel *selection = view->selectionModel()) {
diff --git a/src/plugins/debugger/threaddata.h b/src/plugins/debugger/threaddata.h
index 0b87ad902b9..5126a68ef6c 100644
--- a/src/plugins/debugger/threaddata.h
+++ b/src/plugins/debugger/threaddata.h
@@ -3,17 +3,12 @@
 
 #pragma once
 
+#include <QList>
 #include <QString>
-#include <QVector>
 
-namespace Debugger {
-namespace Internal {
+namespace Debugger::Internal {
 
-////////////////////////////////////////////////////////////////////////
-//
 // ThreadData
-//
-////////////////////////////////////////////////////////////////////////
 
 /*! A structure containing information about a single thread. */
 struct ThreadData
@@ -54,7 +49,6 @@ struct ThreadData
     QString name;
 };
 
-using Threads = QVector<ThreadData>;
+using Threads = QList<ThreadData>;
 
-} // namespace Internal
-} // namespace Debugger
+} // Debugger::Internal
diff --git a/src/plugins/debugger/uvsc/uvscclient.cpp b/src/plugins/debugger/uvsc/uvscclient.cpp
index b475b663eda..0efc73bd205 100644
--- a/src/plugins/debugger/uvsc/uvscclient.cpp
+++ b/src/plugins/debugger/uvsc/uvscclient.cpp
@@ -38,7 +38,7 @@ public:
 };
 
 Q_GLOBAL_STATIC(QLibrary, gUvscLibrary)
-Q_GLOBAL_STATIC(QVector<UvscClient *>, gUvscClients)
+Q_GLOBAL_STATIC(QList<UvscClient *>, gUvscClients)
 
 static QMutex gUvscsGuard;
 
diff --git a/src/plugins/debugger/uvsc/uvscengine.cpp b/src/plugins/debugger/uvsc/uvscengine.cpp
index 8efa0fc2936..f6b3707e928 100644
--- a/src/plugins/debugger/uvsc/uvscengine.cpp
+++ b/src/plugins/debugger/uvsc/uvscengine.cpp
@@ -495,7 +495,7 @@ void UvscEngine::doUpdateLocals(const UpdateParameters &params)
     watchHandler()->notifyUpdateStarted(params);
 
     const bool partial = !params.partialVariable.isEmpty();
-    // This is a workaround to avoid a strange QVector index assertion
+    // This is a workaround to avoid a strange QList index assertion
     // inside of the watch model.
     QMetaObject::invokeMethod(this, [this, partial] { handleUpdateLocals(partial); },
                              Qt::QueuedConnection);
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index c5600cd9ee8..2cc6b60ebb1 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -97,7 +97,7 @@ using MemoryMarkupList = QList<MemoryMarkup>;
 // over the children.
 
 using ColorNumberToolTip = QPair<int, QString>;
-using ColorNumberToolTips = QVector<ColorNumberToolTip>;
+using ColorNumberToolTips = QList<ColorNumberToolTip>;
 
 struct TypeInfo
 {
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 58a64cea4a4..bb1984d995e 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -6,16 +6,13 @@
 #include "watchdata.h"
 #include "debuggerengine.h"
 
-#include <QVector>
-
-namespace Debugger {
-namespace Internal {
+namespace Debugger::Internal {
 
 class DebuggerCommand;
 class DebuggerEngine;
 class WatchModel;
 
-using DisplayFormats = QVector<DisplayFormat>;
+using DisplayFormats = QList<DisplayFormat>;
 
 class WatchModelBase : public Utils::TreeModel<WatchItem, WatchItem>
 {
@@ -105,7 +102,6 @@ private:
     WatchModel *m_model; // Owned.
 };
 
-} // namespace Internal
-} // namespace Debugger
+} // Debugger::Internal
 
 Q_DECLARE_METATYPE(Debugger::Internal::DisplayFormat)