Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-25 07:19:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust RegexConfigChanged signal definition

Browse Source
This commit is contained in:
WarmUpTill 2024-01-03 23:41:58 +01:00 committed by WarmUpTill
parent 101ab26069
commit 6398f4a698
29 changed files with 83 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/macro-core/macro-action-variable.cpp
View File

@ -547,8 +547,9 @@ MacroActionVariableEdit::MacroActionVariableEdit(
SLOT(SubStringStartChanged(int)));
QWidget::connect(_subStringSize, SIGNAL(valueChanged(int)), this,
SLOT(SubStringSizeChanged(int)));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_regexPattern, SIGNAL(textChanged()), this,
SLOT(RegexPatternChanged()));
QWidget::connect(_regexMatchIdx, SIGNAL(valueChanged(int)), this,
@ -887,7 +888,7 @@ void MacroActionVariableEdit::SubStringSizeChanged(int val)
_entryData->_subStringSize = val;
}
void MacroActionVariableEdit::RegexChanged(RegexConfig conf)
void MacroActionVariableEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-action-variable.hpp
View File

@ -120,7 +120,7 @@ private slots:
void MacroSegmentOrderChanged();
void SubStringStartChanged(int val);
void SubStringSizeChanged(int val);
void RegexChanged(RegexConfig conf);
void RegexChanged(const RegexConfig &conf);
void RegexPatternChanged();
void RegexMatchIdxChanged(int val);
void FindStrValueChanged();

7
src/macro-core/macro-condition-display.cpp
View File

@ -101,8 +101,9 @@ MacroConditionDisplayEdit::MacroConditionDisplayEdit(
SLOT(ConditionChanged(int)));
QWidget::connect(_displays, SIGNAL(currentTextChanged(const QString &)),
this, SLOT(DisplayNameChanged(const QString &)));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(
_displayCount,
SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
@ -147,7 +148,7 @@ void MacroConditionDisplayEdit::DisplayNameChanged(const QString &display)
_entryData->_displayName = display.toStdString();
}
void MacroConditionDisplayEdit::RegexChanged(RegexConfig conf)
void MacroConditionDisplayEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-display.hpp
View File

@ -54,7 +54,7 @@ public:
private slots:
void ConditionChanged(int);
void DisplayNameChanged(const QString &);
void RegexChanged(RegexConfig conf);
void RegexChanged(const RegexConfig &conf);
void DisplayCountChanged(const NumberVariable<int> &);
protected:

7
src/macro-core/macro-condition-file.cpp
View File

@ -239,8 +239,9 @@ MacroConditionFileEdit::MacroConditionFileEdit(
SLOT(PathChanged(const QString &)));
QWidget::connect(_matchText, SIGNAL(textChanged()), this,
SLOT(MatchTextChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_checkModificationDate, SIGNAL(stateChanged(int)),
this, SLOT(CheckModificationDateChanged(int)));
QWidget::connect(_checkFileContent, SIGNAL(stateChanged(int)), this,
@ -366,7 +367,7 @@ void MacroConditionFileEdit::MatchTextChanged()
updateGeometry();
}
void MacroConditionFileEdit::RegexChanged(RegexConfig conf)
void MacroConditionFileEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-file.hpp
View File

@ -81,7 +81,7 @@ private slots:
void ConditionChanged(int index);
void PathChanged(const QString &text);
void MatchTextChanged();
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
void CheckModificationDateChanged(int state);
void OnlyMatchIfChangedChanged(int state);
signals:

7
src/macro-core/macro-condition-filter.cpp
View File

@ -168,8 +168,9 @@ MacroConditionFilterEdit::MacroConditionFilterEdit(
SLOT(GetSettingsClicked()));
QWidget::connect(_settings, SIGNAL(textChanged()), this,
SLOT(SettingsChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_settingSelection,
SIGNAL(SelectionChanged(const SourceSetting &)), this,
SLOT(SettingSelectionChanged(const SourceSetting &)));
@ -292,7 +293,7 @@ void MacroConditionFilterEdit::SettingsChanged()
updateGeometry();
}
void MacroConditionFilterEdit::RegexChanged(RegexConfig conf)
void MacroConditionFilterEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-filter.hpp
View File

@ -73,7 +73,7 @@ private slots:
void ConditionChanged(int cond);
void GetSettingsClicked();
void SettingsChanged();
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
void SettingSelectionChanged(const SourceSetting &);
signals:
void HeaderInfoChanged(const QString &);

7
src/macro-core/macro-condition-process.cpp
View File

@ -99,8 +99,9 @@ MacroConditionProcessEdit::MacroConditionProcessEdit(
QWidget::connect(_processSelection,
SIGNAL(currentTextChanged(const QString &)), this,
SLOT(ProcessChanged(const QString &)));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_focused, SIGNAL(stateChanged(int)), this,
SLOT(FocusChanged(int)));
QWidget::connect(&_timer, SIGNAL(timeout()), this,
@ -146,7 +147,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text)
QString::fromStdString(_entryData->GetShortDesc()));
}
void MacroConditionProcessEdit::RegexChanged(RegexConfig conf)
void MacroConditionProcessEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-process.hpp
View File

