jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace qhttp client with curl for favicon downloading (#1460)

Browse Source 
Replace qhttp client with curl for favicon downloading
This commit is contained in:
Jonathan White
2018-02-07 07:10:56 -05:00
committed by GitHub
parent 61a3d5ffda
commit 490e92167d
9 changed files with 87 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/EditWidgetIcons.h
View File

@@ -32,14 +32,6 @@ class Database;
class DefaultIconModel;
class CustomIconModel;
#ifdef WITH_XC_NETWORKING
namespace qhttp {
namespace client {
class QHttpClient;
}
}
#endif
namespace Ui {
class EditWidgetIcons;
}
@@ -74,9 +66,7 @@ signals:
private slots:
void downloadFavicon();
#ifdef WITH_XC_NETWORKING
void fetchFavicon(const QUrl& url);
void fetchFaviconFromGoogle(const QString& domain);
void resetFaviconDownload(bool clearRedirect = true);
QImage fetchFavicon(const QUrl& url);
#endif
void addCustomIconFromFile();
void addCustomIcon(const QImage& icon);
@@ -93,12 +83,6 @@ private:
QString m_url;
DefaultIconModel* const m_defaultIconModel;
CustomIconModel* const m_customIconModel;
#ifdef WITH_XC_NETWORKING
QUrl m_redirectUrl;
bool m_fallbackToGoogle;
unsigned short m_redirectCount;
qhttp::client::QHttpClient* m_httpClient = nullptr;
#endif
Q_DISABLE_COPY(EditWidgetIcons)
};