Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
WarmUpTill 2025-12-11 18:43:49 +01:00
parent 2389f37ed6
commit 5a69e774c2
11 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/macro/macro-action-edit.cpp
View File

@ -28,8 +28,7 @@ static inline void populateActionSelection(QComboBox *list)
}
MacroActionEdit::MacroActionEdit(QWidget *parent,
std::shared_ptr<MacroAction> *entryData,
const std::string &id)
std::shared_ptr<MacroAction> *entryData)
: MacroSegmentEdit(parent),
_actionSelection(new FilterComboBox()),
_enable(new SwitchButton()),

6
lib/macro/macro-action-edit.hpp
View File

@ -13,10 +13,8 @@ class MacroActionEdit : public MacroSegmentEdit {
Q_OBJECT
public:
MacroActionEdit(
QWidget *parent = nullptr,
std::shared_ptr<MacroAction> * = nullptr,
const std::string &id = MacroAction::GetDefaultID().data());
MacroActionEdit(QWidget *parent = nullptr,
std::shared_ptr<MacroAction> * = nullptr);
void SetupWidgets(bool basicSetup = false);
void SetEntryData(std::shared_ptr<MacroAction> *);

2
lib/macro/macro-condition-edit.cpp
View File

@ -100,7 +100,7 @@ void DurationModifierEdit::Collapse(bool collapse)
MacroConditionEdit::MacroConditionEdit(
QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
const std::string &id, bool isRootCondition)
bool isRootCondition)
: MacroSegmentEdit(parent),
_logicSelection(new QComboBox()),
_conditionSelection(new FilterComboBox()),

8
lib/macro/macro-condition-edit.hpp
View File

@ -34,11 +34,9 @@ class MacroConditionEdit : public MacroSegmentEdit {
Q_OBJECT
public:
MacroConditionEdit(
QWidget *parent = nullptr,
std::shared_ptr<MacroCondition> * = nullptr,
const std::string &id = MacroCondition::GetDefaultID().data(),
bool root = true);
MacroConditionEdit(QWidget *parent = nullptr,
std::shared_ptr<MacroCondition> * = nullptr,
bool root = true);
bool IsRootNode() const;
void SetRootNode(bool);
void SetupWidgets(bool basicSetup = false);

18
lib/macro/macro-edit.cpp
View File

@ -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, &macro->Actions()[idx], id));
idx, new MacroActionEdit(this, &macro->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, &macro->ElseActions()[idx], id));
idx,
new MacroActionEdit(this, &macro->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, &macro->Conditions()[idx],
id, idx == 0));
idx == 0));
SetConditionData(*macro);
}
HighlightCondition(idx);

2
lib/osx/advanced-scene-switcher-osx.mm
View File

@ -258,7 +258,7 @@ bool IsFullscreen(const std::string &title)
return false;
}
std::optional<std::string> GetTextInWindow(const std::string &window)
std::optional<std::string> GetTextInWindow(const std::string &)
{
// Not implemented
return {};

2
lib/utils/math-helpers.cpp
View File

@ -56,7 +56,7 @@ std::optional<double> GetDouble(const std::string &str)
std::optional<int> 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) {

6
lib/variables/variable-tab.cpp
View File

@ -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)

2
plugins/base/macro-action-scene-switch.cpp
View File

@ -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<MacroActionSwitchScene::Action>(

2
plugins/base/macro-condition-process.cpp
View File

@ -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();

7
tests/CMakeLists.txt
View File

@ -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(