From ebed87ea5730f9a49d6cf6d03a2a3a8ef7e2aa52 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 8 May 2018 20:30:09 +0300 Subject: Don't use shared pointers for cache --- src/AvatarProvider.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/AvatarProvider.cc') diff --git a/src/AvatarProvider.cc b/src/AvatarProvider.cc index 51ff27ac..49e52a82 100644 --- a/src/AvatarProvider.cc +++ b/src/AvatarProvider.cc @@ -22,8 +22,6 @@ #include "Cache.h" #include "MatrixClient.h" -QSharedPointer AvatarProvider::cache_; - void AvatarProvider::resolve(const QString &room_id, const QString &user_id, @@ -33,13 +31,13 @@ AvatarProvider::resolve(const QString &room_id, const auto key = QString("%1 %2").arg(room_id).arg(user_id); const auto avatarUrl = Cache::avatarUrl(room_id, user_id); - if (!Cache::AvatarUrls.contains(key) || cache_.isNull()) + if (!Cache::AvatarUrls.contains(key) || !cache::client()) return; if (avatarUrl.isEmpty()) return; - auto data = cache_->image(avatarUrl); + auto data = cache::client()->image(avatarUrl); if (!data.isNull()) { callback(QImage::fromData(data)); return; @@ -61,7 +59,7 @@ AvatarProvider::resolve(const QString &room_id, buffer.open(QIODevice::WriteOnly); img.save(&buffer, "PNG"); - cache_->saveImage(avatarUrl, data); + cache::client()->saveImage(avatarUrl, data); }); callback(img); }); -- cgit 1.5.1