diff --git a/src/timeline/widgets/AudioItem.cc b/src/timeline/widgets/AudioItem.cc
index 79f944ff..5a2bca92 100644
--- a/src/timeline/widgets/AudioItem.cc
+++ b/src/timeline/widgets/AudioItem.cc
@@ -23,6 +23,7 @@
#include <QPainter>
#include <QPixmap>
+#include "MatrixClient.h"
#include "Utils.h"
#include "timeline/widgets/AudioItem.h"
@@ -57,7 +58,7 @@ AudioItem::init()
QString media_params = url_parts[1];
url_ = QString("%1/_matrix/media/r0/download/%2")
- .arg(client_.data()->getHomeServer().toString(), media_params);
+ .arg(http::client()->getHomeServer().toString(), media_params);
player_ = new QMediaPlayer;
player_->setMedia(QUrl(url_));
@@ -73,29 +74,21 @@ AudioItem::init()
});
}
-AudioItem::AudioItem(QSharedPointer<MatrixClient> client,
- const mtx::events::RoomEvent<mtx::events::msg::Audio> &event,
- QWidget *parent)
+AudioItem::AudioItem(const mtx::events::RoomEvent<mtx::events::msg::Audio> &event, QWidget *parent)
: QWidget(parent)
, url_{QUrl(QString::fromStdString(event.content.url))}
, text_{QString::fromStdString(event.content.body)}
, event_{event}
- , client_{client}
{
readableFileSize_ = utils::humanReadableFileSize(event.content.info.size);
init();
}
-AudioItem::AudioItem(QSharedPointer<MatrixClient> client,
- const QString &url,
- const QString &filename,
- uint64_t size,
- QWidget *parent)
+AudioItem::AudioItem(const QString &url, const QString &filename, uint64_t size, QWidget *parent)
: QWidget(parent)
, url_{url}
, text_{filename}
- , client_{client}
{
readableFileSize_ = utils::humanReadableFileSize(size);
@@ -134,7 +127,7 @@ AudioItem::mousePressEvent(QMouseEvent *event)
if (filenameToSave_.isEmpty())
return;
- auto proxy = client_->downloadFile(url_);
+ auto proxy = http::client()->downloadFile(url_);
connect(proxy.data(),
&DownloadMediaProxy::fileDownloaded,
this,
diff --git a/src/timeline/widgets/FileItem.cc b/src/timeline/widgets/FileItem.cc
index 7445eb0f..7ff60d87 100644
--- a/src/timeline/widgets/FileItem.cc
+++ b/src/timeline/widgets/FileItem.cc
@@ -23,6 +23,7 @@
#include <QPainter>
#include <QPixmap>
+#include "MatrixClient.h"
#include "Utils.h"
#include "timeline/widgets/FileItem.h"
@@ -56,32 +57,24 @@ FileItem::init()
QString media_params = url_parts[1];
url_ = QString("%1/_matrix/media/r0/download/%2")
- .arg(client_.data()->getHomeServer().toString(), media_params);
+ .arg(http::client()->getHomeServer().toString(), media_params);
}
-FileItem::FileItem(QSharedPointer<MatrixClient> client,
- const mtx::events::RoomEvent<mtx::events::msg::File> &event,
- QWidget *parent)
+FileItem::FileItem(const mtx::events::RoomEvent<mtx::events::msg::File> &event, QWidget *parent)
: QWidget(parent)
, url_{QString::fromStdString(event.content.url)}
, text_{QString::fromStdString(event.content.body)}
, event_{event}
- , client_{client}
{
readableFileSize_ = utils::humanReadableFileSize(event.content.info.size);
init();
}
-FileItem::FileItem(QSharedPointer<MatrixClient> client,
- const QString &url,
- const QString &filename,
- uint64_t size,
- QWidget *parent)
+FileItem::FileItem(const QString &url, const QString &filename, uint64_t size, QWidget *parent)
: QWidget(parent)
, url_{url}
, text_{filename}
- , client_{client}
{
readableFileSize_ = utils::humanReadableFileSize(size);
@@ -120,7 +113,7 @@ FileItem::mousePressEvent(QMouseEvent *event)
if (filenameToSave_.isEmpty())
return;
- auto proxy = client_->downloadFile(url_);
+ auto proxy = http::client()->downloadFile(url_);
connect(proxy.data(),
&DownloadMediaProxy::fileDownloaded,
this,
diff --git a/src/timeline/widgets/ImageItem.cc b/src/timeline/widgets/ImageItem.cc
index 03f9741b..66cd31ab 100644
--- a/src/timeline/widgets/ImageItem.cc
+++ b/src/timeline/widgets/ImageItem.cc
@@ -25,16 +25,14 @@
#include <QUuid>
#include "Config.h"
+#include "MatrixClient.h"
#include "Utils.h"
#include "dialogs/ImageOverlay.h"
#include "timeline/widgets/ImageItem.h"
-ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
- const mtx::events::RoomEvent<mtx::events::msg::Image> &event,
- QWidget *parent)
+ImageItem::ImageItem(const mtx::events::RoomEvent<mtx::events::msg::Image> &event, QWidget *parent)
: QWidget(parent)
, event_{event}
- , client_{client}
{
setMouseTracking(true);
setCursor(Qt::PointingHandCursor);
@@ -52,9 +50,9 @@ ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
QString media_params = url_parts[1];
url_ = QString("%1/_matrix/media/r0/download/%2")
- .arg(client_.data()->getHomeServer().toString(), media_params);
+ .arg(http::client()->getHomeServer().toString(), media_params);
- auto proxy = client_.data()->downloadImage(url_);
+ auto proxy = http::client()->downloadImage(url_);
connect(proxy.data(),
&DownloadMediaProxy::imageDownloaded,
@@ -65,15 +63,10 @@ ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
});
}
-ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
- const QString &url,
- const QString &filename,
- uint64_t size,
- QWidget *parent)
+ImageItem::ImageItem(const QString &url, const QString &filename, uint64_t size, QWidget *parent)
: QWidget(parent)
, url_{url}
, text_{filename}
- , client_{client}
{
Q_UNUSED(size);
@@ -90,9 +83,9 @@ ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
QString media_params = url_parts[1];
url_ = QString("%1/_matrix/media/r0/download/%2")
- .arg(client_.data()->getHomeServer().toString(), media_params);
+ .arg(http::client()->getHomeServer().toString(), media_params);
- auto proxy = client_.data()->downloadImage(url_);
+ auto proxy = http::client()->downloadImage(url_);
connect(proxy.data(),
&DownloadMediaProxy::imageDownloaded,
@@ -238,7 +231,7 @@ ImageItem::saveAs()
if (filename.isEmpty())
return;
- auto proxy = client_->downloadFile(url_);
+ auto proxy = http::client()->downloadFile(url_);
connect(proxy.data(),
&DownloadMediaProxy::fileDownloaded,
this,
diff --git a/src/timeline/widgets/VideoItem.cc b/src/timeline/widgets/VideoItem.cc
index 788db0ed..f5bcfd6e 100644
--- a/src/timeline/widgets/VideoItem.cc
+++ b/src/timeline/widgets/VideoItem.cc
@@ -20,6 +20,7 @@
#include <QVBoxLayout>
#include "Config.h"
+#include "MatrixClient.h"
#include "Utils.h"
#include "timeline/widgets/VideoItem.h"
@@ -34,17 +35,14 @@ VideoItem::init()
QString media_params = url_parts[1];
url_ = QString("%1/_matrix/media/r0/download/%2")
- .arg(client_.data()->getHomeServer().toString(), media_params);
+ .arg(http::client()->getHomeServer().toString(), media_params);
}
-VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
- const mtx::events::RoomEvent<mtx::events::msg::Video> &event,
- QWidget *parent)
+VideoItem::VideoItem(const mtx::events::RoomEvent<mtx::events::msg::Video> &event, QWidget *parent)
: QWidget(parent)
, url_{QString::fromStdString(event.content.url)}
, text_{QString::fromStdString(event.content.body)}
, event_{event}
- , client_{client}
{
readableFileSize_ = utils::humanReadableFileSize(event.content.info.size);
@@ -65,15 +63,10 @@ VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
layout->addWidget(label_);
}
-VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
- const QString &url,
- const QString &filename,
- uint64_t size,
- QWidget *parent)
+VideoItem::VideoItem(const QString &url, const QString &filename, uint64_t size, QWidget *parent)
: QWidget(parent)
, url_{url}
, text_{filename}
- , client_{client}
{
readableFileSize_ = utils::humanReadableFileSize(size);
|