@ -49,7 +49,7 @@ public:
private slots:
void ProcessChanged(const QString &text);
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
void FocusChanged(int state);
void UpdateFocusProcess();
signals:

7
src/macro-core/macro-condition-scene-transform.cpp
View File

@ -166,8 +166,9 @@ MacroConditionSceneTransformEdit::MacroConditionSceneTransformEdit(
SLOT(GetSettingsClicked()));
QWidget::connect(_settings, SIGNAL(textChanged()), this,
SLOT(SettingsChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
{"{{scenes}}", _scenes},
@ -288,7 +289,7 @@ void MacroConditionSceneTransformEdit::SettingsChanged()
updateGeometry();
}
void MacroConditionSceneTransformEdit::RegexChanged(RegexConfig conf)
void MacroConditionSceneTransformEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-scene-transform.hpp
View File

@ -65,7 +65,7 @@ private slots:
void TypeChanged(int type);
void GetSettingsClicked();
void SettingsChanged();
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
signals:
void HeaderInfoChanged(const QString &);

7
src/macro-core/macro-condition-source.cpp
View File

@ -151,8 +151,9 @@ MacroConditionSourceEdit::MacroConditionSourceEdit(
SLOT(GetSettingsClicked()));
QWidget::connect(_settings, SIGNAL(textChanged()), this,
SLOT(SettingsChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_settingSelection,
SIGNAL(SelectionChanged(const SourceSetting &)), this,
SLOT(SettingSelectionChanged(const SourceSetting &)));
@ -253,7 +254,7 @@ void MacroConditionSourceEdit::SettingsChanged()
updateGeometry();
}
void MacroConditionSourceEdit::RegexChanged(RegexConfig conf)
void MacroConditionSourceEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-source.hpp
View File

@ -68,7 +68,7 @@ private slots:
void ConditionChanged(int cond);
void GetSettingsClicked();
void SettingsChanged();
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
void SettingSelectionChanged(const SourceSetting &);
signals:
void HeaderInfoChanged(const QString &);

7
src/macro-core/macro-condition-tempvar.cpp
View File

@ -223,8 +223,9 @@ MacroConditionTempVarEdit::MacroConditionTempVarEdit(
SLOT(StrValueChanged()));
QWidget::connect(_numValue, SIGNAL(valueChanged(double)), this,
SLOT(NumValueChanged(double)));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
{"{{variables}}", _tempVars},
@ -316,7 +317,7 @@ void MacroConditionTempVarEdit::NumValueChanged(double val)
_entryData->_numValue = val;
}
void MacroConditionTempVarEdit::RegexChanged(RegexConfig conf)
void MacroConditionTempVarEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-tempvar.hpp
View File

@ -77,7 +77,7 @@ private slots:
void ConditionChanged(int);
void StrValueChanged();
void NumValueChanged(double);
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
signals:
void HeaderInfoChanged(const QString &);

7
src/macro-core/macro-condition-variable.cpp
View File

@ -195,8 +195,9 @@ MacroConditionVariableEdit::MacroConditionVariableEdit(
SLOT(StrValueChanged()));
QWidget::connect(_numValue, SIGNAL(valueChanged(double)), this,
SLOT(NumValueChanged(double)));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
{"{{variables}}", _variables},
@ -288,7 +289,7 @@ void MacroConditionVariableEdit::NumValueChanged(double val)
_entryData->_numValue = val;
}
void MacroConditionVariableEdit::RegexChanged(RegexConfig conf)
void MacroConditionVariableEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-variable.hpp
View File

@ -78,7 +78,7 @@ private slots:
void ConditionChanged(int);
void StrValueChanged();
void NumValueChanged(double);
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
signals:
void HeaderInfoChanged(const QString &);

7
src/macro-core/macro-condition-websocket.cpp
View File

