mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

UI: Replace SIGNAL and SLOT macros in filters

Browse Source
This commit is contained in:
gxalpha 2023-03-29 17:04:12 +02:00
parent d97d3a1871
commit f7a7c652ab
No known key found for this signature in database
GPG Key ID: 470184116E317811
2 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
UI/window-basic-filters.cpp
View File

@ -89,19 +89,21 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
installEventFilter(CreateShortcutFilter());
connect(ui->asyncFilters->itemDelegate(),
SIGNAL(closeEditor(QWidget *)), this,
SLOT(AsyncFilterNameEdited(QWidget *)));
&QAbstractItemDelegate::closeEditor, [this](QWidget *editor) {
FilterNameEdited(editor, ui->asyncFilters);
});
connect(ui->effectFilters->itemDelegate(),
SIGNAL(closeEditor(QWidget *)), this,
SLOT(EffectFilterNameEdited(QWidget *)));
&QAbstractItemDelegate::closeEditor, [this](QWidget *editor) {
FilterNameEdited(editor, ui->effectFilters);
});
QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close);
connect(close, SIGNAL(clicked()), this, SLOT(close()));
connect(close, &QPushButton::clicked, this, &OBSBasicFilters::close);
close->setDefault(true);
connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults),
SIGNAL(clicked()), this, SLOT(ResetFilters()));
&QPushButton::clicked, this, &OBSBasicFilters::ResetFilters);
connect(ui->asyncFilters->model(), &QAbstractItemModel::rowsMoved, this,
&OBSBasicFilters::FiltersMoved);
@ -541,8 +543,8 @@ QMenu *OBSBasicFilters::CreateAddFilterPopupMenu(bool async)
QAction *popupItem =
new QAction(QT_UTF8(type.name.c_str()), this);
popupItem->setData(QT_UTF8(type.type.c_str()));
connect(popupItem, SIGNAL(triggered(bool)), this,
SLOT(AddFilterFromAction()));
connect(popupItem, &QAction::triggered,
[this, type]() { AddNewFilter(type.type.c_str()); });
popup->addAction(popupItem);
foundValues = true;
@ -662,15 +664,6 @@ void OBSBasicFilters::AddNewFilter(const char *id)
}
}
void OBSBasicFilters::AddFilterFromAction()
{
QAction *action = qobject_cast<QAction *>(sender());
if (!action)
return;
AddNewFilter(QT_TO_UTF8(action->data().toString()));
}
void OBSBasicFilters::closeEvent(QCloseEvent *event)
{
QDialog::closeEvent(event);
@ -931,20 +924,19 @@ void OBSBasicFilters::CustomContextMenu(const QPoint &pos, bool async)
popup.addMenu(addMenu);
if (item) {
const char *dulpicateSlot =
async ? SLOT(DuplicateAsyncFilter())
: SLOT(DuplicateEffectFilter());
popup.addSeparator();
popup.addAction(QTStr("Duplicate"), this, dulpicateSlot);
popup.addAction(QTStr("Duplicate"), this, [&]() {
DuplicateItem(async ? ui->asyncFilters->currentItem()
: ui->effectFilters->currentItem());
});
popup.addSeparator();
popup.addAction(ui->actionRenameFilter);
popup.addAction(ui->actionRemoveFilter);
popup.addSeparator();
QAction *copyAction = new QAction(QTStr("Copy"));
connect(copyAction, SIGNAL(triggered()), this,
SLOT(CopyFilter()));
connect(copyAction, &QAction::triggered, this,
&OBSBasicFilters::CopyFilter);
copyAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_C));
ui->effectWidget->addAction(copyAction);
ui->asyncWidget->addAction(copyAction);
@ -953,7 +945,8 @@ void OBSBasicFilters::CustomContextMenu(const QPoint &pos, bool async)
QAction *pasteAction = new QAction(QTStr("Paste"));
pasteAction->setEnabled(main->copyFilter);
connect(pasteAction, SIGNAL(triggered()), this, SLOT(PasteFilter()));
connect(pasteAction, &QAction::triggered, this,
&OBSBasicFilters::PasteFilter);
pasteAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_V));
ui->effectWidget->addAction(pasteAction);
ui->asyncWidget->addAction(pasteAction);
@ -1051,16 +1044,6 @@ void OBSBasicFilters::RenameEffectFilter()
EditItem(ui->effectFilters->currentItem(), false);
}
void OBSBasicFilters::DuplicateAsyncFilter()
{
DuplicateItem(ui->asyncFilters->currentItem());
}
void OBSBasicFilters::DuplicateEffectFilter()
{
DuplicateItem(ui->effectFilters->currentItem());
}
void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list)
{
QListWidgetItem *listItem = list->currentItem();
@ -1135,16 +1118,6 @@ void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list)
editActive = false;
}
void OBSBasicFilters::AsyncFilterNameEdited(QWidget *editor)
{
FilterNameEdited(editor, ui->asyncFilters);
}
void OBSBasicFilters::EffectFilterNameEdited(QWidget *editor)
{
FilterNameEdited(editor, ui->effectFilters);
}
static bool ConfirmReset(QWidget *parent)
{
QMessageBox::StandardButton button;

7
UI/window-basic-filters.hpp
View File

@ -87,12 +87,8 @@ private slots:
void ReorderFilters();
void RenameAsyncFilter();
void RenameEffectFilter();
void DuplicateAsyncFilter();
void DuplicateEffectFilter();
void ResetFilters();
void AddFilterFromAction();
void on_addAsyncFilter_clicked();
void on_removeAsyncFilter_clicked();
void on_moveAsyncFilterUp_clicked();
@ -115,9 +111,6 @@ private slots:
void on_actionRenameFilter_triggered();
void AsyncFilterNameEdited(QWidget *editor);
void EffectFilterNameEdited(QWidget *editor);
void CopyFilter();
void PasteFilter();