diff --git a/lib/advanced-scene-switcher.hpp b/lib/advanced-scene-switcher.hpp index 40461ea4..25604a4e 100644 --- a/lib/advanced-scene-switcher.hpp +++ b/lib/advanced-scene-switcher.hpp @@ -82,19 +82,21 @@ public: void RemoveMacro(std::shared_ptr &); void RemoveSelectedMacros(); void RenameMacro(std::shared_ptr &, const QString &name); - std::shared_ptr GetSelectedMacro(); - std::vector> GetSelectedMacros(); + std::shared_ptr GetSelectedMacro() const; + std::vector> GetSelectedMacros() const; void SetEditMacro(Macro &m); - void SetMacroEditAreaDisabled(bool); - void HighlightAction(int idx, QColor color = QColor(Qt::green)); - void HighlightElseAction(int idx, QColor color = QColor(Qt::green)); - void HighlightCondition(int idx, QColor color = QColor(Qt::green)); + void SetMacroEditAreaDisabled(bool) const; + void HighlightAction(int idx, QColor color = QColor(Qt::green)) const; + void HighlightElseAction(int idx, + QColor color = QColor(Qt::green)) const; + void HighlightCondition(int idx, + QColor color = QColor(Qt::green)) const; void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0); void PopulateMacroElseActions(Macro &m, uint32_t afterIdx = 0); void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0); - void SetActionData(Macro &m); - void SetElseActionData(Macro &m); - void SetConditionData(Macro &m); + void SetActionData(Macro &m) const; + void SetElseActionData(Macro &m) const; + void SetConditionData(Macro &m) const; void SwapActions(Macro *m, int pos1, int pos2); void SwapConditions(Macro *m, int pos1, int pos2); void HighlightMacroSettingsButton(bool enable = true); @@ -102,11 +104,11 @@ public: public slots: void on_macroAdd_clicked(); void on_macroRemove_clicked(); - void on_macroUp_clicked(); - void on_macroDown_clicked(); + void on_macroUp_clicked() const; + void on_macroDown_clicked() const; void on_macroName_editingFinished(); - void on_runMacroInParallel_stateChanged(int value); - void on_runMacroOnChange_stateChanged(int value); + void on_runMacroInParallel_stateChanged(int value) const; + void on_runMacroOnChange_stateChanged(int value) const; void on_conditionAdd_clicked(); void on_conditionRemove_clicked(); void on_conditionTop_clicked(); @@ -119,14 +121,14 @@ public slots: void on_actionUp_clicked(); void on_actionDown_clicked(); void on_actionBottom_clicked(); - void on_toggleElseActions_clicked(); + void on_toggleElseActions_clicked() const; void on_elseActionAdd_clicked(); void on_elseActionRemove_clicked(); void on_elseActionTop_clicked(); void on_elseActionUp_clicked(); void on_elseActionDown_clicked(); void on_elseActionBottom_clicked(); - void MacroSelectionAboutToChange(); + void MacroSelectionAboutToChange() const; void MacroSelectionChanged(); void UpMacroSegementHotkey(); void DownMacroSegementHotkey(); @@ -137,22 +139,22 @@ public slots: void ShowMacroConditionsContextMenu(const QPoint &); void CopyMacro(); void RenameSelectedMacro(); - void ExportMacros(); + void ExportMacros() const; void ImportMacros(); - void ExpandAllActions(); - void ExpandAllElseActions(); - void ExpandAllConditions(); - void CollapseAllActions(); - void CollapseAllElseActions(); - void CollapseAllConditions(); - void MinimizeActions(); - void MaximizeActions(); - void MinimizeElseActions(); - void MaximizeElseActions(); - void MinimizeConditions(); - void MaximizeConditions(); - void SetElseActionsStateToHidden(); - void SetElseActionsStateToVisible(); + void ExpandAllActions() const; + void ExpandAllElseActions() const; + void ExpandAllConditions() const; + void CollapseAllActions() const; + void CollapseAllElseActions() const; + void CollapseAllConditions() const; + void MinimizeActions() const; + void MaximizeActions() const; + void MinimizeElseActions() const; + void MaximizeElseActions() const; + void MinimizeConditions() const; + void MaximizeConditions() const; + void SetElseActionsStateToHidden() const; + void SetElseActionsStateToVisible() const; void MacroActionSelectionChanged(int idx); void MacroActionReorder(int to, int target); void AddMacroAction(Macro *macro, int idx, const std::string &id, @@ -178,8 +180,8 @@ public slots: void RemoveMacroCondition(int idx); void MoveMacroConditionUp(int idx); void MoveMacroConditionDown(int idx); - void HighlightControls(); - void HighlightOnChange(); + void HighlightControls() const; + void HighlightOnChange() const; void on_macroSettings_clicked(); void CopyMacroSegment(); void PasteMacroSegment(); diff --git a/lib/macro/macro-condition-edit.cpp b/lib/macro/macro-condition-edit.cpp index 7ff70182..903181f8 100644 --- a/lib/macro/macro-condition-edit.cpp +++ b/lib/macro/macro-condition-edit.cpp @@ -156,7 +156,7 @@ void MacroConditionEdit::LogicSelectionChanged(int idx) SetEnableAppearance(logic != Logic::Type::NONE); } -bool MacroConditionEdit::IsRootNode() +bool MacroConditionEdit::IsRootNode() const { return _isRoot; } diff --git a/lib/macro/macro-condition-edit.hpp b/lib/macro/macro-condition-edit.hpp index b4700484..a3591af0 100644 --- a/lib/macro/macro-condition-edit.hpp +++ b/lib/macro/macro-condition-edit.hpp @@ -39,7 +39,7 @@ public: std::shared_ptr * = nullptr, const std::string &id = MacroCondition::GetDefaultID().data(), bool root = true); - bool IsRootNode(); + bool IsRootNode() const; void SetRootNode(bool); void UpdateEntryData(const std::string &id); void SetEntryData(std::shared_ptr *); diff --git a/lib/macro/macro-segment.cpp b/lib/macro/macro-segment.cpp index c611834e..82390f11 100644 --- a/lib/macro/macro-segment.cpp +++ b/lib/macro/macro-segment.cpp @@ -324,7 +324,7 @@ void MacroSegmentEdit::HeaderInfoChanged(const QString &text) _headerInfo->setText(text); } -void MacroSegmentEdit::Collapsed(bool collapsed) +void MacroSegmentEdit::Collapsed(bool collapsed) const { if (Data()) { Data()->SetCollapsed(collapsed); diff --git a/lib/macro/macro-segment.hpp b/lib/macro/macro-segment.hpp index 1e40decc..2d0e5d2d 100644 --- a/lib/macro/macro-segment.hpp +++ b/lib/macro/macro-segment.hpp @@ -48,7 +48,7 @@ protected: friend void IncrementVariableRef(MacroSegment *); friend void DecrementVariableRef(MacroSegment *); void SetVariableValue(const std::string &value); - bool IsReferencedInVars() { return _variableRefs != 0; } + bool IsReferencedInVars() const { return _variableRefs != 0; } virtual void SetupTempVars(); void AddTempvar(const std::string &id, const std::string &name, @@ -111,7 +111,7 @@ public slots: void HeaderInfoChanged(const QString &); protected slots: - void Collapsed(bool); + void Collapsed(bool) const; signals: void MacroAdded(const QString &name); void MacroRemoved(const QString &name); diff --git a/lib/macro/macro-tab.cpp b/lib/macro/macro-tab.cpp index cf6fca52..ce9e2ff3 100644 --- a/lib/macro/macro-tab.cpp +++ b/lib/macro/macro-tab.cpp @@ -158,7 +158,7 @@ void AdvSceneSwitcher::RemoveSelectedMacros() if (macroCount == 1) { QString deleteWarning = obs_module_text( "AdvSceneSwitcher.macroTab.removeSingleMacroPopup.text"); - auto macro = macros.at(0); + auto ¯o = macros.at(0); deleteWarning = deleteWarning.arg( QString::fromStdString(macro->Name())); @@ -198,7 +198,7 @@ void AdvSceneSwitcher::on_macroRemove_clicked() RemoveSelectedMacros(); } -void AdvSceneSwitcher::on_macroUp_clicked() +void AdvSceneSwitcher::on_macroUp_clicked() const { auto macro = GetSelectedMacro(); if (!macro) { @@ -207,7 +207,7 @@ void AdvSceneSwitcher::on_macroUp_clicked() ui->macros->Up(macro); } -void AdvSceneSwitcher::on_macroDown_clicked() +void AdvSceneSwitcher::on_macroDown_clicked() const { auto macro = GetSelectedMacro(); if (!macro) { @@ -277,7 +277,7 @@ static void addGroupSubitems(std::vector> ¯os, macros.insert(it, subitems.begin(), subitems.end()); } -void AdvSceneSwitcher::ExportMacros() +void AdvSceneSwitcher::ExportMacros() const { auto selectedMacros = GetSelectedMacros(); auto macros = selectedMacros; @@ -508,7 +508,7 @@ void AdvSceneSwitcher::on_macroName_editingFinished() RenameMacro(macro, newName); } -void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value) +void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value) const { auto macro = GetSelectedMacro(); if (!macro) { @@ -518,7 +518,7 @@ void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value) macro->SetRunInParallel(value); } -void AdvSceneSwitcher::on_runMacroOnChange_stateChanged(int value) +void AdvSceneSwitcher::on_runMacroOnChange_stateChanged(int value) const { auto macro = GetSelectedMacro(); if (!macro) { @@ -564,7 +564,7 @@ void AdvSceneSwitcher::PopulateMacroConditions(Macro &m, uint32_t afterIdx) ui->conditionsList->SetHelpMsgVisible(conditions.size() == 0); } -void AdvSceneSwitcher::SetActionData(Macro &m) +void AdvSceneSwitcher::SetActionData(Macro &m) const { auto &actions = m.Actions(); for (int idx = 0; idx < ui->actionsList->ContentLayout()->count(); @@ -581,7 +581,7 @@ void AdvSceneSwitcher::SetActionData(Macro &m) } } -void AdvSceneSwitcher::SetElseActionData(Macro &m) +void AdvSceneSwitcher::SetElseActionData(Macro &m) const { auto &actions = m.ElseActions(); for (int idx = 0; idx < ui->elseActionsList->ContentLayout()->count(); @@ -598,7 +598,7 @@ void AdvSceneSwitcher::SetElseActionData(Macro &m) } } -void AdvSceneSwitcher::SetConditionData(Macro &m) +void AdvSceneSwitcher::SetConditionData(Macro &m) const { auto &conditions = m.Conditions(); for (int idx = 0; idx < ui->conditionsList->ContentLayout()->count(); @@ -676,7 +676,7 @@ void AdvSceneSwitcher::SetEditMacro(Macro &m) m.GetElseActionSplitterPosition()); } -void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) +void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) const { ui->macroName->setDisabled(disable); ui->runMacro->setDisabled(disable); @@ -687,32 +687,32 @@ void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) ui->macroActionConditionSplitter->setDisabled(disable); } -void AdvSceneSwitcher::HighlightAction(int idx, QColor color) +void AdvSceneSwitcher::HighlightAction(int idx, QColor color) const { ui->actionsList->Highlight(idx, color); } -void AdvSceneSwitcher::HighlightElseAction(int idx, QColor color) +void AdvSceneSwitcher::HighlightElseAction(int idx, QColor color) const { ui->elseActionsList->Highlight(idx, color); } -void AdvSceneSwitcher::HighlightCondition(int idx, QColor color) +void AdvSceneSwitcher::HighlightCondition(int idx, QColor color) const { ui->conditionsList->Highlight(idx, color); } -std::shared_ptr AdvSceneSwitcher::GetSelectedMacro() +std::shared_ptr AdvSceneSwitcher::GetSelectedMacro() const { return ui->macros->GetCurrentMacro(); } -std::vector> AdvSceneSwitcher::GetSelectedMacros() +std::vector> AdvSceneSwitcher::GetSelectedMacros() const { return ui->macros->GetCurrentMacros(); } -void AdvSceneSwitcher::MacroSelectionAboutToChange() +void AdvSceneSwitcher::MacroSelectionAboutToChange() const { if (loading) { return; @@ -768,7 +768,7 @@ void AdvSceneSwitcher::MacroSelectionChanged() } } -void AdvSceneSwitcher::HighlightOnChange() +void AdvSceneSwitcher::HighlightOnChange() const { if (!GetGlobalMacroSettings()._highlightActions && !GetGlobalMacroSettings()._highlightExecuted) { @@ -1304,8 +1304,8 @@ void AdvSceneSwitcher::CopyMacro() emit MacroAdded(QString::fromStdString(name)); } -void setCollapsedHelper(const std::shared_ptr &m, MacroSegmentList *list, - bool collapsed) +static void setCollapsedHelper(const std::shared_ptr &m, + MacroSegmentList *list, bool collapsed) { if (!m) { return; @@ -1313,32 +1313,32 @@ void setCollapsedHelper(const std::shared_ptr &m, MacroSegmentList *list, list->SetCollapsed(collapsed); } -void AdvSceneSwitcher::ExpandAllActions() +void AdvSceneSwitcher::ExpandAllActions() const { setCollapsedHelper(GetSelectedMacro(), ui->actionsList, false); } -void AdvSceneSwitcher::ExpandAllElseActions() +void AdvSceneSwitcher::ExpandAllElseActions() const { setCollapsedHelper(GetSelectedMacro(), ui->elseActionsList, false); } -void AdvSceneSwitcher::ExpandAllConditions() +void AdvSceneSwitcher::ExpandAllConditions() const { setCollapsedHelper(GetSelectedMacro(), ui->conditionsList, false); } -void AdvSceneSwitcher::CollapseAllActions() +void AdvSceneSwitcher::CollapseAllActions() const { setCollapsedHelper(GetSelectedMacro(), ui->actionsList, true); } -void AdvSceneSwitcher::CollapseAllElseActions() +void AdvSceneSwitcher::CollapseAllElseActions() const { setCollapsedHelper(GetSelectedMacro(), ui->elseActionsList, true); } -void AdvSceneSwitcher::CollapseAllConditions() +void AdvSceneSwitcher::CollapseAllConditions() const { setCollapsedHelper(GetSelectedMacro(), ui->conditionsList, true); } @@ -1353,7 +1353,7 @@ static void reduceSizeOfSplitterIdx(QSplitter *splitter, int idx) splitter->setSizes(sizes); } -void AdvSceneSwitcher::MinimizeActions() +void AdvSceneSwitcher::MinimizeActions() const { auto macro = GetSelectedMacro(); if (!macro) { @@ -1367,13 +1367,13 @@ void AdvSceneSwitcher::MinimizeActions() } } -void AdvSceneSwitcher::MaximizeActions() +void AdvSceneSwitcher::MaximizeActions() const { MinimizeElseActions(); MinimizeConditions(); } -void AdvSceneSwitcher::MinimizeElseActions() +void AdvSceneSwitcher::MinimizeElseActions() const { auto macro = GetSelectedMacro(); if (!macro) { @@ -1386,24 +1386,24 @@ void AdvSceneSwitcher::MinimizeElseActions() } } -void AdvSceneSwitcher::MaximizeElseActions() +void AdvSceneSwitcher::MaximizeElseActions() const { MinimizeConditions(); reduceSizeOfSplitterIdx(ui->macroElseActionSplitter, 0); } -void AdvSceneSwitcher::MinimizeConditions() +void AdvSceneSwitcher::MinimizeConditions() const { reduceSizeOfSplitterIdx(ui->macroActionConditionSplitter, 0); } -void AdvSceneSwitcher::MaximizeConditions() +void AdvSceneSwitcher::MaximizeConditions() const { MinimizeElseActions(); MinimizeActions(); } -void AdvSceneSwitcher::on_toggleElseActions_clicked() +void AdvSceneSwitcher::on_toggleElseActions_clicked() const { auto elsePosition = ui->macroElseActionSplitter->sizes(); if (elsePosition[1] == 0) { @@ -1414,14 +1414,14 @@ void AdvSceneSwitcher::on_toggleElseActions_clicked() maximizeFirstSplitterEntry(ui->macroElseActionSplitter); } -void AdvSceneSwitcher::SetElseActionsStateToHidden() +void AdvSceneSwitcher::SetElseActionsStateToHidden() const { ui->toggleElseActions->setToolTip(obs_module_text( "AdvSceneSwitcher.macroTab.toggleElseActions.show.tooltip")); ui->toggleElseActions->setChecked(false); } -void AdvSceneSwitcher::SetElseActionsStateToVisible() +void AdvSceneSwitcher::SetElseActionsStateToVisible() const { ui->toggleElseActions->setToolTip(obs_module_text( "AdvSceneSwitcher.macroTab.toggleElseActions.hide.tooltip")); @@ -1599,7 +1599,7 @@ static void fadeWidgets(const std::vector &widgets, bool fadeOut) } } -void AdvSceneSwitcher::HighlightControls() +void AdvSceneSwitcher::HighlightControls() const { const std::vector conditionControls{ ui->conditionAdd, ui->conditionRemove, ui->conditionTop,