@ -113,8 +113,9 @@ MacroConditionWebsocketEdit::MacroConditionWebsocketEdit(
SLOT(ConditionChanged(int)));
QWidget::connect(_message, SIGNAL(textChanged()), this,
SLOT(MessageChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_connection, SIGNAL(SelectionChanged(const QString &)),
this,
SLOT(ConnectionSelectionChanged(const QString &)));
@ -229,7 +230,7 @@ void MacroConditionWebsocketEdit::ConnectionSelectionChanged(
emit(HeaderInfoChanged(connection));
}
void MacroConditionWebsocketEdit::RegexChanged(RegexConfig conf)
void MacroConditionWebsocketEdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

2
src/macro-core/macro-condition-websocket.hpp
View File

@ -56,7 +56,7 @@ public:
private slots:
void ConditionChanged(int);
void MessageChanged();
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
void ConnectionSelectionChanged(const QString &);
signals:
void HeaderInfoChanged(const QString &);

14
src/macro-core/macro-condition-window.cpp
View File

@ -201,8 +201,9 @@ MacroConditionWindowEdit::MacroConditionWindowEdit(
QWidget::connect(_windowSelection,
SIGNAL(currentTextChanged(const QString &)), this,
SLOT(WindowChanged(const QString &)));
QWidget::connect(_windowRegex, SIGNAL(RegexConfigChanged(RegexConfig)),
this, SLOT(WindowRegexChanged(RegexConfig)));
QWidget::connect(_windowRegex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(WindowRegexChanged(const RegexConfig &)));
QWidget::connect(_checkTitle, SIGNAL(stateChanged(int)), this,
SLOT(CheckTitleChanged(int)));
QWidget::connect(_fullscreen, SIGNAL(stateChanged(int)), this,
@ -217,8 +218,9 @@ MacroConditionWindowEdit::MacroConditionWindowEdit(
SLOT(CheckTextChanged(int)));
QWidget::connect(_text, SIGNAL(textChanged()), this,
SLOT(WindowTextChanged()));
QWidget::connect(_textRegex, SIGNAL(RegexConfigChanged(RegexConfig)),
this, SLOT(TextRegexChanged(RegexConfig)));
QWidget::connect(_textRegex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(TextRegexChanged(const RegexConfig &)));
QWidget::connect(&_timer, SIGNAL(timeout()), this,
SLOT(UpdateFocusWindow()));
@ -312,7 +314,7 @@ void MacroConditionWindowEdit::WindowChanged(const QString &text)
QString::fromStdString(_entryData->GetShortDesc()));
}
void MacroConditionWindowEdit::WindowRegexChanged(RegexConfig conf)
void MacroConditionWindowEdit::WindowRegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;
@ -366,7 +368,7 @@ void MacroConditionWindowEdit::WindowTextChanged()
updateGeometry();
}
void MacroConditionWindowEdit::TextRegexChanged(RegexConfig conf)
void MacroConditionWindowEdit::TextRegexChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

4
src/macro-core/macro-condition-window.hpp
View File

@ -63,7 +63,7 @@ public:
private slots:
void WindowChanged(const QString &text);
void WindowRegexChanged(RegexConfig);
void WindowRegexChanged(const RegexConfig &);
void CheckTitleChanged(int state);
void FullscreenChanged(int state);
void MaximizedChanged(int state);
@ -71,7 +71,7 @@ private slots:
void WindowFocusChanged(int state);
void CheckTextChanged(int state);
void WindowTextChanged();
void TextRegexChanged(RegexConfig);
void TextRegexChanged(const RegexConfig &);
void UpdateFocusWindow();
signals:
void HeaderInfoChanged(const QString &);

14
src/macro-external/twitch/macro-condition-twitch.cpp
View File

