From 6edd9e7a12a3827fb6aac62a88be01085e41e176 Mon Sep 17 00:00:00 2001 From: "Felix (xq) Queißner" Date: Sun, 28 Jun 2020 16:30:52 +0200 Subject: Huge refacoring of the settings stuff. Provides automated migration between old and new configuration file stuff. Themes are now just files in a folder instead of encoded data in the config file. --- src/protocols/abouthandler.cpp | 2 +- src/protocols/geminiclient.cpp | 4 ++-- src/protocols/webclient.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/protocols') diff --git a/src/protocols/abouthandler.cpp b/src/protocols/abouthandler.cpp index 01eefff..f87afb8 100644 --- a/src/protocols/abouthandler.cpp +++ b/src/protocols/abouthandler.cpp @@ -28,7 +28,7 @@ bool AboutHandler::startRequest(const QUrl &url, ProtocolHandler::RequestOptions document.append("# Favourites\n"); document.append("\n"); - for (auto const &fav : global_favourites.getAll()) + for (auto const &fav : kristall::favourites.getAll()) { document.append("=> " + fav.toString().toUtf8() + "\n"); } diff --git a/src/protocols/geminiclient.cpp b/src/protocols/geminiclient.cpp index 6986250..13f795a 100644 --- a/src/protocols/geminiclient.cpp +++ b/src/protocols/geminiclient.cpp @@ -51,7 +51,7 @@ bool GeminiClient::startRequest(const QUrl &url, RequestOptions options) QSslConfiguration ssl_config = socket.sslConfiguration(); ssl_config.setProtocol(QSsl::TlsV1_2); - if(not global_gemini_trust.enable_ca) + if(not kristall::trust::gemini.enable_ca) ssl_config.setCaCertificates(QList { }); else ssl_config.setCaCertificates(QSslConfiguration::systemCaCertificates()); @@ -316,7 +316,7 @@ void GeminiClient::sslErrors(QList const & errors) bool ignore = false; if(SslTrust::isTrustRelated(err.error())) { - switch(global_gemini_trust.getTrust(target_url, socket.peerCertificate())) + switch(kristall::trust::gemini.getTrust(target_url, socket.peerCertificate())) { case SslTrust::Trusted: ignore = true; diff --git a/src/protocols/webclient.cpp b/src/protocols/webclient.cpp index ed87694..299b39b 100644 --- a/src/protocols/webclient.cpp +++ b/src/protocols/webclient.cpp @@ -36,7 +36,7 @@ bool WebClient::startRequest(const QUrl &url, RequestOptions options) auto ssl_config = request.sslConfiguration(); // ssl_config.setProtocol(QSsl::TlsV1_2); - if(global_https_trust.enable_ca) + if(kristall::trust::https.enable_ca) ssl_config.setCaCertificates(QSslConfiguration::systemCaCertificates()); else ssl_config.setCaCertificates(QList { }); @@ -182,7 +182,7 @@ void WebClient::on_sslErrors(const QList &errors) if(SslTrust::isTrustRelated(err.error())) { auto cert = this->current_reply->sslConfiguration().peerCertificate(); - switch(global_https_trust.getTrust(this->current_reply->url(), cert)) + switch(kristall::trust::https.getTrust(this->current_reply->url(), cert)) { case SslTrust::Trusted: ignore = true; -- cgit v1.2.3