1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Fix Qt signal connection warnings

Browse Source 
Closes obsproject/obs-studio#4264
This commit is contained in:
Mike 2021-03-08 16:14:18 +08:00 committed by Jim
parent 901a030adf
commit 40f99da8a2
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,7 +564,7 @@ void OBSBasic::AddTransition(QString id)
}
}
void OBSBasic::on_transitionRemove_clicked()
void OBSBasic::RemoveTransitionClicked()
{
OBSSource tr = GetCurrentTransition();
@ -668,7 +668,7 @@ void OBSBasic::on_transitionProps_clicked()
action = new QAction(QTStr("Remove"), &menu);
connect(action, SIGNAL(triggered()), this,
SLOT(on_transitionRemove_clicked()));
SLOT(RemoveTransitionClicked()));
menu.addAction(action);
action = new QAction(QTStr("Properties"), &menu);
@ -767,7 +767,7 @@ void OBSBasic::CreateProgramDisplay()
program->setContextMenuPolicy(Qt::CustomContextMenu);
connect(program.data(), &QWidget::customContextMenuRequested, this,
&OBSBasic::on_program_customContextMenuRequested);
&OBSBasic::ProgramViewContextMenuRequested);
auto displayResize = [this]() {
struct obs_video_info ovi;

12
UI/window-basic-main.cpp
View File

@ -4444,15 +4444,15 @@ void OBSBasic::on_actionAdvAudioProperties_triggered()
advAudioWindow->SetIconsVisible(iconsVisible);
connect(advAudioWindow, SIGNAL(destroyed()), this,
SLOT(on_advAudioProps_destroyed()));
SLOT(AdvAudioPropsDestroyed()));
}
void OBSBasic::on_advAudioProps_clicked()
void OBSBasic::AdvAudioPropsClicked()
{
on_actionAdvAudioProperties_triggered();
}
void OBSBasic::on_advAudioProps_destroyed()
void OBSBasic::AdvAudioPropsDestroyed()
{
advAudioWindow = nullptr;
}
@ -4631,13 +4631,13 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
: QTStr("Basic.Main.GridMode"),
this);
connect(gridAction, SIGNAL(triggered()), this,
SLOT(on_actionGridMode_triggered()));
SLOT(GridActionClicked()));
popup.addAction(gridAction);
popup.exec(QCursor::pos());
}
void OBSBasic::on_actionGridMode_triggered()
void OBSBasic::GridActionClicked()
{
bool gridMode = !ui->scenes->GetGridMode();
ui->scenes->SetGridMode(gridMode);
@ -6545,7 +6545,7 @@ void OBSBasic::on_preview_customContextMenuRequested(const QPoint &pos)
UNUSED_PARAMETER(pos);
}
void OBSBasic::on_program_customContextMenuRequested(const QPoint &)
void OBSBasic::ProgramViewContextMenuRequested(const QPoint &)
{
QMenu popup(this);
QPointer<QMenu> studioProgramProjector;

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

@ -855,8 +855,8 @@ private slots:
void on_actionRemux_triggered();
void on_action_Settings_triggered();
void on_actionAdvAudioProperties_triggered();
void on_advAudioProps_clicked();
void on_advAudioProps_destroyed();
void AdvAudioPropsClicked();
void AdvAudioPropsDestroyed();
void on_actionShowLogs_triggered();
void on_actionUploadCurrentLog_triggered();
void on_actionUploadLastLog_triggered();
@ -885,7 +885,7 @@ private slots:
void on_scenes_currentItemChanged(QListWidgetItem *current,
QListWidgetItem *prev);
void on_scenes_customContextMenuRequested(const QPoint &pos);
void on_actionGridMode_triggered();
void GridActionClicked();
void on_actionAddScene_triggered();
void on_actionRemoveScene_triggered();
void on_actionSceneUp_triggered();
@ -925,7 +925,7 @@ private slots:
void on_actionDiscord_triggered();
void on_preview_customContextMenuRequested(const QPoint &pos);
void on_program_customContextMenuRequested(const QPoint &pos);
void ProgramViewContextMenuRequested(const QPoint &pos);
void PreviewDisabledMenu(const QPoint &pos);
void on_actionNewSceneCollection_triggered();
@ -953,7 +953,7 @@ private slots:
void on_toggleSourceIcons_toggled(bool visible);
void on_transitions_currentIndexChanged(int index);
void on_transitionRemove_clicked();
void RemoveTransitionClicked();
void on_transitionProps_clicked();
void on_transitionDuration_valueChanged(int value);