fix: qt5 compile issues

14 files changed, 36 insertions, 30 deletions

diff --git a/src/ui/GpgFrontendUIInit.cpp b/src/ui/GpgFrontendUIInit.cpp
index 9b24141f..e9c99dbc 100644
--- a/src/ui/GpgFrontendUIInit.cpp
+++ b/src/ui/GpgFrontendUIInit.cpp
@@ -42,8 +42,8 @@
 
 namespace GpgFrontend::UI {
 
-QList<QTranslator*> registered_translators;
-QList<QByteArray> loaded_qm_datum;
+QContainer<QTranslator*> registered_translators;
+QContainer<QByteArray> loaded_qm_datum;
 
 extern void InitUITranslations();
 
diff --git a/src/ui/UIModuleManager.cpp b/src/ui/UIModuleManager.cpp
index 89621f9c..b172892a 100644
--- a/src/ui/UIModuleManager.cpp
+++ b/src/ui/UIModuleManager.cpp
@@ -76,7 +76,8 @@ auto UIModuleManager::MountEntry(const QString& id,
   return true;
 }
 
-auto UIModuleManager::QueryMountedEntries(QString id) -> QList<MountedUIEntry> {
+auto UIModuleManager::QueryMountedEntries(QString id)
+    -> QContainer<MountedUIEntry> {
   if (id.isEmpty() || !mount_points_.contains(id)) return {};
   return mounted_entries_[id];
 }
diff --git a/src/ui/UIModuleManager.h b/src/ui/UIModuleManager.h
index 2388dc71..fbe9fae2 100644
--- a/src/ui/UIModuleManager.h
+++ b/src/ui/UIModuleManager.h
@@ -98,9 +98,9 @@ class GPGFRONTEND_UI_EXPORT UIModuleManager
    * @brief
    *
    * @param id
-   * @return QList<MountedUIEntry>
+   * @return QContainer<MountedUIEntry>
    */
-  auto QueryMountedEntries(QString id) -> QList<MountedUIEntry>;
+  auto QueryMountedEntries(QString id) -> QContainer<MountedUIEntry>;
 
   /**
    * @brief
@@ -156,10 +156,10 @@ class GPGFRONTEND_UI_EXPORT UIModuleManager
 
  private:
   QMap<QString, UIMountPoint> mount_points_;
-  QMap<QString, QList<MountedUIEntry>> mounted_entries_;
+  QMap<QString, QContainer<MountedUIEntry>> mounted_entries_;
   QMap<QString, ModuleTranslatorInfo> translator_data_readers_;
-  QList<QTranslator*> registered_translators_;
-  QList<QByteArray> read_translator_data_list_;
+  QContainer<QTranslator*> registered_translators_;
+  QContainer<QByteArray> read_translator_data_list_;
   QMap<QString, QPointer<QObject>> registered_qobjects_;
   QMap<QString, std::any> capsule_;
 };
diff --git a/src/ui/dialog/KeyDatabaseEditDialog.cpp b/src/ui/dialog/KeyDatabaseEditDialog.cpp
index bde50f0c..3fb444b8 100644
--- a/src/ui/dialog/KeyDatabaseEditDialog.cpp
+++ b/src/ui/dialog/KeyDatabaseEditDialog.cpp
@@ -37,7 +37,7 @@
 
 namespace GpgFrontend::UI {
 KeyDatabaseEditDialog::KeyDatabaseEditDialog(
-    QList<KeyDatabaseInfo> key_db_infos, QWidget* parent)
+    QContainer<KeyDatabaseInfo> key_db_infos, QWidget* parent)
     : GeneralDialog("KeyDatabaseEditDialog", parent),
       ui_(GpgFrontend::SecureCreateSharedObject<Ui_KeyDatabaseEditDialog>()),
       key_database_infos_(std::move(key_db_infos)) {
diff --git a/src/ui/dialog/KeyDatabaseEditDialog.h b/src/ui/dialog/KeyDatabaseEditDialog.h
index 9c0e96b0..c2e9f435 100644
--- a/src/ui/dialog/KeyDatabaseEditDialog.h
+++ b/src/ui/dialog/KeyDatabaseEditDialog.h
@@ -28,9 +28,8 @@
 
 #pragma once
 
-#include <utility>
-
 #include "core/model/KeyDatabaseInfo.h"
+#include "core/typedef/CoreTypedef.h"
 #include "ui/dialog/GeneralDialog.h"
 
 class Ui_KeyDatabaseEditDialog;
@@ -39,7 +38,7 @@ namespace GpgFrontend::UI {
 class KeyDatabaseEditDialog : public GeneralDialog {
   Q_OBJECT
  public:
-  explicit KeyDatabaseEditDialog(QList<KeyDatabaseInfo> key_db_infos,
+  explicit KeyDatabaseEditDialog(QContainer<KeyDatabaseInfo> key_db_infos,
                                  QWidget* parent);
 
   void SetDefaultName(QString name);
@@ -56,7 +55,7 @@ class KeyDatabaseEditDialog : public GeneralDialog {
   QString default_path_;
   QString name_;
   QString path_;
-  QList<KeyDatabaseInfo> key_database_infos_;
+  QContainer<KeyDatabaseInfo> key_database_infos_;
 
   void slot_button_box_accepted();
 
diff --git a/src/ui/dialog/QuitDialog.cpp b/src/ui/dialog/QuitDialog.cpp
index 39b1e965..8e83b0cc 100755
--- a/src/ui/dialog/QuitDialog.cpp
+++ b/src/ui/dialog/QuitDialog.cpp
@@ -132,8 +132,8 @@ void QuitDialog::slot_my_discard() {
 
 auto QuitDialog::IsDiscarded() const -> bool { return discarded_; }
 
-auto QuitDialog::GetTabIdsToSave() -> QList<int> {
-  QList<int> tab_ids_to_save;
+auto QuitDialog::GetTabIdsToSave() -> QContainer<int> {
+  QContainer<int> tab_ids_to_save;
   for (int i = 0; i < m_fileList_->rowCount(); i++) {
     if (m_fileList_->item(i, 0)->checkState() == Qt::Checked) {
       tab_ids_to_save << m_fileList_->item(i, 2)->text().toInt();
diff --git a/src/ui/dialog/QuitDialog.h b/src/ui/dialog/QuitDialog.h
index 6eb71dcc..f6596c1d 100755
--- a/src/ui/dialog/QuitDialog.h
+++ b/src/ui/dialog/QuitDialog.h
@@ -28,6 +28,7 @@
 
 #pragma once
 
+#include "core/typedef/CoreTypedef.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/dialog/GeneralDialog.h"
 
@@ -60,9 +61,9 @@ class QuitDialog : public GeneralDialog {
   /**
    * @brief Get the Tab Ids To Save object
    *
-   * @return QList<int>
+   * @return QContainer<int>
    */
-  auto GetTabIdsToSave() -> QList<int>;
+  auto GetTabIdsToSave() -> QContainer<int>;
 
  private slots:
 
diff --git a/src/ui/dialog/controller/GnuPGControllerDialog.h b/src/ui/dialog/controller/GnuPGControllerDialog.h
index f0994c27..3ee129b9 100644
--- a/src/ui/dialog/controller/GnuPGControllerDialog.h
+++ b/src/ui/dialog/controller/GnuPGControllerDialog.h
@@ -28,7 +28,8 @@
 
 #pragma once
 
-#include "core/struct/settings_object/KeyDatabaseItemSO.h"
+#include "core/model/KeyDatabaseInfo.h"
+#include "core/typedef/CoreTypedef.h"
 #include "ui/dialog/GeneralDialog.h"
 
 class Ui_GnuPGControllerDialog;
@@ -131,8 +132,8 @@ class GnuPGControllerDialog : public GeneralDialog {
   QString custom_key_database_path_;
   QString custom_gnupg_path_;
   QMenu* popup_menu_{};
-  QList<KeyDatabaseInfo> active_key_db_infos_;
-  QList<KeyDatabaseInfo> key_db_infos_;
+  QContainer<KeyDatabaseInfo> active_key_db_infos_;
+  QContainer<KeyDatabaseInfo> key_db_infos_;
 
   /**
    * @brief Get the Restart Needed object
diff --git a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
index ab3a5ac8..39c39c91 100644
--- a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
+++ b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
@@ -424,7 +424,8 @@ void KeyGenerateDialog::set_signal_slot_config() {
             slot_set_easy_valid_date_2_custom();
           });
 
-  connect(ui_->keyDBIndexComboBox, &QComboBox::currentIndexChanged, this,
+  connect(ui_->keyDBIndexComboBox,
+          qOverload<int>(&QComboBox::currentIndexChanged), this,
           [=](int index) { channel_ = index; });
 
   connect(ui_->easyCombinationComboBox, &QComboBox::currentTextChanged, this,
diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp
index 319a1ad9..5cabd52d 100644
--- a/src/ui/main_window/MainWindow.cpp
+++ b/src/ui/main_window/MainWindow.cpp
@@ -279,15 +279,17 @@ void MainWindow::closeEvent(QCloseEvent* event) {
   }
 }
 
-auto MainWindow::create_action(
-    const QString& id, const QString& name, const QString& icon,
-    const QString& too_tip, const QList<QKeySequence>& shortcuts) -> QAction* {
+auto MainWindow::create_action(const QString& id, const QString& name,
+                               const QString& icon, const QString& too_tip,
+                               const QContainer<QKeySequence>& shortcuts)
+    -> QAction* {
   auto* action = new QAction(name, this);
   action->setIcon(QIcon(icon));
   action->setToolTip(too_tip);
 
   if (!shortcuts.isEmpty()) {
-    action->setShortcuts(shortcuts);
+    action->setShortcuts(
+        QList<QKeySequence>{shortcuts.cbegin(), shortcuts.cend()});
   }
 
   buffered_actions_.insert(id, {action});
diff --git a/src/ui/main_window/MainWindow.h b/src/ui/main_window/MainWindow.h
index 8ec6bffd..165deee5 100644
--- a/src/ui/main_window/MainWindow.h
+++ b/src/ui/main_window/MainWindow.h
@@ -580,7 +580,8 @@ class MainWindow : public GeneralMainWindow {
    */
   auto create_action(const QString& id, const QString& name,
                      const QString& icon, const QString& too_tip,
-                     const QList<QKeySequence>& shortcuts = {}) -> QAction*;
+                     const QContainer<QKeySequence>& shortcuts = {})
+      -> QAction*;
 
   /**
    * @brief
diff --git a/src/ui/widgets/PlainTextEditorPage.cpp b/src/ui/widgets/PlainTextEditorPage.cpp
index ac41c9ab..91d7af1e 100644
--- a/src/ui/widgets/PlainTextEditorPage.cpp
+++ b/src/ui/widgets/PlainTextEditorPage.cpp
@@ -107,8 +107,8 @@ void PlainTextEditorPage::ShowNotificationWidget(QWidget *widget,
 }
 
 void PlainTextEditorPage::CloseNoteByClass(const char *className) {
-  QList<QWidget *> widgets = findChildren<QWidget *>();
-  for (QWidget *widget : widgets) {
+  auto widgets = findChildren<QWidget *>();
+  for (auto *widget : widgets) {
     if (widget->property(className) == true) {
       widget->close();
     }
diff --git a/src/ui/widgets/TextEdit.cpp b/src/ui/widgets/TextEdit.cpp
index 8b32983a..219f1447 100644
--- a/src/ui/widgets/TextEdit.cpp
+++ b/src/ui/widgets/TextEdit.cpp
@@ -370,7 +370,7 @@ auto TextEdit::MaybeSaveAnyTab() -> bool {
     }
 
     bool all_saved = true;
-    QList<int> const tab_ids_to_save = dialog->GetTabIdsToSave();
+    QContainer<int> const tab_ids_to_save = dialog->GetTabIdsToSave();
     for (const auto& tab_id : tab_ids_to_save) {
       tab_widget_->setCurrentIndex(tab_id);
       if (!maybe_save_current_tab(false)) {
diff --git a/src/ui/widgets/TextEditTabWidget.cpp b/src/ui/widgets/TextEditTabWidget.cpp
index 0427a6e8..11400f1f 100644
--- a/src/ui/widgets/TextEditTabWidget.cpp
+++ b/src/ui/widgets/TextEditTabWidget.cpp
@@ -228,7 +228,7 @@ void TextEditTabWidget::slot_save_status_to_cache_for_recovery() {
       continue;
     }
 
-    unsaved_pages.emplace_back(i, tab_title, document->toRawText());
+    unsaved_pages.push_back({i, tab_title, document->toRawText()});
   }
 
   CacheObject cache("editor_unsaved_pages");