diff --git a/src/timeline/widgets/AudioItem.cc b/src/timeline/widgets/AudioItem.cc
index 7cbbed28..2ed4f4c0 100644
--- a/src/timeline/widgets/AudioItem.cc
+++ b/src/timeline/widgets/AudioItem.cc
@@ -120,7 +120,7 @@ AudioItem::mousePressEvent(QMouseEvent *event)
if (filenameToSave_.isEmpty())
return;
- http::v2::client()->download(
+ http::client()->download(
url_.toString().toStdString(),
[this](const std::string &data,
const std::string &,
diff --git a/src/timeline/widgets/FileItem.cc b/src/timeline/widgets/FileItem.cc
index 4ce4d256..7c2be9f2 100644
--- a/src/timeline/widgets/FileItem.cc
+++ b/src/timeline/widgets/FileItem.cc
@@ -83,8 +83,8 @@ FileItem::openUrl()
auto mxc_parts = mtx::client::utils::parse_mxc_url(url_.toString().toStdString());
auto urlToOpen = QString("https://%1:%2/_matrix/media/r0/download/%3/%4")
- .arg(QString::fromStdString(http::v2::client()->server()))
- .arg(http::v2::client()->port())
+ .arg(QString::fromStdString(http::client()->server()))
+ .arg(http::client()->port())
.arg(QString::fromStdString(mxc_parts.server))
.arg(QString::fromStdString(mxc_parts.media_id));
@@ -114,7 +114,7 @@ FileItem::mousePressEvent(QMouseEvent *event)
if (filenameToSave_.isEmpty())
return;
- http::v2::client()->download(
+ http::client()->download(
url_.toString().toStdString(),
[this](const std::string &data,
const std::string &,
diff --git a/src/timeline/widgets/ImageItem.cc b/src/timeline/widgets/ImageItem.cc
index bf1c05d6..8c8f50a1 100644
--- a/src/timeline/widgets/ImageItem.cc
+++ b/src/timeline/widgets/ImageItem.cc
@@ -33,24 +33,24 @@
void
ImageItem::downloadMedia(const QUrl &url)
{
- http::v2::client()->download(url.toString().toStdString(),
- [this, url](const std::string &data,
- const std::string &,
- const std::string &,
- mtx::http::RequestErr err) {
- if (err) {
- nhlog::net()->warn(
- "failed to retrieve image {}: {} {}",
- url.toString().toStdString(),
- err->matrix_error.error,
- static_cast<int>(err->status_code));
- return;
- }
+ http::client()->download(url.toString().toStdString(),
+ [this, url](const std::string &data,
+ const std::string &,
+ const std::string &,
+ mtx::http::RequestErr err) {
+ if (err) {
+ nhlog::net()->warn(
+ "failed to retrieve image {}: {} {}",
+ url.toString().toStdString(),
+ err->matrix_error.error,
+ static_cast<int>(err->status_code));
+ return;
+ }
- QPixmap img;
- img.loadFromData(QByteArray(data.data(), data.size()));
- emit imageDownloaded(img);
- });
+ QPixmap img;
+ img.loadFromData(QByteArray(data.data(), data.size()));
+ emit imageDownloaded(img);
+ });
}
void
@@ -108,8 +108,8 @@ ImageItem::openUrl()
auto mxc_parts = mtx::client::utils::parse_mxc_url(url_.toString().toStdString());
auto urlToOpen = QString("https://%1:%2/_matrix/media/r0/download/%3/%4")
- .arg(QString::fromStdString(http::v2::client()->server()))
- .arg(http::v2::client()->port())
+ .arg(QString::fromStdString(http::client()->server()))
+ .arg(http::client()->port())
.arg(QString::fromStdString(mxc_parts.server))
.arg(QString::fromStdString(mxc_parts.media_id));
@@ -244,7 +244,7 @@ ImageItem::saveAs()
const auto url = url_.toString().toStdString();
- http::v2::client()->download(
+ http::client()->download(
url,
[this, filename, url](const std::string &data,
const std::string &,
|
