fix: solve compile issue

6 files changed, 58 insertions, 73 deletions

diff --git a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp
index d2bbf07b..0c3af463 100644
--- a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp
+++ b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp
@@ -279,47 +279,33 @@ void GnuPGControllerDialog::slot_update_custom_gnupg_install_path_label(
 }
 
 void GnuPGControllerDialog::set_settings() {
-  auto& settings = GlobalSettingStation::GetInstance().GetMainSettings();
-
-  try {
-    bool non_ascii_when_export =
-        settings.lookup("general.non_ascii_when_export");
-    GF_UI_LOG_DEBUG("non_ascii_when_export: {}", non_ascii_when_export);
-    if (non_ascii_when_export)
-      ui_->asciiModeCheckBox->setCheckState(Qt::Checked);
-  } catch (...) {
-    GF_UI_LOG_ERROR("setting operation error: non_ascii_when_export");
-  }
+  auto& settings_station = GlobalSettingStation::GetInstance();
+
+  bool non_ascii_when_export =
+      settings_station.LookupSettings("general.non_ascii_when_export", true);
+  GF_UI_LOG_DEBUG("non_ascii_when_export: {}", non_ascii_when_export);
+  if (non_ascii_when_export) ui_->asciiModeCheckBox->setCheckState(Qt::Checked);
 
-  try {
-    bool use_custom_key_database_path =
-        settings.lookup("general.use_custom_key_database_path");
-    if (use_custom_key_database_path)
-      ui_->keyDatabseUseCustomCheckBox->setCheckState(Qt::Checked);
-  } catch (...) {
-    GF_UI_LOG_ERROR("setting operation error: use_custom_key_database_path");
+  bool const use_custom_key_database_path = settings_station.LookupSettings(
+      "general.use_custom_key_database_path", false);
+  if (use_custom_key_database_path) {
+    ui_->keyDatabseUseCustomCheckBox->setCheckState(Qt::Checked);
   }
 
   this->slot_update_custom_key_database_path_label(
       ui_->keyDatabseUseCustomCheckBox->checkState());
 
-  try {
-    bool use_custom_gnupg_install_path =
-        settings.lookup("general.use_custom_gnupg_install_path");
-    if (use_custom_gnupg_install_path)
-      ui_->useCustomGnuPGInstallPathCheckBox->setCheckState(Qt::Checked);
-  } catch (...) {
-    GF_UI_LOG_ERROR("setting operation error: use_custom_gnupg_install_path");
+  bool const use_custom_gnupg_install_path = settings_station.LookupSettings(
+      "general.use_custom_gnupg_install_path", false);
+  if (use_custom_gnupg_install_path) {
+    ui_->useCustomGnuPGInstallPathCheckBox->setCheckState(Qt::Checked);
   }
 
-  try {
-    bool use_pinentry_as_password_input_dialog =
-        settings.lookup("general.use_pinentry_as_password_input_dialog");
-    if (use_pinentry_as_password_input_dialog)
-      ui_->usePinentryAsPasswordInputDialogCheckBox->setCheckState(Qt::Checked);
-  } catch (...) {
-    GF_UI_LOG_ERROR(
-        "setting operation error: use_pinentry_as_password_input_dialog");
+  bool const use_pinentry_as_password_input_dialog =
+      settings_station.LookupSettings(
+          "general.use_pinentry_as_password_input_dialog", false);
+  if (use_pinentry_as_password_input_dialog) {
+    ui_->usePinentryAsPasswordInputDialogCheckBox->setCheckState(Qt::Checked);
   }
 
   this->slot_update_custom_gnupg_install_path_label(
diff --git a/src/ui/dialog/settings/SettingsAdvanced.cpp b/src/ui/dialog/settings/SettingsAdvanced.cpp
index f7c6eeaa..6d8a2b4a 100644
--- a/src/ui/dialog/settings/SettingsAdvanced.cpp
+++ b/src/ui/dialog/settings/SettingsAdvanced.cpp
@@ -55,15 +55,17 @@ AdvancedTab::AdvancedTab(QWidget* parent) : QWidget(parent) {
 }
 
 void AdvancedTab::SetSettings() {
-  int stegano_checked = GlobalSettingStation::GetInstance().LookupSettings(
-      "advanced.stegano_checked", false);
+  auto const stegano_checked =
+      GlobalSettingStation::GetInstance().LookupSettings(
+          "advanced.stegano_checked", false);
   if (stegano_checked) stegano_check_box_->setCheckState(Qt::Checked);
 
-  int auto_pubkey_exchange_checked =
+  auto const auto_pubkey_exchange_checked =
       GlobalSettingStation::GetInstance().LookupSettings(
           "advanced.auto_pubkey_exchange_checked", false);
-  if (auto_pubkey_exchange_checked)
+  if (auto_pubkey_exchange_checked) {
     auto_pubkey_exchange_check_box_->setCheckState(Qt::Checked);
+  }
 }
 
 void AdvancedTab::ApplySettings() {
@@ -71,23 +73,24 @@ void AdvancedTab::ApplySettings() {
       GpgFrontend::GlobalSettingStation::GetInstance().GetMainSettings();
 
   if (!settings.exists("advanced") ||
-      settings.lookup("advanced").getType() != libconfig::Setting::TypeGroup)
+      settings.lookup("advanced").getType() != libconfig::Setting::TypeGroup) {
     settings.add("advanced", libconfig::Setting::TypeGroup);
+  }
 
   auto& advanced = settings["advanced"];
 
-  if (!advanced.exists("stegano_checked"))
+  if (!advanced.exists("stegano_checked")) {
     advanced.add("stegano_checked", libconfig::Setting::TypeBoolean) =
         stegano_check_box_->isChecked();
-  else {
+  } else {
     advanced["stegano_checked"] = stegano_check_box_->isChecked();
   }
 
-  if (!advanced.exists("auto_pubkey_exchange_checked"))
+  if (!advanced.exists("auto_pubkey_exchange_checked")) {
     advanced.add("auto_pubkey_exchange_checked",
                  libconfig::Setting::TypeBoolean) =
         auto_pubkey_exchange_check_box_->isChecked();
-  else {
+  } else {
     advanced["auto_pubkey_exchange_checked"] =
         auto_pubkey_exchange_check_box_->isChecked();
   }
diff --git a/src/ui/dialog/settings/SettingsAppearance.cpp b/src/ui/dialog/settings/SettingsAppearance.cpp
index 84d79f17..6ce04f45 100644
--- a/src/ui/dialog/settings/SettingsAppearance.cpp
+++ b/src/ui/dialog/settings/SettingsAppearance.cpp
@@ -28,7 +28,6 @@
 
 #include "SettingsAppearance.h"
 
-#include "core/function/GlobalSettingStation.h"
 #include "ui/struct/SettingsObject.h"
 #include "ui_AppearanceSettings.h"
 
@@ -76,8 +75,10 @@ AppearanceTab::AppearanceTab(QWidget* parent)
 void AppearanceTab::SetSettings() {
   SettingsObject general_settings_state("general_settings_state");
 
-  int width = general_settings_state.Check("icon_size").Check("width", 24),
-      height = general_settings_state.Check("icon_size").Check("height", 24);
+  int const width =
+      general_settings_state.Check("icon_size").Check("width", 24);
+  int const height =
+      general_settings_state.Check("icon_size").Check("height", 24);
 
   auto icon_size = QSize(width, height);
 
@@ -94,7 +95,7 @@ void AppearanceTab::SetSettings() {
   }
 
   // icon_style
-  int s_icon_style =
+  int const s_icon_style =
       general_settings_state.Check("icon_style", Qt::ToolButtonTextUnderIcon);
   auto icon_style = static_cast<Qt::ToolButtonStyle>(s_icon_style);
 
@@ -112,19 +113,21 @@ void AppearanceTab::SetSettings() {
       break;
   }
 
-  bool window_save = general_settings_state.Check("window_save", true);
+  bool const window_save = general_settings_state.Check("window_save", true);
   if (window_save) ui_->windowStateCheckBox->setCheckState(Qt::Checked);
 
   auto info_board_info_font_size =
       general_settings_state.Check("info_board").Check("font_size", 10);
-  if (info_board_info_font_size < 9 || info_board_info_font_size > 18)
+  if (info_board_info_font_size < 9 || info_board_info_font_size > 18) {
     info_board_info_font_size = 10;
+  }
   ui_->fontSizeInformationBoardSpinBox->setValue(info_board_info_font_size);
 
   auto text_editor_info_font_size =
       general_settings_state.Check("text_editor").Check("font_size", 10);
-  if (text_editor_info_font_size < 9 || text_editor_info_font_size > 18)
+  if (text_editor_info_font_size < 9 || text_editor_info_font_size > 18) {
     text_editor_info_font_size = 10;
+  }
   ui_->fontSizeTextEditorLabelSpinBox->setValue(text_editor_info_font_size);
 }
 
diff --git a/src/ui/dialog/settings/SettingsDialog.cpp b/src/ui/dialog/settings/SettingsDialog.cpp
index 9815ba76..daf5ac86 100644
--- a/src/ui/dialog/settings/SettingsDialog.cpp
+++ b/src/ui/dialog/settings/SettingsDialog.cpp
@@ -31,7 +31,6 @@
 #include "core/GpgConstants.h"
 #include "core/GpgModel.h"
 #include "core/function/GlobalSettingStation.h"
-#include "ui/dialog/settings/SettingsAdvanced.h"
 #include "ui/dialog/settings/SettingsAppearance.h"
 #include "ui/dialog/settings/SettingsGeneral.h"
 #include "ui/dialog/settings/SettingsKeyServer.h"
@@ -48,9 +47,9 @@ SettingsDialog::SettingsDialog(QWidget* parent)
   key_server_tab_ = new KeyserverTab();
   network_tab_ = new NetworkTab();
 
-  auto* mainLayout = new QVBoxLayout;
-  mainLayout->addWidget(tab_widget_);
-  mainLayout->stretch(0);
+  auto* main_layout = new QVBoxLayout();
+  main_layout->addWidget(tab_widget_);
+  main_layout->stretch(0);
 
   tab_widget_->addTab(general_tab_, _("General"));
   tab_widget_->addTab(appearance_tab_, _("Appearance"));
@@ -73,7 +72,7 @@ SettingsDialog::SettingsDialog(QWidget* parent)
   setWindowTitle(_("Preference"));
 #endif
 
-  setLayout(mainLayout);
+  setLayout(main_layout);
 
   // slots for handling the restart needed member
   this->slot_set_restart_needed(0);
@@ -89,8 +88,9 @@ SettingsDialog::SettingsDialog(QWidget* parent)
   // restart core and ui
   connect(general_tab_, &GeneralTab::SignalDeepRestartNeeded, this,
           [=](bool needed) {
-            if (needed && restart_needed_ < kDeepRestartCode)
+            if (needed && restart_needed_ < kDeepRestartCode) {
               this->restart_needed_ = kDeepRestartCode;
+            }
           });
 
   // announce main window
@@ -102,7 +102,9 @@ SettingsDialog::SettingsDialog(QWidget* parent)
   this->show();
 }
 
-int SettingsDialog::get_restart_needed() const { return this->restart_needed_; }
+auto SettingsDialog::get_restart_needed() const -> int {
+  return this->restart_needed_;
+}
 
 void SettingsDialog::slot_set_restart_needed(int mode) {
   this->restart_needed_ = mode;
@@ -114,19 +116,17 @@ void SettingsDialog::SlotAccept() {
   key_server_tab_->ApplySettings();
   network_tab_->ApplySettings();
 
-  GF_UI_LOG_DEBUG("apply done");
-
   // write settings to filesystem
   GlobalSettingStation::GetInstance().SyncSettings();
 
   GF_UI_LOG_DEBUG("restart needed: {}", get_restart_needed());
-  if (get_restart_needed()) {
+  if (get_restart_needed() != 0) {
     emit SignalRestartNeeded(get_restart_needed());
   }
   close();
 }
 
-QHash<QString, QString> SettingsDialog::ListLanguages() {
+auto SettingsDialog::ListLanguages() -> QHash<QString, QString> {
   QHash<QString, QString> languages;
 
   languages.insert(QString(), _("System Default"));
@@ -136,21 +136,15 @@ QHash<QString, QString> SettingsDialog::ListLanguages() {
   auto locale_dir = QDir(QString::fromStdString(locale_path.string()));
   QStringList file_names = locale_dir.entryList(QStringList("*"));
 
-  for (int i = 0; i < file_names.size(); ++i) {
-    QString locale = file_names[i];
-    GF_UI_LOG_DEBUG("locale: {}", locale.toStdString());
+  for (const auto& locale : file_names) {
+    GF_UI_LOG_DEBUG("get locale from locale directory: {}",
+                    locale.toStdString());
     if (locale == "." || locale == "..") continue;
 
-    // this works in qt 4.8
-    QLocale q_locale(locale);
+    QLocale const q_locale(locale);
     if (q_locale.nativeCountryName().isEmpty()) continue;
-#if QT_VERSION < 0x040800
-    QString language =
-        QLocale::languageToString(q_locale.language()) + " (" + locale +
-        ")";  //+ " (" + QLocale::languageToString(q_locale.language()) + ")";
-#else
+
     auto language = q_locale.nativeLanguageName() + " (" + locale + ")";
-#endif
     languages.insert(locale, language);
   }
   return languages;
diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp
index dd326567..174c9c39 100644
--- a/src/ui/dialog/settings/SettingsGeneral.cpp
+++ b/src/ui/dialog/settings/SettingsGeneral.cpp
@@ -48,8 +48,6 @@ GeneralTab::GeneralTab(QWidget* parent)
   ui_->setupUi(this);
 
   ui_->cacheBox->setTitle(_("Cache"));
-  ui_->saveCheckedKeysCheckBox->setText(
-      _("Save checked private keys on exit and restore them on next start."));
   ui_->clearGpgPasswordCacheCheckBox->setText(
       _("Clear gpg password cache when closing GpgFrontend."));
   ui_->restoreTextEditorPageCheckBox->setText(
diff --git a/src/ui/function/ArchiveDirectory.cpp b/src/ui/function/ArchiveDirectory.cpp
index 89bb7ff2..f0151705 100644
--- a/src/ui/function/ArchiveDirectory.cpp
+++ b/src/ui/function/ArchiveDirectory.cpp
@@ -80,6 +80,7 @@ auto ArchiveDirectory::Exec(const std::filesystem::path& target_directory)
     GF_UI_LOG_ERROR("archive caught exception error");
     return {false, {}};
   }
+  return {true, {}};
 }
 
 }  // namespace GpgFrontend::UI
\ No newline at end of file