From d7eb62a5b51ce60a11e35e66d9fa0914338d3c39 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@ymail.com>
Date: Sat, 16 Apr 2022 04:32:06 +0200
Subject: [PATCH] QPair is just an alias now

---
 src/encryption/Olm.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/encryption/Olm.cpp b/src/encryption/Olm.cpp
index 4747a7e9..fe5b6bc4 100644
--- a/src/encryption/Olm.cpp
+++ b/src/encryption/Olm.cpp
@@ -1209,7 +1209,7 @@ send_encrypted_to_device_messages(const std::map<std::string, std::vector<std::s
                                   const mtx::events::collections::DeviceEvents &event,
                                   bool force_new_session)
 {
-    static QMap<QPair<std::string, std::string>, qint64> rateLimit;
+    static QMap<std::pair<std::string, std::string>, qint64> rateLimit;
 
     nlohmann::json ev_json = std::visit([](const auto &e) { return json(e); }, event);
 
@@ -1263,12 +1263,12 @@ send_encrypted_to_device_messages(const std::map<std::string, std::vector<std::s
             auto session = cache::getLatestOlmSession(device_curve);
             if (!session || force_new_session) {
                 auto currentTime = QDateTime::currentSecsSinceEpoch();
-                if (rateLimit.value(QPair(user, device)) + 60 * 60 * 10 < currentTime) {
+                if (rateLimit.value(std::pair(user, device)) + 60 * 60 * 10 < currentTime) {
                     claims.one_time_keys[user][device] = mtx::crypto::SIGNED_CURVE25519;
                     pks[user][device].ed25519          = d.keys.at("ed25519:" + device);
                     pks[user][device].curve25519       = d.keys.at("curve25519:" + device);
 
-                    rateLimit.insert(QPair(user, device), currentTime);
+                    rateLimit.insert(std::pair(user, device), currentTime);
                 } else {
                     nhlog::crypto()->warn("Not creating new session with {}:{} "
                                           "because of rate limit",
@@ -1461,13 +1461,13 @@ send_encrypted_to_device_messages(const std::map<std::string, std::vector<std::s
                       }
 
                       auto currentTime = QDateTime::currentSecsSinceEpoch();
-                      if (rateLimit.value(QPair(user.first, device_id.get())) + 60 * 60 * 10 <
+                      if (rateLimit.value(std::pair(user.first, device_id.get())) + 60 * 60 * 10 <
                           currentTime) {
                           deviceKeys[user_id].emplace(device_id, pks);
                           claim_keys.one_time_keys[user.first][device_id] =
                             mtx::crypto::SIGNED_CURVE25519;
 
-                          rateLimit.insert(QPair(user.first, device_id.get()), currentTime);
+                          rateLimit.insert(std::pair(user.first, device_id.get()), currentTime);
                       } else {
                           nhlog::crypto()->warn("Not creating new session with {}:{} "
                                                 "because of rate limit",