@ -1225,12 +1225,14 @@ MacroConditionTwitchEdit::MacroConditionTwitchEdit(
SLOT(PointsRewardChanged(const TwitchPointsReward &)));
QWidget::connect(_streamTitle, SIGNAL(editingFinished()), this,
SLOT(StreamTitleChanged()));
QWidget::connect(_regexTitle, SIGNAL(RegexConfigChanged(RegexConfig)),
this, SLOT(RegexTitleChanged(RegexConfig)));
QWidget::connect(_regexTitle,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexTitleChanged(const RegexConfig &)));
QWidget::connect(_chatMessage, SIGNAL(textChanged()), this,
SLOT(ChatMessageChanged()));
QWidget::connect(_regexChat, SIGNAL(RegexConfigChanged(RegexConfig)),
this, SLOT(RegexChatChanged(RegexConfig)));
QWidget::connect(_regexChat,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChatChanged(const RegexConfig &)));
QWidget::connect(_category,
SIGNAL(CategoreyChanged(const TwitchCategory &)), this,
SLOT(CategoreyChanged(const TwitchCategory &)));
@ -1358,7 +1360,7 @@ void MacroConditionTwitchEdit::ChatMessageChanged()
_entryData->_chatMessage = _chatMessage->toPlainText().toStdString();
}
void MacroConditionTwitchEdit::RegexTitleChanged(RegexConfig conf)
void MacroConditionTwitchEdit::RegexTitleChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;
@ -1371,7 +1373,7 @@ void MacroConditionTwitchEdit::RegexTitleChanged(RegexConfig conf)
updateGeometry();
}
void MacroConditionTwitchEdit::RegexChatChanged(RegexConfig conf)
void MacroConditionTwitchEdit::RegexChatChanged(const RegexConfig &conf)
{
if (_loading || !_entryData) {
return;

4
src/macro-external/twitch/macro-condition-twitch.hpp
View File

@ -156,8 +156,8 @@ private slots:
void PointsRewardChanged(const TwitchPointsReward &);
void StreamTitleChanged();
void ChatMessageChanged();
void RegexTitleChanged(RegexConfig);
void RegexChatChanged(RegexConfig);
void RegexTitleChanged(const RegexConfig &);
void RegexChatChanged(const RegexConfig &);
void CategoreyChanged(const TwitchCategory &);
signals:

7
src/macro-external/video/macro-condition-video.cpp
View File

@ -555,8 +555,9 @@ OCREdit::OCREdit(QWidget *parent, PreviewDialog *previewDialog,
SLOT(ColorThresholdChanged(const NumberVariable<double> &)));
QWidget::connect(_matchText, SIGNAL(textChanged()), this,
SLOT(MatchTextChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_pageSegMode, SIGNAL(currentIndexChanged(int)), this,
SLOT(PageSegModeChanged(int)));
QWidget::connect(_languageCode, SIGNAL(editingFinished()), this,
@ -664,7 +665,7 @@ void OCREdit::MatchTextChanged()
_previewDialog->OCRParametersChanged(_data->_ocrParameters);
}
void OCREdit::RegexChanged(RegexConfig conf)
void OCREdit::RegexChanged(const RegexConfig &conf)
{
if (_loading || !_data) {
return;

2
src/macro-external/video/macro-condition-video.hpp
View File

@ -125,7 +125,7 @@ private slots:
void SelectColorClicked();
void ColorThresholdChanged(const NumberVariable<double> &);
void MatchTextChanged();
void RegexChanged(RegexConfig conf);
void RegexChanged(const RegexConfig &conf);
void PageSegModeChanged(int);
void LanguageChanged();

2
src/utils/regex-config.hpp
View File

@ -54,7 +54,7 @@ public slots:
void EnableChanged(bool);
void OpenSettingsClicked();
signals:
void RegexConfigChanged(RegexConfig);
void RegexConfigChanged(const RegexConfig &);
private:
void SetVisibility();

10
src/utils/scene-item-selection.cpp
View File

@ -603,8 +603,9 @@ SceneItemSelectionWidget::SceneItemSelectionWidget(QWidget *parent,
this, SLOT(IndexEndChanged(const NumberVariable<int> &)));
QWidget::connect(_pattern, SIGNAL(editingFinished()), this,
SLOT(PatternChanged()));
QWidget::connect(_regex, SIGNAL(RegexConfigChanged(RegexConfig)), this,
SLOT(RegexChanged(RegexConfig)));
QWidget::connect(_regex,
SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
SLOT(RegexChanged(const RegexConfig &)));
QWidget::connect(_changeType, SIGNAL(clicked()), this,
SLOT(ChangeType()));
@ -808,10 +809,11 @@ void SceneItemSelectionWidget::PatternChanged()
emit SceneItemChanged(_currentSelection);
}
void SceneItemSelectionWidget::RegexChanged(RegexConfig regex)
void SceneItemSelectionWidget::RegexChanged(const RegexConfig &regex)
{
regex.SetEnabled(true); // No reason for it to be disabled
_currentSelection._regex = regex;
// No reason for the regex to be disabled
_currentSelection._regex.SetEnabled(true);
emit SceneItemChanged(_currentSelection);
}

2
src/utils/scene-item-selection.hpp
View File

@ -103,7 +103,7 @@ private slots:
void SourceChanged(int);
void NameConflictIndexChanged(int);
void PatternChanged();
void RegexChanged(RegexConfig);
void RegexChanged(const RegexConfig &);
// Source group based
void SourceGroupChanged(const QString &);