jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partly revert "UI: Fix Qt signal connection warnings"

Browse Source 
This partly reverts commit 40f99da8a2be45976f3375555b491d5884a2cc34 so
that conflicts are gone.
This commit is contained in:
gxalpha 2022-05-19 13:40:15 +02:00 committed by Georges Basile Stavracas Neto
parent dada82fec1
commit 6188144cab
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/window-basic-main-transitions.cpp
View File

@ -556,7 +556,7 @@ void OBSBasic::AddTransition(QString id)
}
}
void OBSBasic::RemoveTransitionClicked()
void OBSBasic::on_transitionRemove_clicked()
{
OBSSource tr = GetCurrentTransition();
@ -660,7 +660,7 @@ void OBSBasic::on_transitionProps_clicked()
action = new QAction(QTStr("Remove"), &menu);
connect(action, SIGNAL(triggered()), this,
SLOT(RemoveTransitionClicked()));
SLOT(on_transitionRemove_clicked()));
menu.addAction(action);
action = new QAction(QTStr("Properties"), &menu);

2
UI/window-basic-main.hpp
View File

@ -1066,7 +1066,7 @@ private slots:
void on_toggleSourceIcons_toggled(bool visible);
void on_transitions_currentIndexChanged(int index);
void RemoveTransitionClicked();
void on_transitionRemove_clicked();
void on_transitionProps_clicked();
void on_transitionDuration_valueChanged(int value);
void on_tbar_position_valueChanged(int value);