diff options
author | ConfuSomu | 2023-11-27 20:34:50 -0500 |
---|---|---|
committer | ConfuSomu | 2023-11-27 20:47:53 -0500 |
commit | f890dd8c22cae9e90d55b763f1d896b25975aeab (patch) | |
tree | 73db0a45e54e98468d916f42a4f3ab3acc1f5949 /src/mainwindow.h | |
parent | d12ac245778c295cf606671021e6aa66bcfc0d80 (diff) | |
download | ActorViewer-f890dd8c22cae9e90d55b763f1d896b25975aeab.tar ActorViewer-f890dd8c22cae9e90d55b763f1d896b25975aeab.tar.gz ActorViewer-f890dd8c22cae9e90d55b763f1d896b25975aeab.zip |
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
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r-- | src/mainwindow.h | 5 |
1 files changed, 2 insertions, 3 deletions
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 <QListWidgetItem> #include <QLocale> #include <QFutureWatcher> -#include <variant> #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<QString, Archive::InitError> 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<std::variant<QString, Archive::InitError>> archive_thread_watcher; + QFutureWatcher<Archive::InitError> archive_thread_watcher; QLocale locale_context; }; |