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

resovle name conflict (#115)

Browse Source
This commit is contained in:
WarmUpTill 2021-02-04 07:24:52 +01:00 committed by GitHub
parent a354daa71d
commit 81d91a9139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scene-trigger.cpp
View File

@ -425,7 +425,7 @@ void SceneTrigger::load(obs_data_t *obj)
audioSource = GetWeakSourceByName(audioSourceName);
}
inline void populateTriggers(QComboBox *list)
static inline void populateTriggers(QComboBox *list)
{
list->addItem(obs_module_text(
"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none"));

2
src/switch-time.cpp
View File

@ -241,7 +241,7 @@ void TimeSwitch::load(obs_data_t *obj)
time = QTime::fromString(obs_data_get_string(obj, "time"));
}
inline void populateTriggers(QComboBox *list)
static inline void populateTriggers(QComboBox *list)
{
list->addItem(obs_module_text("AdvSceneSwitcher.timeTab.anyDay"));
list->addItem(obs_module_text("AdvSceneSwitcher.timeTab.mondays"));