diff --git a/lib/macro/macro-action-edit.cpp b/lib/macro/macro-action-edit.cpp index 9d314c29..3156ff7b 100644 --- a/lib/macro/macro-action-edit.cpp +++ b/lib/macro/macro-action-edit.cpp @@ -28,8 +28,7 @@ static inline void populateActionSelection(QComboBox *list) } MacroActionEdit::MacroActionEdit(QWidget *parent, - std::shared_ptr *entryData, - const std::string &id) + std::shared_ptr *entryData) : MacroSegmentEdit(parent), _actionSelection(new FilterComboBox()), _enable(new SwitchButton()), diff --git a/lib/macro/macro-action-edit.hpp b/lib/macro/macro-action-edit.hpp index 5b462a8b..bf76dac3 100644 --- a/lib/macro/macro-action-edit.hpp +++ b/lib/macro/macro-action-edit.hpp @@ -13,10 +13,8 @@ class MacroActionEdit : public MacroSegmentEdit { Q_OBJECT public: - MacroActionEdit( - QWidget *parent = nullptr, - std::shared_ptr * = nullptr, - const std::string &id = MacroAction::GetDefaultID().data()); + MacroActionEdit(QWidget *parent = nullptr, + std::shared_ptr * = nullptr); void SetupWidgets(bool basicSetup = false); void SetEntryData(std::shared_ptr *); diff --git a/lib/macro/macro-condition-edit.cpp b/lib/macro/macro-condition-edit.cpp index 065f7cd7..4ccc098b 100644 --- a/lib/macro/macro-condition-edit.cpp +++ b/lib/macro/macro-condition-edit.cpp @@ -100,7 +100,7 @@ void DurationModifierEdit::Collapse(bool collapse) MacroConditionEdit::MacroConditionEdit( QWidget *parent, std::shared_ptr *entryData, - const std::string &id, bool isRootCondition) + bool isRootCondition) : MacroSegmentEdit(parent), _logicSelection(new QComboBox()), _conditionSelection(new FilterComboBox()), diff --git a/lib/macro/macro-condition-edit.hpp b/lib/macro/macro-condition-edit.hpp index ec588159..b3450518 100644 --- a/lib/macro/macro-condition-edit.hpp +++ b/lib/macro/macro-condition-edit.hpp @@ -34,11 +34,9 @@ class MacroConditionEdit : public MacroSegmentEdit { Q_OBJECT public: - MacroConditionEdit( - QWidget *parent = nullptr, - std::shared_ptr * = nullptr, - const std::string &id = MacroCondition::GetDefaultID().data(), - bool root = true); + MacroConditionEdit(QWidget *parent = nullptr, + std::shared_ptr * = nullptr, + bool root = true); bool IsRootNode() const; void SetRootNode(bool); void SetupWidgets(bool basicSetup = false); diff --git a/lib/macro/macro-edit.cpp b/lib/macro/macro-edit.cpp index 2d75838f..305032fe 100644 --- a/lib/macro/macro-edit.cpp +++ b/lib/macro/macro-edit.cpp @@ -418,8 +418,7 @@ void MacroEdit::PopulateMacroActions(Macro &m, uint32_t afterIdx) ui->actionsList->SetVisibilityCheckEnable(false); for (; afterIdx < actions.size(); afterIdx++) { - auto newEntry = new MacroActionEdit(this, &actions[afterIdx], - actions[afterIdx]->GetId()); + auto newEntry = new MacroActionEdit(this, &actions[afterIdx]); ui->actionsList->Add(newEntry); } @@ -444,8 +443,7 @@ void MacroEdit::PopulateMacroElseActions(Macro &m, uint32_t afterIdx) ui->elseActionsList->SetVisibilityCheckEnable(false); for (; afterIdx < actions.size(); afterIdx++) { - auto newEntry = new MacroActionEdit(this, &actions[afterIdx], - actions[afterIdx]->GetId()); + auto newEntry = new MacroActionEdit(this, &actions[afterIdx]); ui->elseActionsList->Add(newEntry); } @@ -472,8 +470,7 @@ void MacroEdit::PopulateMacroConditions(Macro &m, uint32_t afterIdx) for (; afterIdx < conditions.size(); afterIdx++) { auto newEntry = new MacroConditionEdit( - this, &conditions[afterIdx], - conditions[afterIdx]->GetId(), root); + this, &conditions[afterIdx], root); ui->conditionsList->Add(newEntry); root = false; } @@ -1083,8 +1080,7 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id, RunAndClearPostLoadSteps(); macro->UpdateActionIndices(); ui->actionsList->Insert( - idx, - new MacroActionEdit(this, ¯o->Actions()[idx], id)); + idx, new MacroActionEdit(this, ¯o->Actions()[idx])); SetActionData(*macro); } HighlightAction(idx); @@ -1386,8 +1382,8 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id, RunAndClearPostLoadSteps(); macro->UpdateElseActionIndices(); ui->elseActionsList->Insert( - idx, new MacroActionEdit( - this, ¯o->ElseActions()[idx], id)); + idx, + new MacroActionEdit(this, ¯o->ElseActions()[idx])); SetElseActionData(*macro); } HighlightElseAction(idx); @@ -1589,7 +1585,7 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id, ui->conditionsList->Insert( idx, new MacroConditionEdit(this, ¯o->Conditions()[idx], - id, idx == 0)); + idx == 0)); SetConditionData(*macro); } HighlightCondition(idx); diff --git a/lib/osx/advanced-scene-switcher-osx.mm b/lib/osx/advanced-scene-switcher-osx.mm index 3eb6bc9a..81a6169b 100644 --- a/lib/osx/advanced-scene-switcher-osx.mm +++ b/lib/osx/advanced-scene-switcher-osx.mm @@ -258,7 +258,7 @@ bool IsFullscreen(const std::string &title) return false; } -std::optional GetTextInWindow(const std::string &window) +std::optional GetTextInWindow(const std::string &) { // Not implemented return {}; diff --git a/lib/utils/math-helpers.cpp b/lib/utils/math-helpers.cpp index 91adbaf7..68b0e1bf 100644 --- a/lib/utils/math-helpers.cpp +++ b/lib/utils/math-helpers.cpp @@ -56,7 +56,7 @@ std::optional GetDouble(const std::string &str) std::optional GetInt(const std::string &str) { char *end = nullptr; - int value = std::strtol(str.c_str(), &end, 10); + int value = (int)std::strtol(str.c_str(), &end, 10); if (end != str.c_str() && *end == '\0' && value != INT_MAX && value != INT_MIN) { diff --git a/lib/variables/variable-tab.cpp b/lib/variables/variable-tab.cpp index 214f40da..3a4ed292 100644 --- a/lib/variables/variable-tab.cpp +++ b/lib/variables/variable-tab.cpp @@ -467,9 +467,9 @@ static void setupTab(QTabWidget *tab) setTabVisible(tab, false); } - QWidget::connect( - VariableSignalManager::Instance(), &VariableSignalManager::Add, - tab, [tab](const QString &name) { setTabVisible(tab, true); }); + QWidget::connect(VariableSignalManager::Instance(), + &VariableSignalManager::Add, tab, + [tab](const QString &) { setTabVisible(tab, true); }); } void VariableTable::Settings::Save(obs_data_t *data, const char *name) diff --git a/plugins/base/macro-action-scene-switch.cpp b/plugins/base/macro-action-scene-switch.cpp index e9abc244..bc6b1c9b 100644 --- a/plugins/base/macro-action-scene-switch.cpp +++ b/plugins/base/macro-action-scene-switch.cpp @@ -453,7 +453,7 @@ void MacroActionSwitchSceneEdit::SceneSelectionCanvasChanged( SetWidgetVisibility(); } -void MacroActionSwitchSceneEdit::ActionChanged(int value) +void MacroActionSwitchSceneEdit::ActionChanged(int) { GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast( diff --git a/plugins/base/macro-condition-process.cpp b/plugins/base/macro-condition-process.cpp index 9c3aa6da..720a32d6 100644 --- a/plugins/base/macro-condition-process.cpp +++ b/plugins/base/macro-condition-process.cpp @@ -154,7 +154,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text) QString::fromStdString(_entryData->GetShortDesc())); } -void MacroConditionProcessEdit::showEvent(QShowEvent *event) +void MacroConditionProcessEdit::showEvent(QShowEvent *) { const QSignalBlocker b(_processSelection); const auto text = _processSelection->currentText(); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0523077c..7bac03a8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -106,8 +106,11 @@ target_sources( # --- variable --- # -if(NOT OS_WINDOWS) - target_compile_options(${PROJECT_NAME} PUBLIC -Wno-error=shadow) +if(OS_WINDOWS) + target_compile_options(${PROJECT_NAME} PRIVATE /wd4100) +else() + target_compile_options(${PROJECT_NAME} PRIVATE -Wno-error=shadow + -Wno-unused-parameter) endif() target_sources(