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

3 files changed, 4 insertions, 4 deletions

diff --git a/src/renderers/geminirenderer.cpp b/src/renderers/geminirenderer.cpp
index 0649afb..0e62ef3 100644
--- a/src/renderers/geminirenderer.cpp
+++ b/src/renderers/geminirenderer.cpp
@@ -43,7 +43,7 @@ std::unique_ptr<GeminiDocument> GeminiRenderer::render(
     renderhelpers::setPageMargins(result.get(), themed_style.margin_h, themed_style.margin_v);
     result->setIndentWidth(themed_style.indent_size);
 
-    bool emit_fancy_text = kristall::options.enable_text_decoration;
+    bool emit_fancy_text = kristall::globals().options.enable_text_decoration;
 
     QTextCursor cursor{result.get()};
 
@@ -472,7 +472,7 @@ GeminiDocument::~GeminiDocument()
  */
 static QByteArray replace_quotes(QByteArray &line)
 {
-    if (!kristall::options.fancy_quotes)
+    if (!kristall::globals().options.fancy_quotes)
         return line;
 
     int last_d = -1,
diff --git a/src/renderers/gophermaprenderer.cpp b/src/renderers/gophermaprenderer.cpp
index 02abebd..43017fa 100644
--- a/src/renderers/gophermaprenderer.cpp
+++ b/src/renderers/gophermaprenderer.cpp
@@ -27,7 +27,7 @@ std::unique_ptr<QTextDocument> GophermapRenderer::render(const QByteArray &input
     external_link.setFont(themed_style.standard_font);
     external_link.setForeground(QBrush(themed_style.external_link_color));
 
-    bool emit_text_only = (kristall::options.gophermap_display == GenericSettings::PlainText);
+    bool emit_text_only = (kristall::globals().options.gophermap_display == GenericSettings::PlainText);
 
     std::unique_ptr<QTextDocument> result = std::make_unique<QTextDocument>();
     renderhelpers::setPageMargins(result.get(), themed_style.margin_h, themed_style.margin_v);
diff --git a/src/renderers/renderhelpers.cpp b/src/renderers/renderhelpers.cpp
index 5f9925b..442d18f 100644
--- a/src/renderers/renderhelpers.cpp
+++ b/src/renderers/renderhelpers.cpp
@@ -30,7 +30,7 @@ static void setColor(QTextCharFormat& format, unsigned char n, bool bg=false)
     if (n < 16)
     {
         // The normal pre-defined typical 16 colors.
-        color = QColor(kristall::document_style.ansi_colors[n]);
+        color = QColor(kristall::globals().document_style.ansi_colors[n]);
     }
     else if (n < 232)
     {