Replace shared pointers of MatrixClient with a single instance

1 files changed, 4 insertions, 7 deletions

diff --git a/src/RoomList.cc b/src/RoomList.cc

index c0447f9a..12fec318 100644
--- a/src/RoomList.cc
+++ b/src/RoomList.cc
@@ -29,11 +29,8 @@
 #include "UserSettingsPage.h"
 #include "Utils.h"
 
-RoomList::RoomList(QSharedPointer<MatrixClient> client,
-                   QSharedPointer<UserSettings> userSettings,
-                   QWidget *parent)
+RoomList::RoomList(QSharedPointer<UserSettings> userSettings, QWidget *parent)
   : QWidget(parent)
-  , client_(client)
   , userSettings_{userSettings}
 {
         setStyleSheet("border: none;");
@@ -58,7 +55,7 @@ RoomList::RoomList(QSharedPointer<MatrixClient> client,
         scrollArea_->setWidget(scrollAreaContents_);
         topLayout_->addWidget(scrollArea_);
 
-        connect(client_.data(),
+        connect(http::client(),
                 &MatrixClient::roomAvatarRetrieved,
                 this,
                 [this](const QString &room_id,
@@ -104,7 +101,7 @@ RoomList::updateAvatar(const QString &room_id, const QString &url)
                 savedImgData = cache_->image(url);
 
         if (savedImgData.isEmpty()) {
-                client_->fetchRoomAvatar(room_id, url);
+                http::client()->fetchRoomAvatar(room_id, url);
         } else {
                 QPixmap img;
                 img.loadFromData(savedImgData);
@@ -317,7 +314,7 @@ RoomList::closeJoinRoomDialog(bool isJoining, QString roomAlias)
         joinRoomModal_->hide();
 
         if (isJoining)
-                client_->joinRoom(roomAlias);
+                http::client()->joinRoom(roomAlias);
 }
 
 void