From 195767619e7a7aeeeb33b13420538f687bef0104 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 3 Feb 2019 12:06:50 +0100 Subject: opentrack: move module list to base class --- variant/default/main-window.cpp | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) (limited to 'variant/default/main-window.cpp') diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp index 192ad289..7f8b3bb8 100644 --- a/variant/default/main-window.cpp +++ b/variant/default/main-window.cpp @@ -19,7 +19,6 @@ #include "compat/sysexits.hpp" #include -#include #include #include @@ -75,6 +74,9 @@ void main_window::init_shortcuts() void main_window::init_dylibs() { + using dylib_ptr = Modules::dylib_ptr; + using dylib_list = Modules::dylib_list; + modules.filters().push_front(std::make_shared("", dylib::Filter)); for (dylib_ptr& x : modules.trackers()) @@ -389,38 +391,7 @@ void main_window::refresh_config_list() ui.iconcomboProfile->setCurrentText(current); } -std::tuple main_window::module_by_name(const QString& name, Modules::dylib_list& list) -{ - auto it = std::find_if(list.cbegin(), list.cend(), [&name](const dylib_ptr& lib) { - if (!lib) - return name.isEmpty(); - else - return name == lib->module_name; - }); - - if (it == list.cend()) - return { nullptr, -1 }; - else - return { *it, int(std::distance(list.cbegin(), it)) }; -} -main_window::dylib_ptr main_window::current_tracker() -{ - auto [ptr, idx] = module_by_name(m.tracker_dll, modules.trackers()); - return ptr; -} - -main_window::dylib_ptr main_window::current_protocol() -{ - auto [ptr, idx] = module_by_name(m.protocol_dll, modules.protocols()); - return ptr; -} - -main_window::dylib_ptr main_window::current_filter() -{ - auto [ptr, idx] = module_by_name(m.filter_dll, modules.filters()); - return ptr; -} void main_window::update_button_state(bool running, bool inertialp) { -- cgit v1.2.3