Replace shared pointers of MatrixClient with a single instance

4 files changed, 11 insertions, 34 deletions

diff --git a/include/timeline/widgets/AudioItem.h b/include/timeline/widgets/AudioItem.h

index b1d47dd5..1020c3e5 100644
--- a/include/timeline/widgets/AudioItem.h
+++ b/include/timeline/widgets/AudioItem.h
@@ -24,8 +24,6 @@
 #include <QSharedPointer>
 #include <QWidget>
 
-#include "MatrixClient.h"
-
 #include <mtx.hpp>
 
 class AudioItem : public QWidget
@@ -42,12 +40,10 @@ class AudioItem : public QWidget
                      durationForegroundColor)
 
 public:
-        AudioItem(QSharedPointer<MatrixClient> client,
-                  const mtx::events::RoomEvent<mtx::events::msg::Audio> &event,
+        AudioItem(const mtx::events::RoomEvent<mtx::events::msg::Audio> &event,
                   QWidget *parent = nullptr);
 
-        AudioItem(QSharedPointer<MatrixClient> client,
-                  const QString &url,
+        AudioItem(const QString &url,
                   const QString &filename,
                   uint64_t size,
                   QWidget *parent = nullptr);
@@ -90,7 +86,6 @@ private:
         QString filenameToSave_;
 
         mtx::events::RoomEvent<mtx::events::msg::Audio> event_;
-        QSharedPointer<MatrixClient> client_;
 
         QMediaPlayer *player_;
 
diff --git a/include/timeline/widgets/FileItem.h b/include/timeline/widgets/FileItem.h

index bc75913d..4f590df6 100644
--- a/include/timeline/widgets/FileItem.h
+++ b/include/timeline/widgets/FileItem.h
@@ -25,8 +25,6 @@
 
 #include <mtx.hpp>
 
-#include "MatrixClient.h"
-
 class FileItem : public QWidget
 {
         Q_OBJECT
@@ -36,12 +34,10 @@ class FileItem : public QWidget
         Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
 
 public:
-        FileItem(QSharedPointer<MatrixClient> client,
-                 const mtx::events::RoomEvent<mtx::events::msg::File> &event,
+        FileItem(const mtx::events::RoomEvent<mtx::events::msg::File> &event,
                  QWidget *parent = nullptr);
 
-        FileItem(QSharedPointer<MatrixClient> client,
-                 const QString &url,
+        FileItem(const QString &url,
                  const QString &filename,
                  uint64_t size,
                  QWidget *parent = nullptr);
@@ -71,7 +67,6 @@ private:
         QString filenameToSave_;
 
         mtx::events::RoomEvent<mtx::events::msg::File> event_;
-        QSharedPointer<MatrixClient> client_;
 
         QIcon icon_;
 
diff --git a/include/timeline/widgets/ImageItem.h b/include/timeline/widgets/ImageItem.h

index 146aa7f6..b17b2d8b 100644
--- a/include/timeline/widgets/ImageItem.h
+++ b/include/timeline/widgets/ImageItem.h
@@ -24,8 +24,6 @@
 
 #include <mtx.hpp>
 
-#include "MatrixClient.h"
-
 namespace dialogs {
 class ImageOverlay;
 }
@@ -34,12 +32,10 @@ class ImageItem : public QWidget
 {
         Q_OBJECT
 public:
-        ImageItem(QSharedPointer<MatrixClient> client,
-                  const mtx::events::RoomEvent<mtx::events::msg::Image> &event,
+        ImageItem(const mtx::events::RoomEvent<mtx::events::msg::Image> &event,
                   QWidget *parent = nullptr);
 
-        ImageItem(QSharedPointer<MatrixClient> client,
-                  const QString &url,
+        ImageItem(const QString &url,
                   const QString &filename,
                   uint64_t size,
                   QWidget *parent = nullptr);
@@ -81,8 +77,6 @@ private:
         QRectF imageRegion_;
 
         mtx::events::RoomEvent<mtx::events::msg::Image> event_;
-
-        QSharedPointer<MatrixClient> client_;
 };
 
 class StickerItem : public ImageItem
@@ -90,11 +84,8 @@ class StickerItem : public ImageItem
         Q_OBJECT
 
 public:
-        StickerItem(QSharedPointer<MatrixClient> client,
-                    const mtx::events::Sticker &event,
-                    QWidget *parent = nullptr)
-          : ImageItem{client,
-                      QString::fromStdString(event.content.url),
+        StickerItem(const mtx::events::Sticker &event, QWidget *parent = nullptr)
+          : ImageItem{QString::fromStdString(event.content.url),
                       QString::fromStdString(event.content.body),
                       event.content.info.size,
                       parent}
diff --git a/include/timeline/widgets/VideoItem.h b/include/timeline/widgets/VideoItem.h

index 89732975..26fa1c35 100644
--- a/include/timeline/widgets/VideoItem.h
+++ b/include/timeline/widgets/VideoItem.h
@@ -20,10 +20,9 @@
 #include <QEvent>
 #include <QLabel>
 #include <QSharedPointer>
+#include <QUrl>
 #include <QWidget>
 
-#include "MatrixClient.h"
-
 #include <mtx.hpp>
 
 class VideoItem : public QWidget
@@ -31,12 +30,10 @@ class VideoItem : public QWidget
         Q_OBJECT
 
 public:
-        VideoItem(QSharedPointer<MatrixClient> client,
-                  const mtx::events::RoomEvent<mtx::events::msg::Video> &event,
+        VideoItem(const mtx::events::RoomEvent<mtx::events::msg::Video> &event,
                   QWidget *parent = nullptr);
 
-        VideoItem(QSharedPointer<MatrixClient> client,
-                  const QString &url,
+        VideoItem(const QString &url,
                   const QString &filename,
                   uint64_t size,
                   QWidget *parent = nullptr);
@@ -51,5 +48,4 @@ private:
         QLabel *label_;
 
         mtx::events::RoomEvent<mtx::events::msg::Video> event_;
-        QSharedPointer<MatrixClient> client_;
 };