From 4d4dd6b2499614881367cbca517e01062c257ea5 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 24 Sep 2024 20:47:43 +0200
Subject: [PATCH] Replace QVector with QList

---
 ext/libstrawberry-tagreader/tagreadertaglib.cpp |  6 +++---
 src/analyzer/analyzerbase.cpp                   |  4 ++--
 src/analyzer/blockanalyzer.h                    | 12 ++++++------
 src/analyzer/fht.cpp                            |  2 +-
 src/analyzer/fht.h                              |  8 ++++----
 src/collection/collectionbackend.cpp            |  4 ++--
 src/core/metatypes.cpp                          |  2 --
 src/globalshortcuts/globalshortcut-x11.cpp      |  4 ++--
 src/globalshortcuts/globalshortcut.h            |  4 ++--
 src/moodbar/moodbarrenderer.h                   |  6 +++---
 src/organize/organize.h                         |  3 +--
 src/widgets/groupediconview.cpp                 | 15 +++++++--------
 src/widgets/groupediconview.h                   | 10 +++++-----
 src/widgets/stretchheaderview.cpp               |  2 +-
 src/widgets/stretchheaderview.h                 |  3 +--
 15 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/ext/libstrawberry-tagreader/tagreadertaglib.cpp b/ext/libstrawberry-tagreader/tagreadertaglib.cpp
index 464ea883e..122b0854f 100644
--- a/ext/libstrawberry-tagreader/tagreadertaglib.cpp
+++ b/ext/libstrawberry-tagreader/tagreadertaglib.cpp
@@ -83,7 +83,7 @@
 #endif
 
 #include <QtGlobal>
