From f3168f880c6ef87eb1ea4613ab8d792b459146b8 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 7 Dec 2022 09:37:25 +0100 Subject: [PATCH] build fix --- src/librssguard/network-web/networkfactory.cpp | 2 +- src/librssguard/network-web/networkfactory.h | 4 ++-- src/librssguard/services/abstract/gui/formcategorydetails.cpp | 2 +- src/librssguard/services/standard/gui/standardfeeddetails.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librssguard/network-web/networkfactory.cpp b/src/librssguard/network-web/networkfactory.cpp index 139e4a554..9de4508a1 100644 --- a/src/librssguard/network-web/networkfactory.cpp +++ b/src/librssguard/network-web/networkfactory.cpp @@ -149,7 +149,7 @@ QString NetworkFactory::sanitizeUrl(const QString& url) { QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList>& urls, int timeout, - QIcon& output, + QPixmap& output, const QList>& additional_headers, const QNetworkProxy& custom_proxy) { QNetworkReply::NetworkError network_result = QNetworkReply::NetworkError::UnknownNetworkError; diff --git a/src/librssguard/network-web/networkfactory.h b/src/librssguard/network-web/networkfactory.h index 09421067d..5e364b07b 100644 --- a/src/librssguard/network-web/networkfactory.h +++ b/src/librssguard/network-web/networkfactory.h @@ -43,11 +43,11 @@ class NetworkFactory { static QString networkErrorText(QNetworkReply::NetworkError error_code); static QString sanitizeUrl(const QString& url); - // Performs SYNCHRONOUS download if favicon for the site, + // Performs SYNCHRONOUS favicon download for the site, // given URL belongs to. static QNetworkReply::NetworkError downloadIcon(const QList>& urls, int timeout, - QIcon& output, + QPixmap& output, const QList>& additional_headers, const QNetworkProxy& custom_proxy = QNetworkProxy::ProxyType::DefaultProxy); diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.cpp b/src/librssguard/services/abstract/gui/formcategorydetails.cpp index a648e1bb7..b9ac572d8 100644 --- a/src/librssguard/services/abstract/gui/formcategorydetails.cpp +++ b/src/librssguard/services/abstract/gui/formcategorydetails.cpp @@ -145,7 +145,7 @@ void FormCategoryDetails::onLoadIconFromFile() { auto supported_formats = QImageReader::supportedImageFormats(); auto prefixed_formats = boolinq::from(supported_formats) .select([](const QByteArray& frmt) { - return QSL("*.%1").arg(frmt); + return QSL("*.%1").arg(QString::fromLocal8Bit(frmt)); }) .toStdList(); diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.cpp b/src/librssguard/services/standard/gui/standardfeeddetails.cpp index 4672484f7..5af65c788 100644 --- a/src/librssguard/services/standard/gui/standardfeeddetails.cpp +++ b/src/librssguard/services/standard/gui/standardfeeddetails.cpp @@ -281,7 +281,7 @@ void StandardFeedDetails::onLoadIconFromFile() { auto supported_formats = QImageReader::supportedImageFormats(); auto prefixed_formats = boolinq::from(supported_formats) .select([](const QByteArray& frmt) { - return QSL("*.%1").arg(frmt); + return QSL("*.%1").arg(QString::fromLocal8Bit(frmt)); }) .toStdList();