From 11562b66969d2fd2b8732d3492851d40e8418fb6 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Sun, 9 Feb 2025 15:21:19 +0100 Subject: [PATCH] frontend: Remove some shadowing --- .../widgets/OBSBasic_SceneCollections.cpp | 10 +++++----- frontend/widgets/OBSBasic_StudioMode.cpp | 10 +++++----- frontend/widgets/OBSBasic_Transitions.cpp | 20 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/widgets/OBSBasic_SceneCollections.cpp b/frontend/widgets/OBSBasic_SceneCollections.cpp index 88a4a6e6e..0c0857af8 100644 --- a/frontend/widgets/OBSBasic_SceneCollections.cpp +++ b/frontend/widgets/OBSBasic_SceneCollections.cpp @@ -882,12 +882,12 @@ void OBSBasic::Save(SceneCollection &collection) curProgramScene = obs_scene_get_source(scene); OBSDataArrayAutoRelease sceneOrder = SaveSceneListOrder(); - OBSDataArrayAutoRelease transitions = SaveTransitions(); + OBSDataArrayAutoRelease transitionsData = SaveTransitions(); OBSDataArrayAutoRelease quickTrData = SaveQuickTransitions(); OBSDataArrayAutoRelease savedProjectorList = SaveProjectors(); OBSDataArrayAutoRelease savedCanvases = OBS::Canvas::SaveCanvases(canvases); OBSDataAutoRelease saveData = GenerateSaveData(sceneOrder, quickTrData, ui->transitionDuration->value(), - transitions, scene, curProgramScene, savedProjectorList, + transitionsData, scene, curProgramScene, savedProjectorList, savedCanvases); obs_data_set_bool(saveData, "preview_locked", ui->preview->Locked()); @@ -1172,7 +1172,7 @@ void OBSBasic::LoadData(obs_data_t *data, SceneCollection &collection) OBSDataArrayAutoRelease sceneOrder = obs_data_get_array(data, "scene_order"); OBSDataArrayAutoRelease sources = obs_data_get_array(data, "sources"); OBSDataArrayAutoRelease groups = obs_data_get_array(data, "groups"); - OBSDataArrayAutoRelease transitions = obs_data_get_array(data, "transitions"); + OBSDataArrayAutoRelease transitionsData = obs_data_get_array(data, "transitions"); OBSDataArrayAutoRelease collection_canvases = obs_data_get_array(data, "canvases"); const char *sceneName = obs_data_get_string(data, "current_scene"); const char *programSceneName = obs_data_get_string(data, "current_program_scene"); @@ -1295,8 +1295,8 @@ void OBSBasic::LoadData(obs_data_t *data, SceneCollection &collection) if (resetVideo) ResetVideo(); - if (transitions) - LoadTransitions(transitions, AddMissingFiles, files); + if (transitionsData) + LoadTransitions(transitionsData, AddMissingFiles, files); if (sceneOrder) LoadSceneListOrder(sceneOrder); diff --git a/frontend/widgets/OBSBasic_StudioMode.cpp b/frontend/widgets/OBSBasic_StudioMode.cpp index 042c269c1..d492f8f29 100644 --- a/frontend/widgets/OBSBasic_StudioMode.cpp +++ b/frontend/widgets/OBSBasic_StudioMode.cpp @@ -76,8 +76,8 @@ void OBSBasic::CreateProgramOptions() transitionButton = new QPushButton(QTStr("Transition")); transitionButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - QHBoxLayout *quickTransitions = new QHBoxLayout(); - quickTransitions->setSpacing(2); + QHBoxLayout *quickTransitionsLayout = new QHBoxLayout(); + quickTransitionsLayout->setSpacing(2); QPushButton *addQuickTransition = new QPushButton(); addQuickTransition->setProperty("class", "icon-plus"); @@ -85,8 +85,8 @@ void OBSBasic::CreateProgramOptions() QLabel *quickTransitionsLabel = new QLabel(QTStr("QuickTransitions")); quickTransitionsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - quickTransitions->addWidget(quickTransitionsLabel); - quickTransitions->addWidget(addQuickTransition); + quickTransitionsLayout->addWidget(quickTransitionsLabel); + quickTransitionsLayout->addWidget(addQuickTransition); mainButtonLayout->addWidget(transitionButton); mainButtonLayout->addWidget(configTransitions); @@ -102,7 +102,7 @@ void OBSBasic::CreateProgramOptions() layout->addStretch(0); layout->addLayout(mainButtonLayout); - layout->addLayout(quickTransitions); + layout->addLayout(quickTransitionsLayout); layout->addWidget(tBar); layout->addStretch(0); diff --git a/frontend/widgets/OBSBasic_Transitions.cpp b/frontend/widgets/OBSBasic_Transitions.cpp index aeb898d06..27e3be25a 100644 --- a/frontend/widgets/OBSBasic_Transitions.cpp +++ b/frontend/widgets/OBSBasic_Transitions.cpp @@ -47,7 +47,7 @@ static inline QString MakeQuickTransitionText(QuickTransition *qt) void OBSBasic::InitDefaultTransitions() { - std::vector transitions; + std::vector defaultTransitions; size_t idx = 0; const char *id; @@ -59,7 +59,7 @@ void OBSBasic::InitDefaultTransitions() OBSSourceAutoRelease tr = obs_source_create_private(id, name, NULL); InitTransition(tr); - transitions.emplace_back(tr); + defaultTransitions.emplace_back(tr); if (strcmp(id, "fade_transition") == 0) fadeTransition = tr; @@ -68,7 +68,7 @@ void OBSBasic::InitDefaultTransitions() } } - for (OBSSource &tr : transitions) { + for (OBSSource &tr : defaultTransitions) { ui->transitions->addItem(QT_UTF8(obs_source_get_name(tr)), QVariant::fromValue(OBSSource(tr))); } } @@ -1280,7 +1280,7 @@ void OBSBasic::EnableTransitionWidgets(bool enable) obs_data_array_t *OBSBasic::SaveTransitions() { - obs_data_array_t *transitions = obs_data_array_create(); + obs_data_array_t *transitionsData = obs_data_array_create(); for (int i = 0; i < ui->transitions->count(); i++) { OBSSource tr = ui->transitions->itemData(i).value(); @@ -1294,23 +1294,23 @@ obs_data_array_t *OBSBasic::SaveTransitions() obs_data_set_string(sourceData, "id", obs_obj_get_id(tr)); obs_data_set_obj(sourceData, "settings", settings); - obs_data_array_push_back(transitions, sourceData); + obs_data_array_push_back(transitionsData, sourceData); } for (const OBSDataAutoRelease &transition : safeModeTransitions) { - obs_data_array_push_back(transitions, transition); + obs_data_array_push_back(transitionsData, transition); } - return transitions; + return transitionsData; } -void OBSBasic::LoadTransitions(obs_data_array_t *transitions, obs_load_source_cb cb, void *private_data) +void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_source_cb cb, void *private_data) { - size_t count = obs_data_array_count(transitions); + size_t count = obs_data_array_count(transitionsData); safeModeTransitions.clear(); for (size_t i = 0; i < count; i++) { - OBSDataAutoRelease item = obs_data_array_item(transitions, i); + OBSDataAutoRelease item = obs_data_array_item(transitionsData, i); const char *name = obs_data_get_string(item, "name"); const char *id = obs_data_get_string(item, "id"); OBSDataAutoRelease settings = obs_data_get_obj(item, "settings");