-#include <QVector>
+#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
@@ -1145,7 +1145,7 @@ void TagReaderTagLib::SetTextFrame(const char *id, const QString &value, TagLib:
 void TagReaderTagLib::SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const {
 
   const TagLib::ByteVector id_vector(id);
-  QVector<TagLib::ByteVector> frames_buffer;
+  QList<TagLib::ByteVector> frames_buffer;
 
   // Store and clear existing frames
   while (tag->frameListMap().contains(id_vector) && tag->frameListMap()[id_vector].size() != 0) {
@@ -1200,7 +1200,7 @@ void TagReaderTagLib::SetUserTextFrame(const std::string &description, const std
 void TagReaderTagLib::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const {
 
   TagLib::ByteVector id_vector(kID3v2_UnsychronizedLyrics);
-  QVector<TagLib::ByteVector> frames_buffer;
+  QList<TagLib::ByteVector> frames_buffer;
 
   // Store and clear existing frames
   while (tag->frameListMap().contains(id_vector) && tag->frameListMap()[id_vector].size() != 0) {
diff --git a/src/analyzer/analyzerbase.cpp b/src/analyzer/analyzerbase.cpp
index de20dc139..3b74e4cf9 100644
--- a/src/analyzer/analyzerbase.cpp
+++ b/src/analyzer/analyzerbase.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 
 #include <QWidget>
-#include <QVector>
+#include <QList>
 #include <QPainter>
 #include <QPalette>
 #include <QBasicTimer>
@@ -89,7 +89,7 @@ void AnalyzerBase::ChangeTimeout(const int timeout) {
 
 void AnalyzerBase::transform(Scope &scope) {
 
-  QVector<float> aux(fht_->size());
+  QList<float> aux(fht_->size());
   if (static_cast<quint64>(aux.size()) >= scope.size()) {
     std::copy(scope.begin(), scope.end(), aux.begin());
   }
diff --git a/src/analyzer/blockanalyzer.h b/src/analyzer/blockanalyzer.h
index 71454b94e..d3fdf2106 100644
--- a/src/analyzer/blockanalyzer.h
+++ b/src/analyzer/blockanalyzer.h
@@ -26,7 +26,7 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QVector>
+#include <QList>
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
@@ -65,12 +65,12 @@ class BlockAnalyzer : public AnalyzerBase {
   QPixmap background_;
   QPixmap canvas_;
   Scope scope_;  // so we don't create a vector every frame
-  QVector<double> store_;  // current bar heights
-  QVector<double> yscale_;
+  QList<double> store_;  // current bar heights
+  QList<double> yscale_;
 
-  QVector<QPixmap> fade_bars_;
-  QVector<int> fade_pos_;
-  QVector<int> fade_intensity_;
+  QList<QPixmap> fade_bars_;
+  QList<int> fade_pos_;
+  QList<int> fade_intensity_;
 
   double step_;  // rows to fall per frame
 };
diff --git a/src/analyzer/fht.cpp b/src/analyzer/fht.cpp
index ed852f76e..6af05930c 100644
--- a/src/analyzer/fht.cpp
+++ b/src/analyzer/fht.cpp
@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include <QVector>
+#include <QList>
 #include <QtMath>
 
 FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) {
diff --git a/src/analyzer/fht.h b/src/analyzer/fht.h
index c94aa09a9..28860f98e 100644
--- a/src/analyzer/fht.h
+++ b/src/analyzer/fht.h
@@ -23,7 +23,7 @@
 #ifndef FHT_H
 #define FHT_H
 
-#include <QVector>
+#include <QList>
 
 /**
  * Implementation of the Hartley Transform after Bracewell's discrete
@@ -37,9 +37,9 @@ class FHT {
   const int num_;
   const int exp2_;
 
-  QVector<float> buf_vector_;
-  QVector<float> tab_vector_;
-  QVector<int> log_vector_;
+  QList<float> buf_vector_;
+  QList<float> tab_vector_;
+  QList<int> log_vector_;
 
   float *buf_();
   float *tab_();
diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp
index f5cae681d..66cc919b6 100644
--- a/src/collection/collectionbackend.cpp
+++ b/src/collection/collectionbackend.cpp
@@ -31,7 +31,7 @@
 #include <QMutex>
 #include <QSet>
 #include <QMap>
-#include <QVector>
+#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -1118,7 +1118,7 @@ SongList CollectionBackend::GetSongsByForeignId(const QStringList &ids, const QS
     return SongList();
   }
 
-  QVector<Song> ret(ids.count());
+  QList<Song> ret(ids.count());
   while (q.next()) {
     const QString foreign_id = q.value(static_cast<int>(Song::kColumns.count()) + 1).toString();
     const qint64 index = ids.indexOf(foreign_id);
diff --git a/src/core/metatypes.cpp b/src/core/metatypes.cpp
index 67f9ae2f7..f69ded70f 100644
--- a/src/core/metatypes.cpp
+++ b/src/core/metatypes.cpp
@@ -32,7 +32,6 @@
 #include <QMetaType>
 #include <QFileInfo>
 #include <QList>
-#include <QVector>
 #include <QMap>
 #include <QByteArray>
 #include <QUrl>
@@ -86,7 +85,6 @@ void RegisterMetaTypes() {
 
   qRegisterMetaType<const char*>("const char*");
   qRegisterMetaType<QList<int>>("QList<int>");
-  qRegisterMetaType<QVector<int>>("QVector<int>");
   qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
   qRegisterMetaType<QFileInfo>("QFileInfo");
   qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");
diff --git a/src/globalshortcuts/globalshortcut-x11.cpp b/src/globalshortcuts/globalshortcut-x11.cpp
index 6603d767e..ee52429fd 100644
--- a/src/globalshortcuts/globalshortcut-x11.cpp
+++ b/src/globalshortcuts/globalshortcut-x11.cpp
@@ -21,7 +21,7 @@
 
 #include <QApplication>
 #include <QGuiApplication>
-#include <QVector>
+#include <QList>
 #include <QByteArray>
 #include <QKeySequence>
 #include <QFlags>
@@ -35,7 +35,7 @@
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
 
-const QVector<quint32> GlobalShortcut::mask_modifiers_ = QVector<quint32>() << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask);
+const QList<quint32> GlobalShortcut::mask_modifiers_ = QList<quint32>() << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask);
 
 namespace {
 
diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h
index 3542986a5..0d93eef75 100644
--- a/src/globalshortcuts/globalshortcut.h
+++ b/src/globalshortcuts/globalshortcut.h
@@ -29,7 +29,7 @@
 #include <QAbstractNativeEventFilter>
 #include <QKeySequence>
 #include <QPair>
-#include <QVector>
+#include <QList>
 #include <QHash>
 #include <QByteArray>
 #include <QString>
@@ -68,7 +68,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
 
   static GlobalShortcut *initialized_;
   static QHash<QPair<quint32, quint32>, GlobalShortcut*> internal_shortcuts_;
-  static const QVector<quint32> mask_modifiers_;
+  static const QList<quint32> mask_modifiers_;
 
   GlobalShortcutsBackend *backend_;
   QKeySequence shortcut_;
diff --git a/src/moodbar/moodbarrenderer.h b/src/moodbar/moodbarrenderer.h
index 66975aed8..4f170e5b7 100644
--- a/src/moodbar/moodbarrenderer.h
+++ b/src/moodbar/moodbarrenderer.h
@@ -26,7 +26,7 @@
 #include <QByteArray>
 #include <QString>
 #include <QImage>
-#include <QVector>
+#include <QList>
 #include <QColor>
 #include <QPalette>
 #include <QRect>
@@ -34,7 +34,7 @@
 
 class QPainter;
 
-using ColorVector = QVector<QColor>;
+using ColorVector = QList<QColor>;
 
 class MoodbarRenderer {
  public:
@@ -73,6 +73,6 @@ class MoodbarRenderer {
   };
 };
 
-Q_DECLARE_METATYPE(QVector<QColor>)
+Q_DECLARE_METATYPE(QList<QColor>)
 
 #endif  // MOODBARRENDERER_H
diff --git a/src/organize/organize.h b/src/organize/organize.h
index ab8f70584..0f20158af 100644
--- a/src/organize/organize.h
+++ b/src/organize/organize.h
@@ -31,7 +31,6 @@
 #include <QFileInfo>
 #include <QSet>
 #include <QList>
-#include <QVector>
 #include <QMap>
 #include <QString>
 #include <QStringList>
@@ -120,7 +119,7 @@ class Organize : public QObject {
   const QString playlist_;
 
   QBasicTimer transcode_progress_timer_;
-  QVector<Task> tasks_pending_;
+  QList<Task> tasks_pending_;
   QMap<QString, Task> tasks_transcoding_;
   int tasks_complete_;
 
diff --git a/src/widgets/groupediconview.cpp b/src/widgets/groupediconview.cpp
index f8a140150..8d669a401 100644
--- a/src/widgets/groupediconview.cpp
+++ b/src/widgets/groupediconview.cpp
@@ -33,7 +33,6 @@
 #include <QLocale>
 #include <QPainter>
 #include <QPalette>
-#include <QVector>
 #include <QRect>
 #include <QPen>
 #include <QPoint>
@@ -133,7 +132,7 @@ void GroupedIconView::rowsInserted(const QModelIndex &parent, int start, int end
   LayoutItems();
 }
 
-void GroupedIconView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int>&) {
+void GroupedIconView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QList<int>&) {
   QListView::dataChanged(topLeft, bottomRight);
   LayoutItems();
 }
@@ -253,7 +252,7 @@ void GroupedIconView::paintEvent(QPaintEvent *e) {
   QPainter painter(viewport());
 
   const QRect viewport_rect(e->rect().translated(horizontalOffset(), verticalOffset()));
-  QVector<QModelIndex> toBeRendered = IntersectingItems(viewport_rect);
+  QList<QModelIndex> toBeRendered = IntersectingItems(viewport_rect);
 
   const QModelIndex current = currentIndex();
   const QAbstractItemModel *itemModel = model();
@@ -265,8 +264,8 @@ void GroupedIconView::paintEvent(QPaintEvent *e) {
 
   int maxSize = (flow() == TopToBottom) ? viewport()->size().width() - 2 * spacing() : viewport()->size().height() - 2 * spacing();
 
-  QVector<QModelIndex>::const_iterator end = toBeRendered.constEnd();
-  for (QVector<QModelIndex>::const_iterator it = toBeRendered.constBegin(); it != end; ++it) {
+  QList<QModelIndex>::const_iterator end = toBeRendered.constEnd();
+  for (QList<QModelIndex>::const_iterator it = toBeRendered.constBegin(); it != end; ++it) {
     if (!it->isValid()) {
       continue;
     }
@@ -325,7 +324,7 @@ void GroupedIconView::paintEvent(QPaintEvent *e) {
 
 void GroupedIconView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) {
 
-  const QVector<QModelIndex> indexes(IntersectingItems(rect.translated(horizontalOffset(), verticalOffset())));
+  const QList<QModelIndex> indexes(IntersectingItems(rect.translated(horizontalOffset(), verticalOffset())));
 
   QItemSelection selection;
   selection.reserve(indexes.count());
@@ -338,9 +337,9 @@ void GroupedIconView::setSelection(const QRect &rect, QItemSelectionModel::Selec
 
 }
 
-QVector<QModelIndex> GroupedIconView::IntersectingItems(const QRect rect) const {
+QList<QModelIndex> GroupedIconView::IntersectingItems(const QRect rect) const {
 
-  QVector<QModelIndex> ret;
+  QList<QModelIndex> ret;
 
   const int count = static_cast<int>(visual_rects_.count());
   for (int i = 0; i < count; ++i) {
diff --git a/src/widgets/groupediconview.h b/src/widgets/groupediconview.h
index 3a47be01c..c1f117dc3 100644
--- a/src/widgets/groupediconview.h
+++ b/src/widgets/groupediconview.h
@@ -26,13 +26,13 @@
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QItemSelectionModel>
+#include <QList>
 #include <QString>
 #include <QFont>
 #include <QPalette>
 #include <QPoint>
 #include <QRect>
 #include <QRegion>
-#include <QVector>
 
 class QWidget;
 class QPainter;
@@ -89,7 +89,7 @@ class GroupedIconView : public QListView {
   void resizeEvent(QResizeEvent *e) override;
 
   // QAbstractItemView
-  void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int>& = QVector<int>()) override;
+  void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QList<int>& = QList<int>()) override;
   QModelIndex indexAt(const QPoint &p) const override;
   void rowsInserted(const QModelIndex &parent, int start, int end) override;
   void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override;
@@ -107,14 +107,14 @@ class GroupedIconView : public QListView {
   };
 
   // Returns the items that are wholly or partially inside the rect.
-  QVector<QModelIndex> IntersectingItems(const QRect rect) const;
+  QList<QModelIndex> IntersectingItems(const QRect rect) const;
 
   // Returns the index of the item above (d=-1) or below (d=+1) the given item.
   int IndexAboveOrBelow(int index, const int d) const;
 
   MultiSortFilterProxy *proxy_model_;
-  QVector<QRect> visual_rects_;
-  QVector<Header> headers_;
+  QList<QRect> visual_rects_;
+  QList<Header> headers_;
 
   const int default_header_height_;
   int header_spacing_;
diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp
index e543214d6..d3c484ad9 100644
--- a/src/widgets/stretchheaderview.cpp
+++ b/src/widgets/stretchheaderview.cpp
@@ -27,9 +27,9 @@
 #include <QHeaderView>
 #include <QAbstractItemModel>
 #include <QIODevice>
+#include <QList>
 #include <QByteArray>
 #include <QDataStream>
-#include <QList>
 #include <QResizeEvent>
 #include <QMouseEvent>
 
diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h
index 3b0537d80..a4f04081d 100644
--- a/src/widgets/stretchheaderview.h
+++ b/src/widgets/stretchheaderview.h
@@ -27,7 +27,6 @@
 #include <QHeaderView>
 #include <QList>
 #include <QString>
-#include <QVector>
 
 class QWidget;
 class QAbstractItemModel;
@@ -92,7 +91,7 @@ class StretchHeaderView : public QHeaderView {
 
  private:
   bool stretch_enabled_;
-  QVector<ColumnWidthType> column_widths_;
+  QList<ColumnWidthType> column_widths_;
 
   bool in_mouse_move_event_;
   int forced_resize_logical_index_;