Moves all globals into a structure that can be deleted before the app exists. Fixes #193.

4 files changed, 7 insertions, 7 deletions

diff --git a/src/protocols/abouthandler.cpp b/src/protocols/abouthandler.cpp
index 46fa643..13bc098 100644
--- a/src/protocols/abouthandler.cpp
+++ b/src/protocols/abouthandler.cpp
@@ -30,7 +30,7 @@ bool AboutHandler::startRequest(const QUrl &url, ProtocolHandler::RequestOptions
 
         QString current_group;
 
-        for (auto const &fav : kristall::favourites.allFavourites())
+        for (auto const &fav : kristall::globals().favourites.allFavourites())
         {
             if(current_group != fav.first) {
 
@@ -54,7 +54,7 @@ bool AboutHandler::startRequest(const QUrl &url, ProtocolHandler::RequestOptions
         QByteArray document;
         document.append("# Cache information\n");
 
-        auto& cache = kristall::cache.getPages();
+        auto& cache = kristall::globals().cache.getPages();
         long unsigned cache_usage = 0;
         int cached_count = 0;
         for (auto it = cache.begin(); it != cache.end(); ++it, ++cached_count)
diff --git a/src/protocols/filehandler.cpp b/src/protocols/filehandler.cpp
index dfb6243..9e76dcd 100644
--- a/src/protocols/filehandler.cpp
+++ b/src/protocols/filehandler.cpp
@@ -38,7 +38,7 @@ bool FileHandler::startRequest(const QUrl &url, RequestOptions options)
         page += QString("# Index of %1\n").arg(url.path());
 
         auto filters = QDir::Dirs | QDir::Files | QDir::NoDot;
-        if (kristall::options.show_hidden_files_in_dirs) filters |= QDir::Hidden;
+        if (kristall::globals().options.show_hidden_files_in_dirs) filters |= QDir::Hidden;
         dir.setFilter(filters);
 
         // Iterate over files in the directory, and add links to each.
diff --git a/src/protocols/geminiclient.cpp b/src/protocols/geminiclient.cpp
index 30c79ac..9c5769c 100644
--- a/src/protocols/geminiclient.cpp
+++ b/src/protocols/geminiclient.cpp
@@ -65,7 +65,7 @@ bool GeminiClient::startRequest(const QUrl &url, RequestOptions options)
 
     QSslConfiguration ssl_config = socket.sslConfiguration();
     ssl_config.setProtocol(QSsl::TlsV1_2);
-    if(not kristall::trust::gemini.enable_ca)
+    if(not kristall::globals().trust.gemini.enable_ca)
         ssl_config.setCaCertificates(QList<QSslCertificate> { });
     else
         ssl_config.setCaCertificates(QSslConfiguration::systemCaCertificates());
@@ -341,7 +341,7 @@ void GeminiClient::sslErrors(QList<QSslError> const & errors)
         bool ignore = false;
         if(SslTrust::isTrustRelated(err.error()))
         {
-            switch(kristall::trust::gemini.getTrust(target_url, socket.peerCertificate()))
+            switch(kristall::globals().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 58b3365..01c6b1b 100644
--- a/src/protocols/webclient.cpp
+++ b/src/protocols/webclient.cpp
@@ -40,7 +40,7 @@ bool WebClient::startRequest(const QUrl &url, RequestOptions options)
 
     auto ssl_config = request.sslConfiguration();
     // ssl_config.setProtocol(QSsl::TlsV1_2);
-    if(kristall::trust::https.enable_ca)
+    if(kristall::globals().trust.https.enable_ca)
         ssl_config.setCaCertificates(QSslConfiguration::systemCaCertificates());
     else
         ssl_config.setCaCertificates(QList<QSslCertificate> { });
@@ -188,7 +188,7 @@ void WebClient::on_sslErrors(const QList<QSslError> &errors)
         if(SslTrust::isTrustRelated(err.error()))
         {
             auto cert = this->current_reply->sslConfiguration().peerCertificate();
-            switch(kristall::trust::https.getTrust(this->current_reply->url(), cert))
+            switch(kristall::globals().trust.https.getTrust(this->current_reply->url(), cert))
             {
             case SslTrust::Trusted:
                 ignore = true;