Skip to content

Commit a13ee91

Browse files
committed
frontend,shared: Replace and disable contextless connect calls
1 parent 560202b commit a13ee91

34 files changed

+93
-89
lines changed

frontend/OBSApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ bool OBSApp::OBSInit()
12201220

12211221
mainWindow->OBSInit();
12221222

1223-
connect(this, &QGuiApplication::applicationStateChanged,
1223+
connect(this, &QGuiApplication::applicationStateChanged, this,
12241224
[this](Qt::ApplicationState state) { ResetHotkeyState(state == Qt::ApplicationActive); });
12251225
ResetHotkeyState(applicationState() == Qt::ApplicationActive);
12261226

frontend/OBSStudioAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ void OBSStudioAPI::obs_frontend_add_tools_menu_item(const char *name, obs_fronte
326326

327327
QAction *action = main->ui->menuTools->addAction(QT_UTF8(name));
328328
action->setMenuRole(QAction::NoRole);
329-
QObject::connect(action, &QAction::triggered, func);
329+
QObject::connect(action, &QAction::triggered, action, func);
330330
}
331331

332332
bool OBSStudioAPI::obs_frontend_add_dock_by_id(const char *id, const char *title, void *widget)

frontend/components/OBSAdvAudioCtrl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_) : source(
207207
connect(monitoringType, &QComboBox::currentIndexChanged, this, &OBSAdvAudioCtrl::monitoringTypeChanged);
208208

209209
auto connectMixer = [this](QCheckBox *mixer, int num) {
210-
connect(mixer, &QCheckBox::clicked, [this, num](bool checked) { setMixer(source, num, checked); });
210+
connect(mixer, &QCheckBox::clicked, this,
211+
[this, num](bool checked) { setMixer(source, num, checked); });
211212
};
212213
connectMixer(mixer1, 0);
213214
connectMixer(mixer2, 1);

frontend/components/SourceTreeItem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ SourceTreeItem::SourceTreeItem(SourceTree *tree_, OBSSceneItem sceneitem_) : tre
151151
obs_sceneitem_set_locked(sceneitem, checked);
152152
};
153153

154-
connect(vis, &QAbstractButton::clicked, setItemVisible);
155-
connect(lock, &QAbstractButton::clicked, setItemLocked);
154+
connect(vis, &QAbstractButton::clicked, this, setItemVisible);
155+
connect(lock, &QAbstractButton::clicked, this, setItemLocked);
156156
}
157157

158158
void SourceTreeItem::paintEvent(QPaintEvent *event)

frontend/components/VisibilityItemWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ VisibilityItemWidget::VisibilityItemWidget(obs_source_t *source_)
2828

2929
setLayout(itemLayout);
3030

31-
connect(vis, &QCheckBox::clicked, [this](bool visible) { obs_source_set_enabled(source, visible); });
31+
connect(vis, &QCheckBox::clicked, this, [this](bool visible) { obs_source_set_enabled(source, visible); });
3232
}
3333

3434
void VisibilityItemWidget::OBSSourceEnabled(void *param, calldata_t *data)

frontend/dialogs/OBSBasicFilters.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
7676

7777
installEventFilter(CreateShortcutFilter());
7878

79-
connect(ui->asyncFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor,
79+
connect(ui->asyncFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor, this,
8080
[this](QWidget *editor) { FilterNameEdited(editor, ui->asyncFilters); });
8181

82-
connect(ui->effectFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor,
82+
connect(ui->effectFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor, this,
8383
[this](QWidget *editor) { FilterNameEdited(editor, ui->effectFilters); });
8484

8585
QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close);
@@ -133,7 +133,7 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
133133
ui->rightLayout->setContentsMargins(0, 0, 0, 0);
134134
ui->preview->show();
135135
if (drawable_type)
136-
connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback);
136+
connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addDrawCallback);
137137
} else {
138138
ui->rightLayout->setContentsMargins(0, noPreviewMargin, 0, 0);
139139
ui->preview->hide();
@@ -486,7 +486,7 @@ QMenu *OBSBasicFilters::CreateAddFilterPopupMenu(bool async)
486486

487487
QAction *popupItem = new QAction(QT_UTF8(type.name.c_str()), this);
488488
popupItem->setData(QT_UTF8(type.type.c_str()));
489-
connect(popupItem, &QAction::triggered, [this, type]() { AddNewFilter(type.type.c_str()); });
489+
connect(popupItem, &QAction::triggered, this, [this, type]() { AddNewFilter(type.type.c_str()); });
490490
popup->addAction(popupItem);
491491

492492
foundValues = true;

frontend/dialogs/OBSBasicInteraction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ OBSBasicInteraction::OBSBasicInteraction(QWidget *parent, OBSSource source_)
6969
obs_display_add_draw_callback(ui->preview->GetDisplay(), OBSBasicInteraction::DrawPreview, this);
7070
};
7171

