dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace QVector with QList

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-24 20:47:43 +02:00
parent 2e6408a4f7
commit 4d4dd6b249
15 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/libstrawberry-tagreader/tagreadertaglib.cpp
View File

@@ -83,7 +83,7 @@
#endif #endif
#include <QtGlobal> #include <QtGlobal>
#include <QVector> #include <QList>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QStringList> #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 { void TagReaderTagLib::SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const {
const TagLib::ByteVector id_vector(id); const TagLib::ByteVector id_vector(id);
QVector<TagLib::ByteVector> frames_buffer; QList<TagLib::ByteVector> frames_buffer;
// Store and clear existing frames // Store and clear existing frames
while (tag->frameListMap().contains(id_vector) && tag->frameListMap()[id_vector].size() != 0) { 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 { void TagReaderTagLib::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const {
TagLib::ByteVector id_vector(kID3v2_UnsychronizedLyrics); TagLib::ByteVector id_vector(kID3v2_UnsychronizedLyrics);
QVector<TagLib::ByteVector> frames_buffer; QList<TagLib::ByteVector> frames_buffer;
// Store and clear existing frames // Store and clear existing frames
while (tag->frameListMap().contains(id_vector) && tag->frameListMap()[id_vector].size() != 0) { while (tag->frameListMap().contains(id_vector) && tag->frameListMap()[id_vector].size() != 0) {

4
src/analyzer/analyzerbase.cpp
View File

@@ -29,7 +29,7 @@
#include <algorithm> #include <algorithm>
#include <QWidget> #include <QWidget>
#include <QVector> #include <QList>
#include <QPainter> #include <QPainter>
#include <QPalette> #include <QPalette>
#include <QBasicTimer> #include <QBasicTimer>
@@ -89,7 +89,7 @@ void AnalyzerBase::ChangeTimeout(const int timeout) {
void AnalyzerBase::transform(Scope &scope) { void AnalyzerBase::transform(Scope &scope) {
QVector<float> aux(fht_->size()); QList<float> aux(fht_->size());
if (static_cast<quint64>(aux.size()) >= scope.size()) { if (static_cast<quint64>(aux.size()) >= scope.size()) {
std::copy(scope.begin(), scope.end(), aux.begin()); std::copy(scope.begin(), scope.end(), aux.begin());
} }

12
src/analyzer/blockanalyzer.h
View File

@@ -26,7 +26,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QVector> #include <QList>
#include <QString> #include <QString>
#include <QPixmap> #include <QPixmap>
#include <QPainter> #include <QPainter>
@@ -65,12 +65,12 @@ class BlockAnalyzer : public AnalyzerBase {
QPixmap background_; QPixmap background_;
QPixmap canvas_; QPixmap canvas_;
Scope scope_; // so we don't create a vector every frame Scope scope_; // so we don't create a vector every frame
QVector<double> store_; // current bar heights QList<double> store_; // current bar heights
QVector<double> yscale_; QList<double> yscale_;
QVector<QPixmap> fade_bars_; QList<QPixmap> fade_bars_;
QVector<int> fade_pos_; QList<int> fade_pos_;
QVector<int> fade_intensity_; QList<int> fade_intensity_;
double step_; // rows to fall per frame double step_; // rows to fall per frame
}; };

2
src/analyzer/fht.cpp
View File

@@ -25,7 +25,7 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <QVector> #include <QList>
#include <QtMath> #include <QtMath>
FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) { FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) {

8
src/analyzer/fht.h
View File

@@ -23,7 +23,7 @@
#ifndef FHT_H #ifndef FHT_H
#define FHT_H #define FHT_H
#include <QVector> #include <QList>
/** /**
* Implementation of the Hartley Transform after Bracewell's discrete * Implementation of the Hartley Transform after Bracewell's discrete
@@ -37,9 +37,9 @@ class FHT {
const int num_; const int num_;
const int exp2_; const int exp2_;
QVector<float> buf_vector_; QList<float> buf_vector_;
QVector<float> tab_vector_; QList<float> tab_vector_;
QVector<int> log_vector_; QList<int> log_vector_;
float *buf_(); float *buf_();
float *tab_(); float *tab_();

4
src/collection/collectionbackend.cpp
View File

@@ -31,7 +31,7 @@
#include <QMutex> #include <QMutex>
#include <QSet> #include <QSet>
#include <QMap> #include <QMap>
#include <QVector> #include <QList>
#include <QVariant> #include <QVariant>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
@@ -1118,7 +1118,7 @@ SongList CollectionBackend::GetSongsByForeignId(const QStringList &ids, const QS
return SongList(); return SongList();
} }
QVector<Song> ret(ids.count()); QList<Song> ret(ids.count());
while (q.next()) { while (q.next()) {
const QString foreign_id = q.value(static_cast<int>(Song::kColumns.count()) + 1).toString(); const QString foreign_id = q.value(static_cast<int>(Song::kColumns.count()) + 1).toString();
const qint64 index = ids.indexOf(foreign_id); const qint64 index = ids.indexOf(foreign_id);

2
src/core/metatypes.cpp
View File

@@ -32,7 +32,6 @@
#include <QMetaType> #include <QMetaType>
#include <QFileInfo> #include <QFileInfo>
#include <QList> #include <QList>
#include <QVector>
#include <QMap> #include <QMap>
#include <QByteArray> #include <QByteArray>
#include <QUrl> #include <QUrl>
@@ -86,7 +85,6 @@ void RegisterMetaTypes() {
qRegisterMetaType<const char*>("const char*"); qRegisterMetaType<const char*>("const char*");
qRegisterMetaType<QList<int>>("QList<int>"); qRegisterMetaType<QList<int>>("QList<int>");
qRegisterMetaType<QVector<int>>("QVector<int>");
qRegisterMetaType<QList<QUrl>>("QList<QUrl>"); qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
qRegisterMetaType<QFileInfo>("QFileInfo"); qRegisterMetaType<QFileInfo>("QFileInfo");
qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState"); qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");

4
src/globalshortcuts/globalshortcut-x11.cpp
View File

@@ -21,7 +21,7 @@
#include <QApplication> #include <QApplication>
#include <QGuiApplication> #include <QGuiApplication>
#include <QVector> #include <QList>
#include <QByteArray> #include <QByteArray>
#include <QKeySequence> #include <QKeySequence>
#include <QFlags> #include <QFlags>
@@ -35,7 +35,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xproto.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 { namespace {

4
src/globalshortcuts/globalshortcut.h
View File

@@ -29,7 +29,7 @@
#include <QAbstractNativeEventFilter> #include <QAbstractNativeEventFilter>
#include <QKeySequence> #include <QKeySequence>
#include <QPair> #include <QPair>
#include <QVector> #include <QList>
#include <QHash> #include <QHash>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
@@ -68,7 +68,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
static GlobalShortcut *initialized_; static GlobalShortcut *initialized_;
static QHash<QPair<quint32, quint32>, GlobalShortcut*> internal_shortcuts_; static QHash<QPair<quint32, quint32>, GlobalShortcut*> internal_shortcuts_;
static const QVector<quint32> mask_modifiers_; static const QList<quint32> mask_modifiers_;
GlobalShortcutsBackend *backend_; GlobalShortcutsBackend *backend_;
QKeySequence shortcut_; QKeySequence shortcut_;

6
src/moodbar/moodbarrenderer.h
View File

@@ -26,7 +26,7 @@
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QImage> #include <QImage>
#include <QVector> #include <QList>
#include <QColor> #include <QColor>
#include <QPalette> #include <QPalette>
#include <QRect> #include <QRect>
@@ -34,7 +34,7 @@
class QPainter; class QPainter;
using ColorVector = QVector<QColor>; using ColorVector = QList<QColor>;
class MoodbarRenderer { class MoodbarRenderer {
public: public:
@@ -73,6 +73,6 @@ class MoodbarRenderer {
}; };
}; };
Q_DECLARE_METATYPE(QVector<QColor>) Q_DECLARE_METATYPE(QList<QColor>)
#endif // MOODBARRENDERER_H #endif // MOODBARRENDERER_H

3
src/organize/organize.h
View File

@@ -31,7 +31,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QSet> #include <QSet>
#include <QList> #include <QList>
#include <QVector>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
@@ -120,7 +119,7 @@ class Organize : public QObject {
const QString playlist_; const QString playlist_;
QBasicTimer transcode_progress_timer_; QBasicTimer transcode_progress_timer_;
QVector<Task> tasks_pending_; QList<Task> tasks_pending_;
QMap<QString, Task> tasks_transcoding_; QMap<QString, Task> tasks_transcoding_;
int tasks_complete_; int tasks_complete_;

15
src/widgets/groupediconview.cpp
View File

@@ -33,7 +33,6 @@
#include <QLocale> #include <QLocale>
#include <QPainter> #include <QPainter>
#include <QPalette> #include <QPalette>
#include <QVector>
#include <QRect> #include <QRect>
#include <QPen> #include <QPen>
#include <QPoint> #include <QPoint>
@@ -133,7 +132,7 @@ void GroupedIconView::rowsInserted(const QModelIndex &parent, int start, int end
LayoutItems(); 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); QListView::dataChanged(topLeft, bottomRight);
LayoutItems(); LayoutItems();
} }
@@ -253,7 +252,7 @@ void GroupedIconView::paintEvent(QPaintEvent *e) {
QPainter painter(viewport()); QPainter painter(viewport());
const QRect viewport_rect(e->rect().translated(horizontalOffset(), verticalOffset())); 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 QModelIndex current = currentIndex();
const QAbstractItemModel *itemModel = model(); 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(); int maxSize = (flow() == TopToBottom) ? viewport()->size().width() - 2 * spacing() : viewport()->size().height() - 2 * spacing();
QVector<QModelIndex>::const_iterator end = toBeRendered.constEnd(); QList<QModelIndex>::const_iterator end = toBeRendered.constEnd();
for (QVector<QModelIndex>::const_iterator it = toBeRendered.constBegin(); it != end; ++it) { for (QList<QModelIndex>::const_iterator it = toBeRendered.constBegin(); it != end; ++it) {
if (!it->isValid()) { if (!it->isValid()) {
continue; continue;
} }
@@ -325,7 +324,7 @@ void GroupedIconView::paintEvent(QPaintEvent *e) {
void GroupedIconView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) { 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; QItemSelection selection;
selection.reserve(indexes.count()); 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()); const int count = static_cast<int>(visual_rects_.count());
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {

10
src/widgets/groupediconview.h
View File

@@ -26,13 +26,13 @@
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QAbstractItemView> #include <QAbstractItemView>
#include <QItemSelectionModel> #include <QItemSelectionModel>
#include <QList>
#include <QString> #include <QString>
#include <QFont> #include <QFont>
#include <QPalette> #include <QPalette>
#include <QPoint> #include <QPoint>
#include <QRect> #include <QRect>
#include <QRegion> #include <QRegion>
#include <QVector>
class QWidget; class QWidget;
class QPainter; class QPainter;
@@ -89,7 +89,7 @@ class GroupedIconView : public QListView {
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
// QAbstractItemView // 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; QModelIndex indexAt(const QPoint &p) const override;
void rowsInserted(const QModelIndex &parent, int start, int end) override; void rowsInserted(const QModelIndex &parent, int start, int end) override;
void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) 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. // 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. // Returns the index of the item above (d=-1) or below (d=+1) the given item.
int IndexAboveOrBelow(int index, const int d) const; int IndexAboveOrBelow(int index, const int d) const;
MultiSortFilterProxy *proxy_model_; MultiSortFilterProxy *proxy_model_;
QVector<QRect> visual_rects_; QList<QRect> visual_rects_;
QVector<Header> headers_; QList<Header> headers_;
const int default_header_height_; const int default_header_height_;
int header_spacing_; int header_spacing_;

2
src/widgets/stretchheaderview.cpp
View File

@@ -27,9 +27,9 @@
#include <QHeaderView> #include <QHeaderView>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QIODevice> #include <QIODevice>
#include <QList>
#include <QByteArray> #include <QByteArray>
#include <QDataStream> #include <QDataStream>
#include <QList>
#include <QResizeEvent> #include <QResizeEvent>
#include <QMouseEvent> #include <QMouseEvent>

3
src/widgets/stretchheaderview.h
View File

@@ -27,7 +27,6 @@
#include <QHeaderView> #include <QHeaderView>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QVector>
class QWidget; class QWidget;
class QAbstractItemModel; class QAbstractItemModel;
@@ -92,7 +91,7 @@ class StretchHeaderView : public QHeaderView {
private: private:
bool stretch_enabled_; bool stretch_enabled_;
QVector<ColumnWidthType> column_widths_; QList<ColumnWidthType> column_widths_;
bool in_mouse_move_event_; bool in_mouse_move_event_;
int forced_resize_logical_index_; int forced_resize_logical_index_;