d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-23 03:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix CI errors

Browse source
This commit is contained in:
Konstantinos Sideris 2018-03-25 23:05:44 +03:00
parent f02d3ee606
commit f6f46119a6
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AvatarProvider.cc
View file

@ -52,7 +52,7 @@ AvatarProvider::resolve(const QString &userId,
auto proxy = client_->fetchUserAvatar(avatars_[userId].url); auto proxy = client_->fetchUserAvatar(avatars_[userId].url);
if (proxy == nullptr) if (proxy.isNull())
return; return;
connect(proxy.data(), connect(proxy.data(),

3
src/ChatPage.cc
View file

@ -581,7 +581,8 @@ ChatPage::updateOwnProfileInfo(const QUrl &avatar_url, const QString &display_na
if (avatar_url.isValid()) { if (avatar_url.isValid()) {
auto proxy = client_->fetchUserAvatar(avatar_url); auto proxy = client_->fetchUserAvatar(avatar_url);
if (proxy == nullptr)
if (proxy.isNull())
return; return;
proxy->setParent(this); proxy->setParent(this);

14
src/MatrixClient.cc
View file

@ -716,7 +716,7 @@ MatrixClient::fetchUserAvatar(const QUrl &avatarUrl)
if (url_parts.size() != 2) { if (url_parts.size() != 2) {
qDebug() << "Invalid format for user avatar:" << avatarUrl.toString(); qDebug() << "Invalid format for user avatar:" << avatarUrl.toString();
return nullptr; return QSharedPointer<DownloadMediaProxy>();
} }
QUrlQuery query; QUrlQuery query;
@ -733,8 +733,8 @@ MatrixClient::fetchUserAvatar(const QUrl &avatarUrl)
QNetworkRequest avatar_request(endpoint); QNetworkRequest avatar_request(endpoint);
auto reply = get(avatar_request); auto reply = get(avatar_request);
auto proxy = QSharedPointer<DownloadMediaProxy>( auto proxy = QSharedPointer<DownloadMediaProxy>(new DownloadMediaProxy,
new DownloadMediaProxy, [this](auto proxy) { proxy->deleteLater(); }); [](auto proxy) { proxy->deleteLater(); });
connect(reply, &QNetworkReply::finished, this, [reply, proxy, avatarUrl]() { connect(reply, &QNetworkReply::finished, this, [reply, proxy, avatarUrl]() {
reply->deleteLater(); reply->deleteLater();
@ -767,8 +767,8 @@ MatrixClient::downloadImage(const QUrl &url)
QNetworkRequest image_request(url); QNetworkRequest image_request(url);
auto reply = get(image_request); auto reply = get(image_request);
auto proxy = QSharedPointer<DownloadMediaProxy>( auto proxy = QSharedPointer<DownloadMediaProxy>(new DownloadMediaProxy,
new DownloadMediaProxy, [this](auto proxy) { proxy->deleteLater(); }); [](auto proxy) { proxy->deleteLater(); });
connect(reply, &QNetworkReply::finished, this, [reply, proxy]() { connect(reply, &QNetworkReply::finished, this, [reply, proxy]() {
reply->deleteLater(); reply->deleteLater();
@ -799,8 +799,8 @@ MatrixClient::downloadFile(const QUrl &url)
QNetworkRequest fileRequest(url); QNetworkRequest fileRequest(url);
auto reply = get(fileRequest); auto reply = get(fileRequest);
auto proxy = QSharedPointer<DownloadMediaProxy>( auto proxy = QSharedPointer<DownloadMediaProxy>(new DownloadMediaProxy,
new DownloadMediaProxy, [this](auto proxy) { proxy->deleteLater(); }); [](auto proxy) { proxy->deleteLater(); });
connect(reply, &QNetworkReply::finished, this, [reply, proxy]() { connect(reply, &QNetworkReply::finished, this, [reply, proxy]() {
reply->deleteLater(); reply->deleteLater();