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

3 files changed, 11 insertions, 11 deletions

diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp
index 2c08110..4d7d5ff 100644
--- a/src/dialogs/certificateselectiondialog.cpp
+++ b/src/dialogs/certificateselectiondialog.cpp
@@ -16,7 +16,7 @@ CertificateSelectionDialog::CertificateSelectionDialog(QWidget *parent) :
     ui->setupUi(this);
     this->ui->server_request->setVisible(false);
 
-    this->ui->certificates->setModel(&kristall::identities);
+    this->ui->certificates->setModel(&kristall::globals().identities);
     this->ui->certificates->expandAll();
 
     connect(this->ui->certificates->selectionModel(), &QItemSelectionModel::currentChanged, this, &CertificateSelectionDialog::on_currentChanged);
@@ -86,7 +86,7 @@ void CertificateSelectionDialog::on_currentChanged(const QModelIndex &current, c
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
-    auto id = kristall::identities.getIdentity(current);
+    auto id = kristall::globals().identities.getIdentity(current);
 
     this->ui->use_selected_cert->setEnabled(id.isValid());
 }
@@ -103,7 +103,7 @@ void CertificateSelectionDialog::on_create_new_cert_clicked()
         return;
     id.is_persistent = true;
 
-    kristall::identities.addCertificate(
+    kristall::globals().identities.addCertificate(
         dialog.groupName(),
         id);
 }
@@ -111,7 +111,7 @@ void CertificateSelectionDialog::on_create_new_cert_clicked()
 void CertificateSelectionDialog::on_use_selected_cert_clicked()
 {
     auto sel = this->ui->certificates->selectionModel()->currentIndex();
-    this->cryto_identity = kristall::identities.getIdentity(sel);
+    this->cryto_identity = kristall::globals().identities.getIdentity(sel);
     if(this->cryto_identity.isValid()) {
         this->accept();
     } else {
@@ -121,7 +121,7 @@ void CertificateSelectionDialog::on_use_selected_cert_clicked()
 
 void CertificateSelectionDialog::on_certificates_doubleClicked(const QModelIndex &index)
 {
-    this->cryto_identity = kristall::identities.getIdentity(index);
+    this->cryto_identity = kristall::globals().identities.getIdentity(index);
     if(this->cryto_identity.isValid()) {
         this->accept();
     } else {
diff --git a/src/dialogs/newidentitiydialog.cpp b/src/dialogs/newidentitiydialog.cpp
index aa2241c..567fc7d 100644
--- a/src/dialogs/newidentitiydialog.cpp
+++ b/src/dialogs/newidentitiydialog.cpp
@@ -19,7 +19,7 @@ NewIdentitiyDialog::NewIdentitiyDialog(QWidget *parent) :
     ui->expiration_date->setTime(QTime(12, 00));
 
     ui->group->clear();
-    for(const auto &group_name : kristall::identities.groups())
+    for(const auto &group_name : kristall::globals().identities.groups())
     {
         ui->group->addItem(group_name);
     }
diff --git a/src/dialogs/settingsdialog.cpp b/src/dialogs/settingsdialog.cpp
index 8072b43..862963b 100644
--- a/src/dialogs/settingsdialog.cpp
+++ b/src/dialogs/settingsdialog.cpp
@@ -52,10 +52,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     setGeminiStyle(DocumentStyle { });
 
     this->predefined_styles.clear();
-    for(auto const & fileName : kristall::dirs::styles.entryList())
+    for(auto const & fileName : kristall::globals().dirs.styles.entryList())
     {
         QSettings style_sheet {
-            kristall::dirs::styles.absoluteFilePath(fileName),
+            kristall::globals().dirs.styles.absoluteFilePath(fileName),
             QSettings::IniFormat
         };
 
@@ -670,7 +670,7 @@ void SettingsDialog::on_preset_load_clicked()
 
 void SettingsDialog::on_SettingsDialog_accepted()
 {
-    QStringList files = kristall::dirs::styles.entryList();
+    QStringList files = kristall::globals().dirs.styles.entryList();
 
     for(auto const & style_name : this->predefined_styles.keys())
     {
@@ -678,7 +678,7 @@ void SettingsDialog::on_SettingsDialog_accepted()
         files.removeAll(fileName);
 
         QSettings style_sheet {
-            kristall::dirs::styles.absoluteFilePath(fileName),
+            kristall::globals().dirs.styles.absoluteFilePath(fileName),
             QSettings::IniFormat
         };
 
@@ -690,7 +690,7 @@ void SettingsDialog::on_SettingsDialog_accepted()
 
     for(auto const & fileName : files)
     {
-        kristall::dirs::styles.remove(fileName);
+        kristall::globals().dirs.styles.remove(fileName);
     }
 }