1
0
Эх сурвалжийг харах

Partly revert "UI: Fix Qt signal connection warnings"

This partly reverts commit 40f99da8a2be45976f3375555b491d5884a2cc34 so
that conflicts are gone.
gxalpha 3 жил өмнө
parent
commit
6188144cab

+ 2 - 2
UI/window-basic-main-transitions.cpp

@@ -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);

+ 1 - 1
UI/window-basic-main.hpp

@@ -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);