diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-08 09:12:29 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-08 09:15:34 +0200 |
| commit | 5cdbaa67c68e8c595ae1e1894eead76d465fe73c (patch) | |
| tree | 8a7c28af407f89f92aface4bb5bf5c5061f71f26 /opentrack/plugin-support.hpp | |
| parent | a22afeb52abddd1411992e64377d96110888f325 (diff) | |
gui, api: plugin-support needs to remain header-only
Move "opentrack_library_path" to the gui module.
Diffstat (limited to 'opentrack/plugin-support.hpp')
| -rw-r--r-- | opentrack/plugin-support.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/opentrack/plugin-support.hpp b/opentrack/plugin-support.hpp index dbb985dc..a55526a9 100644 --- a/opentrack/plugin-support.hpp +++ b/opentrack/plugin-support.hpp @@ -9,7 +9,6 @@ #include "plugin-api.hpp" #include "opentrack-compat/options.hpp" -#include "library-path.hpp" #include <QWidget> #include <QDebug> @@ -106,7 +105,7 @@ struct dylib final { delete handle; } - static QList<mem<dylib>> enum_libraries() + static QList<mem<dylib>> enum_libraries(const QString& library_path) { const char* filters_n[] = { OPENTRACK_SOLIB_PREFIX "opentrack-filter-*." OPENTRACK_SOLIB_EXT, OPENTRACK_SOLIB_PREFIX "opentrack-tracker-*." OPENTRACK_SOLIB_EXT, @@ -114,7 +113,7 @@ struct dylib final { }; const Type filters_t[] = { Filter, Tracker, Protocol }; - static const QString libexec_path(QStringLiteral("./") + opentrack_library_path); + static const QString libexec_path(QStringLiteral("./") + library_path); QDir settingsDir(libexec_path); @@ -174,9 +173,10 @@ private: } }; -struct Modules { - Modules() : - module_list(dylib::enum_libraries()), +struct Modules +{ + Modules(const QString& library_path) : + module_list(dylib::enum_libraries(library_path)), filter_modules(filter(dylib::Filter)), tracker_modules(filter(dylib::Tracker)), protocol_modules(filter(dylib::Protocol)) |