72-
connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback);
72+
connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addDrawCallback);
7373
}
7474

7575
OBSBasicInteraction::~OBSBasicInteraction()

frontend/dialogs/OBSBasicProperties.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
103103

104104
if (drawable_preview && drawable_type) {
105105
ui->preview->show();
106-
connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback);
106+
connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addDrawCallback);
107107

108108
} else if (type == OBS_SOURCE_TYPE_TRANSITION) {
109109
sourceA = obs_source_create_private("scene", "sourceA", nullptr);
@@ -139,10 +139,10 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
139139
direction = true;
140140
};
141141

142-
connect(view, &OBSPropertiesView::Changed, updateCallback);
142+
connect(view, &OBSPropertiesView::Changed, this, updateCallback);
143143

144144
ui->preview->show();
145-
connect(ui->preview, &OBSQTDisplay::DisplayCreated, addTransitionDrawCallback);
145+
connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addTransitionDrawCallback);
146146

147147
} else {
148148
ui->preview->hide();
@@ -187,7 +187,7 @@ void OBSBasicProperties::AddPreviewButton()
187187
end = nullptr;
188188
};
189189

190-
connect(playButton, &QPushButton::clicked, play);
190+
connect(playButton, &QPushButton::clicked, this, play);
191191
}
192192

193193
static obs_source_t *CreateLabel(const char *name, size_t h)

frontend/dialogs/OBSBasicSourceSelect.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,18 +359,18 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *id_, un
359359

360360
installEventFilter(CreateShortcutFilter());
361361

362-
connect(ui->createNew, &QRadioButton::pressed, [&]() {
362+
connect(ui->createNew, &QRadioButton::pressed, this, [&]() {
363363
QPushButton *button = ui->buttonBox->button(QDialogButtonBox::Ok);
364364
if (!button->isEnabled())
365365
button->setEnabled(true);
366366
});
367-
connect(ui->selectExisting, &QRadioButton::pressed, [&]() {
367+
connect(ui->selectExisting, &QRadioButton::pressed, this, [&]() {
368368
QPushButton *button = ui->buttonBox->button(QDialogButtonBox::Ok);
369369
bool enabled = ui->sourceList->selectedItems().size() != 0;
370370
if (button->isEnabled() != enabled)
371371
button->setEnabled(enabled);
372372
});
373-
connect(ui->sourceList, &QListWidget::itemSelectionChanged, [&]() {
373+
connect(ui->sourceList, &QListWidget::itemSelectionChanged, this, [&]() {
374374
QPushButton *button = ui->buttonBox->button(QDialogButtonBox::Ok);
375375
if (!button->isEnabled())
376376
button->setEnabled(true);

frontend/importer/ImporterEntryPathItemDelegate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ QWidget *ImporterEntryPathItemDelegate::createEditor(QWidget *parent, const QSty
6868
browseButton->setSizePolicy(buttonSizePolicy);
6969
layout->addWidget(browseButton);
7070

71-
container->connect(browseButton, &QToolButton::clicked, browseCallback);
71+
connect(browseButton, &QToolButton::clicked, this, browseCallback);
7272

7373
// The "clear" button is not shown in output cells
7474
// or the insertion point's input cell.
@@ -78,7 +78,7 @@ QWidget *ImporterEntryPathItemDelegate::createEditor(QWidget *parent, const QSty
7878
clearButton->setSizePolicy(buttonSizePolicy);
7979
layout->addWidget(clearButton);
8080

81-
container->connect(clearButton, &QToolButton::clicked, clearCallback);
81+
connect(clearButton, &QToolButton::clicked, this, clearCallback);
8282
}
8383

8484
container->setLayout(layout);

0 commit comments

Comments
 (0)