Change some uses of QMap to QHash

src/core/macsystemtrayicon.mm

@@ -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_;

src/core/mergedproxymodel.cpp

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

src/core/mergedproxymodel.h

@@ -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_;
 };

src/core/networktimeouts.h

@@ -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_;
 
 };
 

src/core/stylesheetloader.cpp

@@ -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;
   }
 
 }

src/core/stylesheetloader.h

@@ -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_;
 };