Skip to content

Commit 2128d1f

Browse files
committed
TO SQUASH: Fix naming
1 parent fe947fd commit 2128d1f

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

frontend/widgets/OBSBasic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ OBSBasic::OBSBasic(QWidget *parent) : OBSMainWindow(parent), undo_s(ui), ui(new
306306
ui->transitions->clear();
307307
});
308308

309-
connect(this, &OBSBasic::CurrentTranstionChanged, this, [this](const QString &uuid) {
309+
connect(this, &OBSBasic::CurrentTransitionChanged, this, [this](const QString &uuid) {
310310
QSignalBlocker sb(ui->transitions);
311311
ui->transitions->setCurrentIndex(ui->transitions->findData(uuid));
312312
});

frontend/widgets/OBSBasic.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ private slots:
15311531

15321532
void PasteShowHideTransition(obs_sceneitem_t *item, bool show, obs_source_t *tr, int duration);
15331533

1534-
void SetCurrentTransition(const std::string &uuid, bool setTransition);
1534+
void UpdateCurrentTransition(const std::string &uuid, bool setTransition);
15351535

15361536
public slots:
15371537
void SetCurrentScene(OBSSource scene, bool force = false);
@@ -1571,7 +1571,7 @@ private slots:
15711571
void TransitionRemoved(const QString &uuid);
15721572
void TransitionsCleared();
15731573

1574-
void CurrentTranstionChanged(const QString &uuid);
1574+
void CurrentTransitionChanged(const QString &uuid);
15751575

15761576
void TransitionDurationChanged(const int &duration);
15771577

frontend/widgets/OBSBasic_Transitions.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void OBSBasic::InitDefaultTransitions()
8080
emit TransitionAdded(QT_UTF8(obs_source_get_name(tr)), QString::fromStdString(uuid));
8181
}
8282

83-
SetCurrentTransition(transitionUuids.back(), true);
83+
UpdateCurrentTransition(transitionUuids.back(), true);
8484
}
8585

8686
void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt)
@@ -391,7 +391,7 @@ void OBSBasic::SetTransition(OBSSource transition)
391391
std::string uuid = obs_source_get_uuid(transition);
392392
obs_transition_swap_begin(transition, oldTransition);
393393
if (currentTransitionUuid != uuid)
394-
SetCurrentTransition(uuid, false);
394+
UpdateCurrentTransition(uuid, false);
395395
obs_set_output_source(0, transition);
396396
obs_transition_swap_end(transition, oldTransition);
397397
} else {
@@ -461,7 +461,7 @@ void OBSBasic::AddTransition(const char *id)
461461

462462
emit TransitionAdded(QString::fromStdString(name), QString::fromStdString(uuid));
463463

464-
SetCurrentTransition(uuid, true);
464+
UpdateCurrentTransition(uuid, true);
465465

466466
CreatePropertiesWindow(source);
467467
obs_source_release(source);
@@ -526,7 +526,7 @@ void OBSBasic::on_transitionRemove_clicked()
526526

527527
transitionUuids.erase(std::find(transitionUuids.begin(), transitionUuids.end(), currentTransitionUuid));
528528
transitions.erase(currentTransitionUuid);
529-
SetCurrentTransition(transitionUuids.back(), true);
529+
UpdateCurrentTransition(transitionUuids.back(), true);
530530

531531
OnEvent(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
532532

@@ -1378,7 +1378,7 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc
13781378
}
13791379
}
13801380

1381-
SetCurrentTransition(transitionUuids.back(), true);
1381+
UpdateCurrentTransition(transitionUuids.back(), true);
13821382
}
13831383

13841384
OBSSource OBSBasic::GetOverrideTransition(OBSSource source)
@@ -1414,7 +1414,7 @@ int OBSBasic::GetTransitionDuration()
14141414
return transitionDuration;
14151415
}
14161416

1417-
void OBSBasic::SetCurrentTransition(const std::string &uuid, bool setTransition)
1417+
void OBSBasic::UpdateCurrentTransition(const std::string &uuid, bool setTransition)
14181418
{
14191419
auto transitionIter = transitions.find(uuid);
14201420

@@ -1426,7 +1426,7 @@ void OBSBasic::SetCurrentTransition(const std::string &uuid, bool setTransition)
14261426
if (setTransition)
14271427
SetTransition(transitionIter->second);
14281428

1429-
emit CurrentTranstionChanged(QString::fromStdString(uuid));
1429+
emit CurrentTransitionChanged(QString::fromStdString(uuid));
14301430
}
14311431

14321432
void OBSBasic::SetCurrentTransition(const QString &uuid)
@@ -1439,7 +1439,7 @@ void OBSBasic::SetCurrentTransition(const QString &uuid)
14391439
currentTransitionUuid = uuid.toStdString();
14401440
SetTransition(transitionIter->second);
14411441

1442-
emit CurrentTranstionChanged(uuid);
1442+
emit CurrentTransitionChanged(uuid);
14431443
}
14441444

14451445
void OBSBasic::SetTransitionDuration(int duration)

0 commit comments

Comments
 (0)