fix: qt5 build issues

12 files changed, 132 insertions, 116 deletions

diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp
index 3ff293ae..4163f179 100644
--- a/src/core/GpgCoreInit.cpp
+++ b/src/core/GpgCoreInit.cpp
@@ -441,10 +441,21 @@ auto GetKeyDatabasesBySettings(QString& default_home_path)
   auto key_db_list = KeyDatabaseListSO(key_db_list_so);
   auto key_dbs = key_db_list.key_databases;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
   key_dbs.removeIf(
       [default_home_path](const KeyDatabaseItemSO& key_database) -> bool {
         return key_database.path == default_home_path;
       });
+#else
+  for (auto iter = key_dbs.begin(); iter != key_dbs.end();) {
+    if (iter->path == default_home_path) {
+      iter = key_dbs.erase(iter);
+    } else {
+      ++iter;
+    }
+  }
+#endif
+
   key_db_list_so.Store(key_db_list.ToJson());
   return key_dbs;
 }
diff --git a/src/core/utils/GpgUtils.cpp b/src/core/utils/GpgUtils.cpp
index 8d337d66..957b8910 100644
--- a/src/core/utils/GpgUtils.cpp
+++ b/src/core/utils/GpgUtils.cpp
@@ -179,8 +179,13 @@ auto GPGFRONTEND_CORE_EXPORT GetGpgKeyDatabaseInfos()
   if (!gpg_key_database_info_cache.empty()) return gpg_key_database_info_cache;
 
   auto context_index_list = Module::ListRTChildKeys("core", "gpgme.ctx.list");
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   gpg_key_database_info_cache.resize(
       static_cast<qsizetype>(context_index_list.size()));
+#else
+  gpg_key_database_info_cache.reserve(
+      static_cast<qsizetype>(context_index_list.size()));
+#endif
 
   for (auto& context_index : context_index_list) {
     LOG_D() << "context grt key: " << context_index;
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp
index 94d8f808..271c8e57 100644
--- a/src/ui/GpgFrontendApplication.cpp
+++ b/src/ui/GpgFrontendApplication.cpp
@@ -40,14 +40,20 @@ GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[])
 #endif
 
   QString application_display_name = GetProjectName();
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  const auto commit_short_hash = GetProjectBuildGitCommitHash().last(6);
+#else
+  const auto commit_short_hash = GetProjectBuildGitCommitHash().right(6);
+#endif
+
   if (GetProjectBuildGitBranchName().contains("develop")) {
-    application_display_name +=
-        " " +
-        QString("Testing (%1)").arg(GetProjectBuildGitCommitHash().last(6));
+    application_display_name += " " +
+
+                                QString("Testing (%1)").arg(commit_short_hash);
   } else if (GetProjectBuildGitBranchName().contains("dev/")) {
     application_display_name +=
-        " " +
-        QString("Develop (%1)").arg(GetProjectBuildGitCommitHash().last(6));
+        " " + QString("Develop (%1)").arg(commit_short_hash);
   }
 
   // set the extra information of the build
diff --git a/src/ui/dialog/controller/GnuPGControllerDialog.cpp b/src/ui/dialog/controller/GnuPGControllerDialog.cpp
index 800b8e2e..5b8e96dd 100644
--- a/src/ui/dialog/controller/GnuPGControllerDialog.cpp
+++ b/src/ui/dialog/controller/GnuPGControllerDialog.cpp
@@ -450,7 +450,7 @@ void GnuPGControllerDialog::slot_remove_existing_key_database() {
       return;
     }
 
-    key_databases.remove(i);
+    key_databases.removeAt(i);
     break;
   }
 
