From 37c32dd1edf5efeeeb63850639ca44c41a55938d Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 1 Jun 2024 22:59:59 +0200 Subject: [PATCH] Move StringList from base to lib --- CMakeLists.txt | 2 ++ {plugins/base => lib}/utils/string-list.cpp | 0 {plugins/base => lib}/utils/string-list.hpp | 15 ++++++++------- plugins/base/CMakeLists.txt | 2 -- 4 files changed, 10 insertions(+), 9 deletions(-) rename {plugins/base => lib}/utils/string-list.cpp (100%) rename {plugins/base => lib}/utils/string-list.hpp (71%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7794f03a..37f913e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,8 @@ target_sources( lib/utils/splitter-helpers.hpp lib/utils/status-control.cpp lib/utils/status-control.hpp + lib/utils/string-list.cpp + lib/utils/string-list.hpp lib/utils/switch-button.cpp lib/utils/switch-button.hpp lib/utils/sync-helpers.cpp diff --git a/plugins/base/utils/string-list.cpp b/lib/utils/string-list.cpp similarity index 100% rename from plugins/base/utils/string-list.cpp rename to lib/utils/string-list.cpp diff --git a/plugins/base/utils/string-list.hpp b/lib/utils/string-list.hpp similarity index 71% rename from plugins/base/utils/string-list.hpp rename to lib/utils/string-list.hpp index 342d9b3d..661d99ae 100644 --- a/plugins/base/utils/string-list.hpp +++ b/lib/utils/string-list.hpp @@ -1,7 +1,8 @@ #pragma once -#include "variable-string.hpp" +#include "export-symbol-helper.hpp" #include "list-editor.hpp" #include "obs-module-helper.hpp" +#include "variable-string.hpp" #include @@ -9,16 +10,16 @@ namespace advss { class StringList : public QList { public: - bool Save(obs_data_t *obj, const char *name, - const char *elementName = "string") const; - bool Load(obs_data_t *obj, const char *name, - const char *elementName = "string"); - void ResolveVariables(); + EXPORT bool Save(obs_data_t *obj, const char *name, + const char *elementName = "string") const; + EXPORT bool Load(obs_data_t *obj, const char *name, + const char *elementName = "string"); + EXPORT void ResolveVariables(); friend class StringListEdit; }; -class StringListEdit final : public ListEditor { +class ADVSS_EXPORT StringListEdit final : public ListEditor { Q_OBJECT public: diff --git a/plugins/base/CMakeLists.txt b/plugins/base/CMakeLists.txt index 8321bef9..7617fe29 100644 --- a/plugins/base/CMakeLists.txt +++ b/plugins/base/CMakeLists.txt @@ -168,8 +168,6 @@ target_sources( utils/source-settings-helpers.hpp utils/source-setting.cpp utils/source-setting.hpp - utils/string-list.cpp - utils/string-list.hpp utils/striped-frame.cpp utils/striped-frame.hpp utils/text-helpers.cpp