From 2504e6e5f216e34fc9aabfda0c462b1b37620a5e Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Fri, 17 Jun 2022 10:40:49 +0200
Subject: Further fix building with Qt 6

Also: build with Qt 6 first, so that it fails sooner.
---
 lib/avatar.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/avatar.cpp')

diff --git a/lib/avatar.cpp b/lib/avatar.cpp
index 9304a3de..13de99bf 100644
--- a/lib/avatar.cpp
+++ b/lib/avatar.cpp
@@ -39,7 +39,7 @@ public:
 
     // The below are related to image caching, hence mutable
     mutable QImage _originalImage;
-    mutable std::vector<QPair<QSize, QImage>> _scaledImages;
+    mutable std::vector<std::pair<QSize, QImage>> _scaledImages;
     mutable QSize _requestedSize;
     mutable enum { Unknown, Cache, Network, Banned } _imageSource = Unknown;
     mutable QPointer<MediaThumbnailJob> _thumbnailRequest = nullptr;
@@ -124,9 +124,9 @@ QImage Avatar::Private::get(Connection* connection, QSize size,
                          });
     }
 
-    for (const auto& p : _scaledImages)
-        if (p.first == size)
-            return p.second;
+    for (const auto& [scaledSize, scaledImage] : _scaledImages)
+        if (scaledSize == size)
+            return scaledImage;
     auto result = _originalImage.isNull()
                       ? QImage()
                       : _originalImage.scaled(size, Qt::KeepAspectRatio,
-- 
cgit v1.2.3