diff --git a/src/ui/main_window/MainWindow.h b/src/ui/main_window/MainWindow.h
index 40dd5862..f397b755 100644
--- a/src/ui/main_window/MainWindow.h
+++ b/src/ui/main_window/MainWindow.h
@@ -536,22 +536,6 @@ class MainWindow : public GeneralMainWindow {
    */
   void slot_decrypt_email_by_eml_data(const QByteArray& buffer);
 
-  /**
-   * @brief
-   *
-   */
-  void slot_decrypt_email_by_eml_data_result_helper(
-      const QMap<QString, QString>& p);
-
-  /**
-   * @brief
-   *
-   * @param err_code
-   * @param error_string
-   * @return QString
-   */
-  auto slot_handle_module_error(const QMap<QString, QString>& p) -> bool;
-
  private:
   /**
    * @details Create actions for the main-menu and the context-menu of the
@@ -612,6 +596,21 @@ class MainWindow : public GeneralMainWindow {
                      const QString& icon, const QString& too_tip,
                      const QList<QKeySequence>& shortcuts = {}) -> QAction*;
 
+  /**
+   * @brief
+   *
+   */
+  void decrypt_email_by_eml_data_result_helper(QMap<QString, QString> p);
+
+  /**
+   * @brief
+   *
+   * @param err_code
+   * @param error_string
+   * @return QString
+   */
+  auto handle_module_error(QMap<QString, QString> p) -> bool;
+
   TextEdit* edit_{};          ///< Tabwidget holding the edit-windows
   QMenu* file_menu_{};        ///<  Submenu for file-operations
   QMenu* edit_menu_{};        ///<  Submenu for text-operations
diff --git a/src/ui/main_window/MainWindowGpgOperaFunction.cpp b/src/ui/main_window/MainWindowGpgOperaFunction.cpp
index 6e29f362..776801e5 100644
--- a/src/ui/main_window/MainWindowGpgOperaFunction.cpp
+++ b/src/ui/main_window/MainWindowGpgOperaFunction.cpp
@@ -45,7 +45,7 @@
 namespace GpgFrontend::UI {
 
 void MainWindow::SlotEncrypt() {
-  if (edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->CurPageTextEdit() == nullptr) return;
 
   auto key_ids = m_key_list_->GetChecked();
 
@@ -155,7 +155,7 @@ void MainWindow::SlotEncrypt() {
 }
 
 void MainWindow::SlotSign() {
-  if (edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->CurPageTextEdit() == nullptr) return;
 
   auto key_ids = m_key_list_->GetCheckedPrivateKey();
   if (key_ids->empty()) {
@@ -220,7 +220,7 @@ void MainWindow::SlotSign() {
 }
 
 void MainWindow::SlotDecrypt() {
-  if (edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->CurPageTextEdit() == nullptr) return;
 
   // data to transfer into task
   auto buffer = GFBuffer(edit_->CurPlainText());
@@ -258,7 +258,7 @@ void MainWindow::SlotDecrypt() {
 }
 
 void MainWindow::SlotVerify() {
-  if (edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->CurPageTextEdit() == nullptr) return;
 
   // set input buffer
   auto buffer = GFBuffer(edit_->CurPlainText());
@@ -370,7 +370,7 @@ void MainWindow::SlotVerify(const QByteArray& raw_data,
 }
 
 void MainWindow::SlotEncryptSign() {
-  if (edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->CurPageTextEdit() == nullptr) return;
 
   auto key_ids = m_key_list_->GetChecked();
 
@@ -470,7 +470,7 @@ void MainWindow::SlotEncryptSign() {
 }
 
 void MainWindow::SlotDecryptVerify() {
-  if (edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->CurPageTextEdit() == nullptr) return;
 
   // data to transfer into task
   auto buffer = GFBuffer(edit_->CurPlainText());
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index 7b44dd7e..b2b73d96 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -60,10 +60,10 @@ void MainWindow::slot_find() {
   }
 
   // At first close verifynotification, if existing
-  edit_->SlotCurPageTextEdit()->CloseNoteByClass("FindWidget");
+  edit_->CurPageTextEdit()->CloseNoteByClass("FindWidget");
 
   auto* fw = new FindWidget(this, edit_->CurTextPage());
-  edit_->SlotCurPageTextEdit()->ShowNotificationWidget(fw, "FindWidget");
+  edit_->CurPageTextEdit()->ShowNotificationWidget(fw, "FindWidget");
 }
 
 /*
@@ -363,7 +363,7 @@ void MainWindow::slot_refresh_current_file_view() {
 }
 
 void MainWindow::slot_import_key_from_edit() {
-  if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->TabCount() == 0 || edit_->CurPageTextEdit() == nullptr) return;
 
   CommonUtils::GetInstance()->SlotImportKeys(
       this, m_key_list_->GetCurrentGpgContextChannel(),
@@ -388,7 +388,7 @@ void MainWindow::slot_verify_email_by_eml_data(const QByteArray& buffer) {
               hd();
 
               // check if error occurred
-              if (slot_handle_module_error(p)) return -1;
+              if (handle_module_error(p)) return -1;
 
               if (p.contains("signature") && p.contains("mime")) {
                 slot_verify_email_by_eml_data_result_helper(p);
@@ -412,10 +412,10 @@ void MainWindow::slot_decrypt_email_by_eml_data(const QByteArray& buffer) {
         LOG_D() << "EMAIL_DECRYPT_EML_DATA callback: " << i << ei;
 
         // check if error occurred
-        if (slot_handle_module_error(p)) return -1;
+        if (handle_module_error(p)) return -1;
 
         if (p.contains("eml_data")) {
-          slot_decrypt_email_by_eml_data_result_helper(p);
+          decrypt_email_by_eml_data_result_helper(p);
         }
 
         return 0;
@@ -423,7 +423,7 @@ void MainWindow::slot_decrypt_email_by_eml_data(const QByteArray& buffer) {
 }
 
 void MainWindow::SlotVerifyEML() {
-  if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->TabCount() == 0 || edit_->CurPageTextEdit() == nullptr) return;
 
   auto buffer = edit_->CurPlainText().toLatin1();
   buffer = buffer.replace("\n", "\r\n");
@@ -562,7 +562,7 @@ void MainWindow::slot_result_analyse_show_helper(const GpgResultAnalyse& r_a,
 }
 
 void MainWindow::SlotDecryptEML() {
-  if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) return;
+  if (edit_->TabCount() == 0 || edit_->CurPageTextEdit() == nullptr) return;
 
   auto buffer = edit_->CurPlainText().toLatin1();
   buffer = buffer.replace("\n", "\r\n");
@@ -572,8 +572,8 @@ void MainWindow::SlotDecryptEML() {
   slot_decrypt_email_by_eml_data(buffer);
 }
 
-void MainWindow::slot_decrypt_email_by_eml_data_result_helper(
-    const QMap<QString, QString>& p) {
+void MainWindow::decrypt_email_by_eml_data_result_helper(
+    QMap<QString, QString> p) {
   auto timestamp = p.value("datetime", "-1").toLongLong();
   auto datetime = tr("None");
   if (timestamp > 0) {
@@ -723,7 +723,7 @@ void MainWindow::SlotSignEML() {
               hd();
 
               // check if error occurred
-              if (slot_handle_module_error(p)) return -1;
+              if (handle_module_error(p)) return -1;
 
               if (!p["eml_data"].isEmpty()) {
                 edit_->SlotSetText2CurEMailPage(p.value("eml_data", ""));
@@ -807,7 +807,7 @@ void MainWindow::SlotEncryptSignEML() {
               hd();
 
               // check if error occurred
-              if (slot_handle_module_error(p)) return -1;
+              if (handle_module_error(p)) return -1;
 
               if (!p["eml_data"].isEmpty()) {
                 edit_->SlotSetText2CurEMailPage(p.value("eml_data", ""));
@@ -869,7 +869,7 @@ void MainWindow::SlotDecryptVerifyEML() {
               hd();
 
               // check if error occurred
-              if (slot_handle_module_error(p)) return -1;
+              if (handle_module_error(p)) return -1;
 
               if (!p["eml_data"].isEmpty()) {
                 edit_->SlotSetText2CurEMailPage(p.value("eml_data", ""));
@@ -955,8 +955,7 @@ void MainWindow::SlotDecryptVerifyEML() {
       });
 }
 
-auto MainWindow::slot_handle_module_error(const QMap<QString, QString>& p)
-    -> bool {
+auto MainWindow::handle_module_error(QMap<QString, QString> p) -> bool {
   if (p["ret"] == "-2") {
     QString detailed_error = p["err"];
 
diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp
index 53fa29a4..d3ba32b6 100644
--- a/src/ui/main_window/MainWindowSlotUI.cpp
+++ b/src/ui/main_window/MainWindowSlotUI.cpp
@@ -125,7 +125,7 @@ void MainWindow::slot_open_settings_dialog() {
 }
 
 void MainWindow::slot_clean_double_line_breaks() {
-  if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) {
+  if (edit_->TabCount() == 0 || edit_->CurPageTextEdit() == nullptr) {
     return;
   }
 
@@ -135,7 +135,7 @@ void MainWindow::slot_clean_double_line_breaks() {
 }
 
 void MainWindow::slot_add_pgp_header() {
-  if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) {
+  if (edit_->TabCount() == 0 || edit_->CurPageTextEdit() == nullptr) {
     return;
   }
 
@@ -148,7 +148,7 @@ void MainWindow::slot_add_pgp_header() {
 }
 
 void MainWindow::slot_cut_pgp_header() {
-  if (edit_->TabCount() == 0 || edit_->SlotCurPageTextEdit() == nullptr) {
+  if (edit_->TabCount() == 0 || edit_->CurPageTextEdit() == nullptr) {
     return;
   }
 
@@ -206,8 +206,8 @@ void MainWindow::SlotUpdateCryptoMenuStatus(unsigned int type) {
 }
 
 void MainWindow::SlotGeneralEncrypt(bool) {
-  if (edit_->SlotCurPageFileTreeView() != nullptr) {
-    const auto* file_tree_view = edit_->SlotCurPageFileTreeView();
+  if (edit_->CurPageFileTreeView() != nullptr) {
+    const auto* file_tree_view = edit_->CurPageFileTreeView();
     const auto path = file_tree_view->GetSelected();
 
     const auto file_info = QFileInfo(path);
@@ -223,14 +223,14 @@ void MainWindow::SlotGeneralEncrypt(bool) {
     return;
   }
 
-  if (edit_->SlotCurPageTextEdit() != nullptr) {
+  if (edit_->CurPageTextEdit() != nullptr) {
     this->SlotEncrypt();
   }
 }
 
 void MainWindow::SlotGeneralDecrypt(bool) {
-  if (edit_->SlotCurPageFileTreeView() != nullptr) {
-    const auto* file_tree_view = edit_->SlotCurPageFileTreeView();
+  if (edit_->CurPageFileTreeView() != nullptr) {
+    const auto* file_tree_view = edit_->CurPageFileTreeView();
     const auto path = file_tree_view->GetSelected();
 
     const auto file_info = QFileInfo(path);
@@ -250,14 +250,14 @@ void MainWindow::SlotGeneralDecrypt(bool) {
     return;
   }
 
-  if (edit_->SlotCurPageTextEdit() != nullptr) {
+  if (edit_->CurPageTextEdit() != nullptr) {
     this->SlotDecrypt();
   }
 }
 
 void MainWindow::SlotGeneralSign(bool) {
-  if (edit_->SlotCurPageFileTreeView() != nullptr) {
-    const auto* file_tree_view = edit_->SlotCurPageFileTreeView();
+  if (edit_->CurPageFileTreeView() != nullptr) {
+    const auto* file_tree_view = edit_->CurPageFileTreeView();
     const auto path = file_tree_view->GetSelected();
 
     const auto file_info = QFileInfo(path);
@@ -269,12 +269,12 @@ void MainWindow::SlotGeneralSign(bool) {
     return;
   }
 
-  if (edit_->SlotCurPageTextEdit() != nullptr) this->SlotSign();
+  if (edit_->CurPageTextEdit() != nullptr) this->SlotSign();
 }
 
 void MainWindow::SlotGeneralVerify(bool) {
-  if (edit_->SlotCurPageFileTreeView() != nullptr) {
-    const auto* file_tree_view = edit_->SlotCurPageFileTreeView();
+  if (edit_->CurPageFileTreeView() != nullptr) {
+    const auto* file_tree_view = edit_->CurPageFileTreeView();
     const auto path = file_tree_view->GetSelected();
 
     const auto file_info = QFileInfo(path);
@@ -286,12 +286,12 @@ void MainWindow::SlotGeneralVerify(bool) {
     return;
   }
 
-  if (edit_->SlotCurPageTextEdit() != nullptr) this->SlotVerify();
+  if (edit_->CurPageTextEdit() != nullptr) this->SlotVerify();
 }
 
 void MainWindow::SlotGeneralEncryptSign(bool) {
-  if (edit_->SlotCurPageFileTreeView() != nullptr) {
-    const auto* file_tree_view = edit_->SlotCurPageFileTreeView();
+  if (edit_->CurPageFileTreeView() != nullptr) {
+    const auto* file_tree_view = edit_->CurPageFileTreeView();
     const auto path = file_tree_view->GetSelected();
 
     const auto file_info = QFileInfo(path);
@@ -307,14 +307,14 @@ void MainWindow::SlotGeneralEncryptSign(bool) {
     return;
   }
 
-  if (edit_->SlotCurPageTextEdit() != nullptr) {
+  if (edit_->CurPageTextEdit() != nullptr) {
     this->SlotEncryptSign();
   }
 }
 
 void MainWindow::SlotGeneralDecryptVerify(bool) {
-  if (edit_->SlotCurPageFileTreeView() != nullptr) {
-    const auto* file_tree_view = edit_->SlotCurPageFileTreeView();
+  if (edit_->CurPageFileTreeView() != nullptr) {
+    const auto* file_tree_view = edit_->CurPageFileTreeView();
     const auto path = file_tree_view->GetSelected();
 
     const auto file_info = QFileInfo(path);
@@ -334,7 +334,7 @@ void MainWindow::SlotGeneralDecryptVerify(bool) {
     return;
   }
 
-  if (edit_->SlotCurPageTextEdit() != nullptr) {
+  if (edit_->CurPageTextEdit() != nullptr) {
     this->SlotDecryptVerify();
   }
 }
diff --git a/src/ui/widgets/TextEdit.cpp b/src/ui/widgets/TextEdit.cpp
index 1ea96fde..8b32983a 100644
--- a/src/ui/widgets/TextEdit.cpp
+++ b/src/ui/widgets/TextEdit.cpp
@@ -33,6 +33,7 @@
 #include <utility>
 
 #include "core/GpgModel.h"
+#include "ui/dialog/QuitDialog.h"
 #include "ui/widgets/HelpPage.h"
 #include "ui/widgets/TextEditTabWidget.h"
 
@@ -142,7 +143,7 @@ void TextEdit::SlotSave() {
   }
 
   if (CurTextPage() != nullptr) {
-    QString file_name = SlotCurPageTextEdit()->GetFilePath();
+    QString file_name = CurPageTextEdit()->GetFilePath();
 
     if (file_name.isEmpty()) {
       // QString docname = tabWidget->tabText(tabWidget->currentIndex());
@@ -157,7 +158,7 @@ void TextEdit::SlotSave() {
 auto TextEdit::saveFile(const QString& file_name) -> bool {
   if (file_name.isEmpty()) return false;
 
-  PlainTextEditorPage* page = SlotCurPageTextEdit();
+  PlainTextEditorPage* page = CurPageTextEdit();
   if (page == nullptr) return false;
 
   QFile file(file_name);
@@ -217,11 +218,11 @@ auto TextEdit::saveEMLFile(const QString& file_name) -> bool {
 }
 
 auto TextEdit::SlotSaveAs() -> bool {
-  if (tab_widget_->count() == 0 || SlotCurPageTextEdit() == nullptr) {
+  if (tab_widget_->count() == 0 || CurPageTextEdit() == nullptr) {
     return true;
   }
 
-  PlainTextEditorPage* page = SlotCurPageTextEdit();
+  PlainTextEditorPage* page = CurPageTextEdit();
   QString path;
   if (!page->GetFilePath().isEmpty()) {
     path = page->GetFilePath();
@@ -251,7 +252,7 @@ auto TextEdit::SlotSaveAsEML() -> bool {
 void TextEdit::SlotCloseTab() {
   slot_remove_tab(tab_widget_->currentIndex());
   if (tab_widget_->count() != 0) {
-    SlotCurPageTextEdit()->GetTextPage()->setFocus();
+    CurPageTextEdit()->GetTextPage()->setFocus();
   }
 }
 
@@ -289,7 +290,7 @@ void TextEdit::slot_remove_tab(int index) {
  * If it returns false, the close event should be aborted.
  */
 auto TextEdit::maybe_save_current_tab(bool askToSave) -> bool {
-  PlainTextEditorPage* page = SlotCurPageTextEdit();
+  PlainTextEditorPage* page = CurPageTextEdit();
   // if this page is no textedit, there should be nothing to save
   if (page == nullptr) {
     return true;
@@ -398,8 +399,8 @@ auto TextEdit::CurTextPage() const -> PlainTextEditorPage* {
   return tab_widget_->CurTextPage();
 }
 
-auto TextEdit::SlotCurPageTextEdit() const -> PlainTextEditorPage* {
-  return tab_widget_->SlotCurPageTextEdit();
+auto TextEdit::CurPageTextEdit() const -> PlainTextEditorPage* {
+  return tab_widget_->CurPageTextEdit();
 }
 auto TextEdit::CurFilePage() const -> FilePage* {
   return tab_widget_->CurFilePage();
@@ -407,9 +408,8 @@ auto TextEdit::CurFilePage() const -> FilePage* {
 
 auto TextEdit::TabCount() const -> int { return tab_widget_->count(); }
 
-auto TextEdit::SlotCurPageFileTreeView() const -> FilePage* {
-  auto* cur_page = qobject_cast<FilePage*>(tab_widget_->currentWidget());
-  return cur_page;
+auto TextEdit::CurPageFileTreeView() const -> FilePage* {
+  return tab_widget_->CurFilePage();
 }
 
 void TextEdit::SlotQuote() const {
@@ -454,7 +454,7 @@ void TextEdit::LoadFile(const QString& fileName) {
   QApplication::setOverrideCursor(Qt::WaitCursor);
   CurTextPage()->GetTextPage()->setPlainText(in.readAll());
   QApplication::restoreOverrideCursor();
-  SlotCurPageTextEdit()->SetFilePath(fileName);
+  CurPageTextEdit()->SetFilePath(fileName);
   tab_widget_->setTabText(tab_widget_->currentIndex(), stripped_name(fileName));
   file.close();
   // statusBar()->showMessage(tr("File loaded"), 2000);
@@ -528,7 +528,7 @@ void TextEdit::SlotSwitchTabDown() const {
 /*
  *   return a hash of tabindexes and title of unsaved tabs
  */
-QHash<int, QString> TextEdit::UnsavedDocuments() const {
+auto TextEdit::UnsavedDocuments() const -> QHash<int, QString> {
   QHash<int, QString> unsaved_docs;  // this list could be used to implement
                                      // gedit like "unsaved changed"-dialog
 
diff --git a/src/ui/widgets/TextEdit.h b/src/ui/widgets/TextEdit.h
index 68b648e5..d37e01ce 100644
--- a/src/ui/widgets/TextEdit.h
+++ b/src/ui/widgets/TextEdit.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include "ui/dialog/QuitDialog.h"
 #include "ui/widgets/EMailEditorPage.h"
 #include "ui/widgets/FilePage.h"
 #include "ui/widgets/PlainTextEditorPage.h"
@@ -110,19 +109,19 @@ class TextEdit : public QWidget {
    */
   [[nodiscard]] auto TabWidget() const -> QTabWidget*;
 
- public slots:
-
   /**
    * @details Return pointer to the currently activated text edit tab page.
    *
    */
-  [[nodiscard]] auto SlotCurPageTextEdit() const -> PlainTextEditorPage*;
+  [[nodiscard]] auto CurPageTextEdit() const -> PlainTextEditorPage*;
 
   /**
    * @details Return pointer to the currently activated file tree view tab page.
    *
    */
-  [[nodiscard]] auto SlotCurPageFileTreeView() const -> FilePage*;
+  [[nodiscard]] auto CurPageFileTreeView() const -> FilePage*;
+
+ public slots:
 
   /**
    * @details Insert a ">" at the beginning of every line of current textedit.
@@ -147,7 +146,7 @@ class TextEdit : public QWidget {
    *
    * @return Return the return value of the savefile method
    */
-  auto SlotSaveAs() -> bool;
+  bool SlotSaveAs();
 
   /**
    * @details Show an OpenFileDoalog and open the file in a new tab.
@@ -287,7 +286,7 @@ class TextEdit : public QWidget {
    * @return true
    * @return false
    */
-  auto SlotSaveAsEML() -> bool;
+  bool SlotSaveAsEML();
 
  protected:
   /**
diff --git a/src/ui/widgets/TextEditTabWidget.cpp b/src/ui/widgets/TextEditTabWidget.cpp
index 8007eb85..4377a424 100644
--- a/src/ui/widgets/TextEditTabWidget.cpp
+++ b/src/ui/widgets/TextEditTabWidget.cpp
@@ -183,17 +183,14 @@ auto TextEditTabWidget::CurEMailPage() const -> EMailEditorPage* {
   return qobject_cast<EMailEditorPage*>(this->currentWidget());
 }
 
-auto TextEditTabWidget::SlotCurPageTextEdit() -> PlainTextEditorPage* {
+auto TextEditTabWidget::CurPageTextEdit() const -> PlainTextEditorPage* {
   auto* cur_page = qobject_cast<PlainTextEditorPage*>(this->currentWidget());
   return cur_page;
 }
 
 auto TextEditTabWidget::CurFilePage() const -> FilePage* {
   auto* cur_file_page = qobject_cast<FilePage*>(this->currentWidget());
-  if (cur_file_page != nullptr) {
-    return cur_file_page;
-  }
-  return nullptr;
+  return cur_file_page;
 }
 
 auto TextEditTabWidget::stripped_name(const QString& full_file_name)
diff --git a/src/ui/widgets/TextEditTabWidget.h b/src/ui/widgets/TextEditTabWidget.h
index 13ed00f0..9df2d6ab 100644
--- a/src/ui/widgets/TextEditTabWidget.h
+++ b/src/ui/widgets/TextEditTabWidget.h
@@ -39,79 +39,79 @@ class TextEditTabWidget : public QTabWidget {
  public:
   explicit TextEditTabWidget(QWidget* parent = nullptr);
 
- public slots:
-
   /**
    * @brief
    *
+   * @return PlainTextEditorPage*
    */
-  void SlotNewTab();
+  [[nodiscard]] auto CurTextPage() const -> PlainTextEditorPage*;
 
   /**
    * @brief
    *
+   * @return PlainTextEditorPage*
    */
-  void SlotNewEMailTab();
+  [[nodiscard]] auto CurEMailPage() const -> EMailEditorPage*;
 
   /**
    * @brief
    *
-   * @param title
-   * @param content
+   * @return PlainTextEditorPage*
    */
-  void SlotNewTabWithContent(QString title, const QString& content);
+  [[nodiscard]] auto CurPageTextEdit() const -> PlainTextEditorPage*;
 
   /**
-   * @details Adds a new tab with opening file by path
+   * @brief
+   *
+   * @return FilePage*
    */
-  void SlotOpenFile(const QString& path);
+  [[nodiscard]] auto CurFilePage() const -> FilePage*;
+
+ public slots:
 
   /**
    * @brief
    *
-   * @param path
    */
-  void SlotOpenEMLFile(const QString& path);
+  void SlotNewTab();
 
   /**
    * @brief
    *
    */
-  void SlotOpenDirectory(const QString& target_directory);
+  void SlotNewEMailTab();
 
   /**
-   * @details put a * in front of current tabs title, if current textedit is
-   * modified
+   * @brief
+   *
+   * @param title
+   * @param content
    */
-  void SlotShowModified();
+  void SlotNewTabWithContent(QString title, const QString& content);
 
   /**
-   * @brief
-   *
-   * @return PlainTextEditorPage*
+   * @details Adds a new tab with opening file by path
    */
-  [[nodiscard]] auto CurTextPage() const -> PlainTextEditorPage*;
+  void SlotOpenFile(const QString& path);
 
   /**
    * @brief
    *
-   * @return PlainTextEditorPage*
+   * @param path
    */
-  [[nodiscard]] auto CurEMailPage() const -> EMailEditorPage*;
+  void SlotOpenEMLFile(const QString& path);
 
   /**
    * @brief
    *
-   * @return PlainTextEditorPage*
    */
-  auto SlotCurPageTextEdit() -> PlainTextEditorPage*;
+  void SlotOpenDirectory(const QString& target_directory);
 
   /**
-   * @brief
-   *
-   * @return FilePage*
+   * @details put a * in front of current tabs title, if current textedit is
+   * modified
    */
-  [[nodiscard]] auto CurFilePage() const -> FilePage*;
+  void SlotShowModified();
 
  protected:
   /**