From 5d6f08e38f3d3adb78e92bb2bf7a827aa7cd18a1 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 11 Mar 2023 14:24:37 +0100 Subject: [PATCH] Adjust to refactor of variable string --- src/macro-core/macro-action-file.hpp | 3 +-- src/macro-core/macro-action-filter.hpp | 2 +- src/macro-core/macro-action-http.hpp | 6 ++---- src/macro-core/macro-action-scene-transform.hpp | 2 +- src/macro-core/macro-action-screenshot.hpp | 3 +-- src/macro-core/macro-action-source.hpp | 2 +- src/macro-core/macro-action-websocket.hpp | 3 +-- src/macro-core/macro-condition-file.hpp | 3 +-- src/macro-core/macro-condition-filter.hpp | 2 +- src/macro-core/macro-condition-scene-transform.hpp | 2 +- src/macro-core/macro-condition-source.hpp | 2 +- src/macro-core/macro-condition-websocket.hpp | 3 +-- src/macro-external/video/paramerter-wrappers.hpp | 5 ++--- src/utils/file-selection.cpp | 2 +- src/utils/file-selection.hpp | 2 +- src/utils/string-list.cpp | 6 +++--- src/utils/string-list.hpp | 4 ++-- src/utils/variable-line-edit.cpp | 2 +- src/utils/variable-line-edit.hpp | 4 ++-- src/utils/variable-text-edit.cpp | 2 +- src/utils/variable-text-edit.hpp | 4 ++-- 21 files changed, 28 insertions(+), 36 deletions(-) diff --git a/src/macro-core/macro-action-file.hpp b/src/macro-core/macro-action-file.hpp index 87da6a46..ca97309b 100644 --- a/src/macro-core/macro-action-file.hpp +++ b/src/macro-core/macro-action-file.hpp @@ -25,8 +25,7 @@ public: } std::string _file = obs_module_text("AdvSceneSwitcher.enterPath"); - VariableResolvingString _text = - obs_module_text("AdvSceneSwitcher.enterText"); + StringVariable _text = obs_module_text("AdvSceneSwitcher.enterText"); FileAction _action = FileAction::WRITE; private: diff --git a/src/macro-core/macro-action-filter.hpp b/src/macro-core/macro-action-filter.hpp index 52cea3cc..80bb057a 100644 --- a/src/macro-core/macro-action-filter.hpp +++ b/src/macro-core/macro-action-filter.hpp @@ -30,7 +30,7 @@ public: SourceSelection _source; OBSWeakSource _filter; Action _action = Action::ENABLE; - VariableResolvingString _settings = ""; + StringVariable _settings = ""; private: void ResolveVariables(); diff --git a/src/macro-core/macro-action-http.hpp b/src/macro-core/macro-action-http.hpp index faff8b68..e6b96cbc 100644 --- a/src/macro-core/macro-action-http.hpp +++ b/src/macro-core/macro-action-http.hpp @@ -28,10 +28,8 @@ public: POST, }; - VariableResolvingString _url = - obs_module_text("AdvSceneSwitcher.enterURL"); - VariableResolvingString _data = - obs_module_text("AdvSceneSwitcher.enterText"); + StringVariable _url = obs_module_text("AdvSceneSwitcher.enterURL"); + StringVariable _data = obs_module_text("AdvSceneSwitcher.enterText"); bool _setHeaders = false; StringList _headers; Method _method = Method::GET; diff --git a/src/macro-core/macro-action-scene-transform.hpp b/src/macro-core/macro-action-scene-transform.hpp index 2e3234cf..52906ecb 100644 --- a/src/macro-core/macro-action-scene-transform.hpp +++ b/src/macro-core/macro-action-scene-transform.hpp @@ -22,7 +22,7 @@ public: SceneSelection _scene; SceneItemSelection _source; - VariableResolvingString _settings = ""; + StringVariable _settings = ""; private: void ApplySettings(const std::string &); diff --git a/src/macro-core/macro-action-screenshot.hpp b/src/macro-core/macro-action-screenshot.hpp index d4690c80..fde8dec1 100644 --- a/src/macro-core/macro-action-screenshot.hpp +++ b/src/macro-core/macro-action-screenshot.hpp @@ -33,8 +33,7 @@ public: TargetType _targetType = TargetType::SOURCE; SceneSelection _scene; SourceSelection _source; - VariableResolvingString _path = - obs_module_text("AdvSceneSwitcher.enterPath"); + StringVariable _path = obs_module_text("AdvSceneSwitcher.enterPath"); private: void FrontendScreenshot(OBSWeakSource &); diff --git a/src/macro-core/macro-action-source.hpp b/src/macro-core/macro-action-source.hpp index 87ec21b3..1f712afb 100644 --- a/src/macro-core/macro-action-source.hpp +++ b/src/macro-core/macro-action-source.hpp @@ -41,7 +41,7 @@ public: SourceSelection _source; SourceSettingButton _button; - VariableResolvingString _settings = ""; + StringVariable _settings = ""; SourceAction _action = SourceAction::ENABLE; private: diff --git a/src/macro-core/macro-action-websocket.hpp b/src/macro-core/macro-action-websocket.hpp index dc5fa029..ec17c388 100644 --- a/src/macro-core/macro-action-websocket.hpp +++ b/src/macro-core/macro-action-websocket.hpp @@ -28,8 +28,7 @@ public: }; Type _type = Type::REQUEST; - VariableResolvingString _message = - obs_module_text("AdvSceneSwitcher.enterText"); + StringVariable _message = obs_module_text("AdvSceneSwitcher.enterText"); std::string _connection; private: diff --git a/src/macro-core/macro-condition-file.hpp b/src/macro-core/macro-condition-file.hpp index 74a3bb0c..15832545 100644 --- a/src/macro-core/macro-condition-file.hpp +++ b/src/macro-core/macro-condition-file.hpp @@ -36,8 +36,7 @@ public: }; std::string _file = obs_module_text("AdvSceneSwitcher.enterPath"); - VariableResolvingString _text = - obs_module_text("AdvSceneSwitcher.enterText"); + StringVariable _text = obs_module_text("AdvSceneSwitcher.enterText"); FileType _fileType = FileType::LOCAL; ConditionType _condition = ConditionType::MATCH; RegexConfig _regex; diff --git a/src/macro-core/macro-condition-filter.hpp b/src/macro-core/macro-condition-filter.hpp index 4b22e90e..a483b3de 100644 --- a/src/macro-core/macro-condition-filter.hpp +++ b/src/macro-core/macro-condition-filter.hpp @@ -30,7 +30,7 @@ public: SourceSelection _source; OBSWeakSource _filter; Condition _condition = Condition::ENABLED; - VariableResolvingString _settings = ""; + StringVariable _settings = ""; RegexConfig _regex; private: diff --git a/src/macro-core/macro-condition-scene-transform.hpp b/src/macro-core/macro-condition-scene-transform.hpp index 292eeb2f..67f4bf9e 100644 --- a/src/macro-core/macro-condition-scene-transform.hpp +++ b/src/macro-core/macro-condition-scene-transform.hpp @@ -24,7 +24,7 @@ public: SceneSelection _scene; SceneItemSelection _source; RegexConfig _regex; - VariableResolvingString _settings = ""; + StringVariable _settings = ""; private: static bool _registered; diff --git a/src/macro-core/macro-condition-source.hpp b/src/macro-core/macro-condition-source.hpp index 20f38492..39a10d39 100644 --- a/src/macro-core/macro-condition-source.hpp +++ b/src/macro-core/macro-condition-source.hpp @@ -29,7 +29,7 @@ public: SourceSelection _source; SourceCondition _condition = SourceCondition::ACTIVE; - VariableResolvingString _settings = ""; + StringVariable _settings = ""; RegexConfig _regex; private: diff --git a/src/macro-core/macro-condition-websocket.hpp b/src/macro-core/macro-condition-websocket.hpp index 985c9558..377fd90a 100644 --- a/src/macro-core/macro-condition-websocket.hpp +++ b/src/macro-core/macro-condition-websocket.hpp @@ -25,8 +25,7 @@ public: }; Type _type = Type::REQUEST; - VariableResolvingString _message = - obs_module_text("AdvSceneSwitcher.enterText"); + StringVariable _message = obs_module_text("AdvSceneSwitcher.enterText"); RegexConfig _regex; std::string _connection; diff --git a/src/macro-external/video/paramerter-wrappers.hpp b/src/macro-external/video/paramerter-wrappers.hpp index b3c69805..c19385ac 100644 --- a/src/macro-external/video/paramerter-wrappers.hpp +++ b/src/macro-external/video/paramerter-wrappers.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include @@ -89,8 +89,7 @@ public: tesseract::PageSegMode GetPageMode() const { return pageSegMode; } tesseract::TessBaseAPI *GetOCR() const { return ocr.get(); } - VariableResolvingString text = - obs_module_text("AdvSceneSwitcher.enterText"); + VariableString text = obs_module_text("AdvSceneSwitcher.enterText"); RegexConfig regex = RegexConfig::PartialMatchRegexConfig(); QColor color = Qt::black; diff --git a/src/utils/file-selection.cpp b/src/utils/file-selection.cpp index 679edfca..54cc06a7 100644 --- a/src/utils/file-selection.cpp +++ b/src/utils/file-selection.cpp @@ -24,7 +24,7 @@ FileSelection::FileSelection(FileSelection::Type type, QWidget *parent) setLayout(layout); } -void FileSelection::SetPath(const VariableResolvingString &path) +void FileSelection::SetPath(const StringVariable &path) { _filePath->setText(path); } diff --git a/src/utils/file-selection.hpp b/src/utils/file-selection.hpp index 2d3e504a..930a29de 100644 --- a/src/utils/file-selection.hpp +++ b/src/utils/file-selection.hpp @@ -17,7 +17,7 @@ public: FileSelection(FileSelection::Type type = FileSelection::Type::READ, QWidget *parent = 0); - void SetPath(const VariableResolvingString &); + void SetPath(const StringVariable &); void SetPath(const QString &); QPushButton *Button() { return _browseButton; } static QString ValidPathOrDesktop(const QString &path); diff --git a/src/utils/string-list.cpp b/src/utils/string-list.cpp index 2454756a..e8314f1e 100644 --- a/src/utils/string-list.cpp +++ b/src/utils/string-list.cpp @@ -27,7 +27,7 @@ bool StringList::Load(obs_data_t *obj, const char *name, size_t count = obs_data_array_count(strings); for (size_t i = 0; i < count; i++) { obs_data_t *array_obj = obs_data_array_item(strings, i); - VariableResolvingString string; + StringVariable string; string.Load(array_obj, elementName); *this << string; obs_data_release(array_obj); @@ -114,7 +114,7 @@ void StringListEdit::Add() if (!accepted || name.empty()) { return; } - VariableResolvingString string = name; + StringVariable string = name; QVariant v = QVariant::fromValue(string); QListWidgetItem *item = new QListWidgetItem( QString::fromStdString(string.UnresolvedValue()), _list); @@ -179,7 +179,7 @@ void StringListEdit::Clicked(QListWidgetItem *item) return; } - VariableResolvingString string = name; + StringVariable string = name; QVariant v = QVariant::fromValue(string); item->setText(QString::fromStdString(string.UnresolvedValue())); item->setData(Qt::UserRole, string); diff --git a/src/utils/string-list.hpp b/src/utils/string-list.hpp index 5b1a5b44..99426417 100644 --- a/src/utils/string-list.hpp +++ b/src/utils/string-list.hpp @@ -1,5 +1,5 @@ #pragma once -#include "variable.hpp" +#include "variable-string.hpp" #include #include @@ -8,7 +8,7 @@ #include #include -class StringList : public QList { +class StringList : public QList { public: bool Save(obs_data_t *obj, const char *name, const char *elementName = "string") const; diff --git a/src/utils/variable-line-edit.cpp b/src/utils/variable-line-edit.cpp index 0b6cf476..089d9122 100644 --- a/src/utils/variable-line-edit.cpp +++ b/src/utils/variable-line-edit.cpp @@ -7,7 +7,7 @@ void VariableLineEdit::setText(const QString &string) QLineEdit::setText(string); } -void VariableLineEdit::setText(const VariableResolvingString &string) +void VariableLineEdit::setText(const StringVariable &string) { QLineEdit::setText(QString::fromStdString(string.UnresolvedValue())); } diff --git a/src/utils/variable-line-edit.hpp b/src/utils/variable-line-edit.hpp index a9a87c5d..cb06caf8 100644 --- a/src/utils/variable-line-edit.hpp +++ b/src/utils/variable-line-edit.hpp @@ -1,5 +1,5 @@ #pragma once -#include "variable.hpp" +#include "variable-string.hpp" #include @@ -8,7 +8,7 @@ class VariableLineEdit : public QLineEdit { public: VariableLineEdit(QWidget *parent); void setText(const QString &); - void setText(const VariableResolvingString &); + void setText(const StringVariable &); private: }; diff --git a/src/utils/variable-text-edit.cpp b/src/utils/variable-text-edit.cpp index a96e1ba0..1d0cea6a 100644 --- a/src/utils/variable-text-edit.cpp +++ b/src/utils/variable-text-edit.cpp @@ -11,7 +11,7 @@ void VariableTextEdit::setPlainText(const QString &string) QPlainTextEdit::setPlainText(string); } -void VariableTextEdit::setPlainText(const VariableResolvingString &string) +void VariableTextEdit::setPlainText(const StringVariable &string) { QPlainTextEdit::setPlainText( QString::fromStdString(string.UnresolvedValue())); diff --git a/src/utils/variable-text-edit.hpp b/src/utils/variable-text-edit.hpp index 2d0f98a2..dbe168c9 100644 --- a/src/utils/variable-text-edit.hpp +++ b/src/utils/variable-text-edit.hpp @@ -1,13 +1,13 @@ #pragma once #include "resizing-text-edit.hpp" -#include "variable.hpp" +#include "variable-string.hpp" class VariableTextEdit : public ResizingPlainTextEdit { Q_OBJECT public: VariableTextEdit(QWidget *parent); void setPlainText(const QString &); - void setPlainText(const VariableResolvingString &); + void setPlainText(const StringVariable &); private: };