Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-02-02 18:46:46 +01:00
Code Issues Releases Wiki Activity

Change some uses of QMap to QHash

Browse Source
This commit is contained in:
Jonas Kvinge 2021-07-12 08:28:52 +02:00
parent f02741284c
commit 4251bee3ca
14 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/singleapplication/singleapplication_p.h vendored
View File

@ -37,7 +37,7 @@
#include <QtGlobal>
#include <QObject>
#include <QString>
#include <QMap>
#include <QHash>
#include "singleapplication.h"
@ -100,7 +100,7 @@ class SingleApplicationPrivate : public QObject {
quint32 instanceNumber_;
QString blockServerName_;
SingleApplication::Options options_;
QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
public slots:
void slotConnectionEstablished();

4
3rdparty/singleapplication/singlecoreapplication_p.h vendored
View File

@ -37,7 +37,7 @@
#include <QtGlobal>
#include <QObject>
#include <QString>
#include <QMap>
#include <QHash>
#include "singlecoreapplication.h"
@ -100,7 +100,7 @@ class SingleCoreApplicationPrivate : public QObject {
quint32 instanceNumber_;
QString blockServerName_;
SingleCoreApplication::Options options_;
QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
public slots:
void slotConnectionEstablished();

4
src/collection/collectionfilterwidget.h
View File

@ -27,7 +27,7 @@
#include <QWidget>
#include <QObject>
#include <QMap>
#include <QHash>
#include <QString>
#include "collectionquery.h"
@ -119,7 +119,7 @@ class CollectionFilterWidget : public QWidget {
QMenu *group_by_menu_;
QMenu *collection_menu_;
QActionGroup *group_by_group_;
QMap<QAction*, int> filter_ages_;
QHash<QAction*, int> filter_ages_;
QTimer *filter_delay_;

4
src/core/macsystemtrayicon.mm
View File

@ -22,7 +22,7 @@
#include "config.h"
#include <QApplication>
#include <QMap>
#include <QHash>
#include <QString>
#include <QUrl>
#include <QIcon>
@ -140,7 +140,7 @@ class MacSystemTrayIconPrivate {
}
}
QMap<QAction*, NSMenuItem*> actions_;
QHash<QAction*, NSMenuItem*> actions_;
NSMenu *dock_menu_;
NSMenuItem *now_playing_;

1
src/core/mergedproxymodel.cpp
View File

@ -28,6 +28,7 @@
#include <QMimeData>
#include <QList>
#include <QStringList>
#include <QMap>
#include <QtAlgorithms>
#include <QAbstractItemModel>
#include <QAbstractProxyModel>

5
src/core/mergedproxymodel.h
View File

@ -31,6 +31,7 @@
#include <QAbstractItemModel>
#include <QAbstractProxyModel>
#include <QMap>
#include <QHash>
#include <QVariant>
#include <QString>
#include <QStringList>
@ -106,10 +107,10 @@ class MergedProxyModel : public QAbstractProxyModel {
void DeleteAllMappings();
bool IsKnownModel(const QAbstractItemModel *model) const;
QMap<QAbstractItemModel*, QPersistentModelIndex> merge_points_;
QHash<QAbstractItemModel*, QPersistentModelIndex> merge_points_;
QAbstractItemModel *resetting_model_;
QMap<QAbstractItemModel*, QModelIndex> old_merge_points_;
QHash<QAbstractItemModel*, QModelIndex> old_merge_points_;
std::unique_ptr<MergedProxyModelPrivate> p_;
};

4
src/core/networktimeouts.h
View File

@ -25,7 +25,7 @@
#include <QtGlobal>
#include <QObject>
#include <QMap>
#include <QHash>
class QNetworkReply;
class QTimerEvent;
@ -47,7 +47,7 @@ class NetworkTimeouts : public QObject {
private:
int timeout_msec_;
QMap<QNetworkReply*, int> timers_;
QHash<QNetworkReply*, int> timers_;
};

5
src/core/stylesheetloader.cpp
View File

@ -26,6 +26,7 @@
#include <QtGlobal>
#include <QObject>
#include <QWidget>
#include <QHash>
#include <QTimer>
#include <QIODevice>
#include <QTextStream>
@ -156,8 +157,8 @@ bool StyleSheetLoader::eventFilter(QObject *obj, QEvent *event) {
void StyleSheetLoader::ResetCounters() {
for (QMap<QWidget*, StyleSheetData>::iterator i = styledata_.begin() ; i != styledata_.end() ; ++i) {
i.value().count_ = 0;
for (QHash<QWidget*, StyleSheetData>::iterator it = styledata_.begin(); it != styledata_.end(); ++it) {
it.value().count_ = 0;
}
}

4
src/core/stylesheetloader.h
View File

@ -26,7 +26,7 @@
#include <QObject>
#include <QPair>
#include <QMap>
#include <QHash>
#include <QPalette>
#include <QString>
@ -65,7 +65,7 @@ class StyleSheetLoader : public QObject {
void ResetCounters();
private:
QMap<QWidget*, StyleSheetData> styledata_;
QHash<QWidget*, StyleSheetData> styledata_;
QTimer *timer_reset_counter_;
};

1
src/covermanager/albumcoverfetchersearch.cpp
View File

@ -30,6 +30,7 @@
#include <QList>
#include <QMap>
#include <QMultiMap>
#include <QHash>
#include <QString>
#include <QUrl>
#include <QImage>

3
src/covermanager/albumcoverfetchersearch.h
View File

@ -29,6 +29,7 @@
#include <QPair>
#include <QMap>
#include <QMultiMap>
#include <QHash>
#include <QByteArray>
#include <QString>
#include <QUrl>
@ -102,7 +103,7 @@ class AlbumCoverFetcherSearch : public QObject {
CoverProviderSearchResults results_;
QMap<int, CoverProvider*> pending_requests_;
QMap<QNetworkReply*, CoverProviderSearchResult> pending_image_loads_;
QHash<QNetworkReply*, CoverProviderSearchResult> pending_image_loads_;
NetworkTimeouts *image_load_timeout_;
// QMap is sorted by key (score).

4
src/covermanager/albumcoverloader.h
View File

@ -29,7 +29,7 @@
#include <QMutex>
#include <QPair>
#include <QSet>
#include <QMap>
#include <QHash>
#include <QMultiMap>
#include <QQueue>
#include <QByteArray>
@ -150,7 +150,7 @@ class AlbumCoverLoader : public QObject {
QMutex mutex_load_image_async_;
QMutex mutex_save_image_async_;
QQueue<Task> tasks_;
QMap<QNetworkReply*, Task> remote_tasks_;
QHash<QNetworkReply*, Task> remote_tasks_;
quint64 load_image_async_id_;
quint64 save_image_async_id_;

3
src/widgets/fancytabwidget.cpp
View File

@ -32,6 +32,7 @@
#include <QTimer>
#include <QList>
#include <QMap>
#include <QHash>
#include <QVariant>
#include <QString>
#include <QIcon>
@ -74,7 +75,7 @@ class FancyTabBar : public QTabBar { // clazy:exclude=missing-qobject-macro
private:
int mouseHoverTabIndex = -1;
QMap<QWidget*, QString> labelCache;
QHash<QWidget*, QString> labelCache;
QMap<int, QWidget*> spacers;
public:

4
src/widgets/fancytabwidget.h
View File

@ -26,7 +26,7 @@
#include <QObject>
#include <QTabWidget>
#include <QMap>
#include <QHash>
#include <QString>
#include <QIcon>
#include <QPixmap>
@ -109,7 +109,7 @@ class FancyTabWidget : public QTabWidget {
Mode mode_;
QWidget *bottom_widget_;
QMap<QWidget*, TabData*> tabs_;
QHash<QWidget*, TabData*> tabs_;
bool bg_color_system_;
bool bg_gradient_;