From f890dd8c22cae9e90d55b763f1d896b25975aeab Mon Sep 17 00:00:00 2001 From: ConfuSomu Date: Mon, 27 Nov 2023 20:34:50 -0500 Subject: Remove variants from QtConcurrent in main window The std::variants weren't used and were making the code more complex to no advantage. All code that would have benefited from variants has already been moved to QThreads elsewhere --- src/mainwindow.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 22f5b29..7e46cec 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "archive/base_archive.h" #include "src/list_item.h" @@ -65,7 +64,7 @@ private: void open_file(const QString &filename); void archive_thread_watcher_done(); - std::variant start_listWidget_itemActivated(StatusListItem* status); + Archive::InitError start_listWidget_itemActivated(StatusListItem* status); void finish_open_file(const Archive::InitError& parse_error); void settingsDialog_done(int result); @@ -81,7 +80,7 @@ private: bool view_filters_changed = false; Archive *data_archive = nullptr; - QFutureWatcher> archive_thread_watcher; + QFutureWatcher archive_thread_watcher; QLocale locale_context; }; -- cgit v1.2.3-54-g00ecf