summary refs log tree commit diff
path: root/src/timeline/widgets/ImageItem.cc
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-15 19:09:08 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-15 19:09:08 +0300
commit33490eddab385ca488b11d6d50683ddb6a18da6c (patch)
treef597b53c3baf0c96a0d7226f28f50740acd8b256 /src/timeline/widgets/ImageItem.cc
parentUser reverse iterator instead of while loop (diff)
downloadnheko-33490eddab385ca488b11d6d50683ddb6a18da6c.tar.xz
Remove the v2 namespace from the http client
Diffstat (limited to 'src/timeline/widgets/ImageItem.cc')
-rw-r--r--src/timeline/widgets/ImageItem.cc42
1 files changed, 21 insertions, 21 deletions
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; - } - - QPixmap img; - img.loadFromData(QByteArray(data.data(), data.size())); - emit imageDownloaded(img); - }); + 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); + }); } 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 &,