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

Fix warnings

Browse Source
This commit is contained in:
WarmUpTill 2021-11-01 18:45:45 +01:00 committed by WarmUpTill
parent 6f1cd3cbcc
commit f955c07bda
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/file-selection.cpp
View File

@ -5,7 +5,7 @@
#include <QFileDialog>
FileSelection::FileSelection(FileSelection::Type type, QWidget *parent)
: _type(type), QWidget(parent)
: QWidget(parent), _type(type)
{
_filePath = new QLineEdit();
_browseButton =

4
src/headers/advanced-scene-switcher.hpp
View File

@ -52,8 +52,8 @@ public:
void SetEditMacro(Macro &m);
void HighlightAction(int idx);
void HighlightCondition(int idx);
void PopulateMacroActions(Macro &m, int afterIdx = 0);
void PopulateMacroConditions(Macro &m, int afterIdx = 0);
void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0);
void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0);
void ConnectControlSignals(MacroActionEdit *);
void ConnectControlSignals(MacroConditionEdit *);
void SwapActions(Macro *m, int pos1, int pos2);

2
src/macro-action-hotkey.cpp
View File

@ -141,7 +141,7 @@ obs_key_combination keysToOBSKeycombo(const std::vector<HotkeyType> &keys)
return combo;
}
for (int i = 0; i < keys.size() - 1; i++) {
for (uint32_t i = 0; i < keys.size() - 1; i++) {
switch (keys[i]) {
case HotkeyType::Key_Shift_L:
combo.modifiers |= INTERACT_SHIFT_KEY;

6
src/macro-tab.cpp
View File

@ -170,9 +170,8 @@ void AdvSceneSwitcher::on_macroName_editingFinished()
emit MacroRenamed(oldName, newName);
}
void AdvSceneSwitcher::PopulateMacroActions(Macro &m, int afterIdx)
void AdvSceneSwitcher::PopulateMacroActions(Macro &m, uint32_t afterIdx)
{
bool root = afterIdx == 0;
auto &actions = m.Actions();
for (; afterIdx < actions.size(); afterIdx++) {
auto newEntry = new MacroActionEdit(this, &actions[afterIdx],
@ -180,12 +179,11 @@ void AdvSceneSwitcher::PopulateMacroActions(Macro &m, int afterIdx)
ConnectControlSignals(newEntry);
ui->macroEditActionLayout->addWidget(newEntry);
ui->macroEditActionHelp->setVisible(false);
root = false;
}
ui->macroEditActionHelp->setVisible(actions.size() == 0);
}
void AdvSceneSwitcher::PopulateMacroConditions(Macro &m, int afterIdx)
void AdvSceneSwitcher::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
{
bool root = afterIdx == 0;
auto &conditions = m.Conditions();