dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
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 <QtGlobal>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QMap> #include <QHash>
#include "singleapplication.h" #include "singleapplication.h"
@@ -100,7 +100,7 @@ class SingleApplicationPrivate : public QObject {
quint32 instanceNumber_; quint32 instanceNumber_;
QString blockServerName_; QString blockServerName_;
SingleApplication::Options options_; SingleApplication::Options options_;
QMap<QLocalSocket*, ConnectionInfo> connectionMap_; QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
public slots: public slots:
void slotConnectionEstablished(); void slotConnectionEstablished();

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

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

4
src/collection/collectionfilterwidget.h
View File

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

4
src/core/macsystemtrayicon.mm
View File

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

1
src/core/mergedproxymodel.cpp
View File

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

5
src/core/mergedproxymodel.h
View File

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

4
src/core/networktimeouts.h
View File

@@ -25,7 +25,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMap> #include <QHash>
class QNetworkReply; class QNetworkReply;
class QTimerEvent; class QTimerEvent;
@@ -47,7 +47,7 @@ class NetworkTimeouts : public QObject {
private: private:
int timeout_msec_; 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 <QtGlobal>
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QHash>
#include <QTimer> #include <QTimer>
#include <QIODevice> #include <QIODevice>
#include <QTextStream> #include <QTextStream>
@@ -156,8 +157,8 @@ bool StyleSheetLoader::eventFilter(QObject *obj, QEvent *event) {
void StyleSheetLoader::ResetCounters() { void StyleSheetLoader::ResetCounters() {
for (QMap<QWidget*, StyleSheetData>::iterator i = styledata_.begin() ; i != styledata_.end() ; ++i) { for (QHash<QWidget*, StyleSheetData>::iterator it = styledata_.begin(); it != styledata_.end(); ++it) {
i.value().count_ = 0; it.value().count_ = 0;
} }
} }

4
src/core/stylesheetloader.h
View File

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

1
src/covermanager/albumcoverfetchersearch.cpp
View File

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

3
src/covermanager/albumcoverfetchersearch.h
View File

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

4
src/covermanager/albumcoverloader.h
View File

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

3
src/widgets/fancytabwidget.cpp
View File

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

4
src/widgets/fancytabwidget.h
View File

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