frontend: Enable Qt strict mode

frontend/OBSApp.cpp

@@ -802,7 +802,7 @@ bool LoadBranchesFile(vector<UpdateBranch> &out)
 		goto fail;
 	}
 
-	branchesText = branchesFile.readAll();
+	branchesText = branchesFile.readAll().toStdString();
 	if (branchesText.empty()) {
 		error = "File empty.";
 		goto fail;
@@ -1233,7 +1233,7 @@ bool OBSApp::OBSInit()
 
 	mainWindow->OBSInit();
 
-	connect(this, &QGuiApplication::applicationStateChanged,
+	connect(this, &QGuiApplication::applicationStateChanged, this,
 		[this](Qt::ApplicationState state) { ResetHotkeyState(state == Qt::ApplicationActive); });
 	ResetHotkeyState(applicationState() == Qt::ApplicationActive);
 

frontend/OBSStudioAPI.cpp

@@ -326,7 +326,7 @@ void OBSStudioAPI::obs_frontend_add_tools_menu_item(const char *name, obs_fronte
 
 	QAction *action = main->ui->menuTools->addAction(QT_UTF8(name));
 	action->setMenuRole(QAction::NoRole);
-	QObject::connect(action, &QAction::triggered, func);
+	QObject::connect(action, &QAction::triggered, action, func);
 }
 
 bool OBSStudioAPI::obs_frontend_add_dock_by_id(const char *id, const char *title, void *widget)

frontend/cmake/ui-qt.cmake

@@ -18,6 +18,9 @@ set_target_properties(
   PROPERTIES AUTOMOC TRUE AUTOUIC TRUE AUTORCC TRUE AUTOGEN_PARALLEL AUTO
 )
 
+# https://doc.qt.io/qt-6/qtglobal.html#QT_ENABLE_STRICT_MODE_UP_TO
+target_compile_definitions(obs-studio PRIVATE QT_ENABLE_STRICT_MODE_UP_TO=0xFF0000)
+
 set_property(TARGET obs-studio APPEND PROPERTY AUTOUIC_SEARCH_PATHS forms forms/source-toolbar)
 
 target_sources(

frontend/components/OBSAdvAudioCtrl.cpp

@@ -207,7 +207,8 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_) : source(
 		connect(monitoringType, &QComboBox::currentIndexChanged, this, &OBSAdvAudioCtrl::monitoringTypeChanged);
 
 	auto connectMixer = [this](QCheckBox *mixer, int num) {
-		connect(mixer, &QCheckBox::clicked, [this, num](bool checked) { setMixer(source, num, checked); });
+		connect(mixer, &QCheckBox::clicked, this,
+			[this, num](bool checked) { setMixer(source, num, checked); });
 	};
 	connectMixer(mixer1, 0);
 	connectMixer(mixer2, 1);

frontend/components/SourceTreeItem.cpp

@@ -156,8 +156,8 @@ SourceTreeItem::SourceTreeItem(SourceTree *tree_, OBSSceneItem sceneitem_) : tre
 		obs_sceneitem_set_locked(sceneitem, checked);
 	};
 
-	connect(vis, &QAbstractButton::clicked, setItemVisible);
-	connect(lock, &QAbstractButton::clicked, setItemLocked);
+	connect(vis, &QAbstractButton::clicked, this, setItemVisible);
+	connect(lock, &QAbstractButton::clicked, this, setItemLocked);
 }
 
 void SourceTreeItem::paintEvent(QPaintEvent *event)

frontend/components/VisibilityItemWidget.cpp

@@ -28,7 +28,7 @@ VisibilityItemWidget::VisibilityItemWidget(obs_source_t *source_)
 
 	setLayout(itemLayout);
 
-	connect(vis, &QCheckBox::clicked, [this](bool visible) { obs_source_set_enabled(source, visible); });
+	connect(vis, &QCheckBox::clicked, this, [this](bool visible) { obs_source_set_enabled(source, visible); });
 }
 
 void VisibilityItemWidget::OBSSourceEnabled(void *param, calldata_t *data)

frontend/dialogs/OBSBasicFilters.cpp

@@ -76,10 +76,10 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
 
 	installEventFilter(CreateShortcutFilter());
 
-	connect(ui->asyncFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor,
+	connect(ui->asyncFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor, this,
 		[this](QWidget *editor) { FilterNameEdited(editor, ui->asyncFilters); });
 
-	connect(ui->effectFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor,
+	connect(ui->effectFilters->itemDelegate(), &QAbstractItemDelegate::closeEditor, this,
 		[this](QWidget *editor) { FilterNameEdited(editor, ui->effectFilters); });
 
 	QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close);
@@ -133,7 +133,7 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
 		ui->rightLayout->setContentsMargins(0, 0, 0, 0);
 		ui->preview->show();
 		if (drawable_type)
-			connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback);
+			connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addDrawCallback);
 	} else {
 		ui->rightLayout->setContentsMargins(0, noPreviewMargin, 0, 0);
 		ui->preview->hide();
@@ -486,7 +486,7 @@ 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, &QAction::triggered, [this, type]() { AddNewFilter(type.type.c_str()); });
+		connect(popupItem, &QAction::triggered, this, [this, type]() { AddNewFilter(type.type.c_str()); });
 		popup->addAction(popupItem);
 
 		foundValues = true;

frontend/dialogs/OBSBasicInteraction.cpp

@@ -69,7 +69,7 @@ OBSBasicInteraction::OBSBasicInteraction(QWidget *parent, OBSSource source_)
 		obs_display_add_draw_callback(ui->preview->GetDisplay(), OBSBasicInteraction::DrawPreview, this);
 	};
 
-	connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback);
+	connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addDrawCallback);
 }
 
 OBSBasicInteraction::~OBSBasicInteraction()

frontend/dialogs/OBSBasicProperties.cpp

@@ -103,7 +103,7 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 
 	if (drawable_preview && drawable_type) {
 		ui->preview->show();
-		connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback);
+		connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addDrawCallback);
 
 	} else if (type == OBS_SOURCE_TYPE_TRANSITION) {
 		sourceA = obs_source_create_private("scene", "sourceA", nullptr);
@@ -139,10 +139,10 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 			direction = true;
 		};
 
-		connect(view, &OBSPropertiesView::Changed, updateCallback);
+		connect(view, &OBSPropertiesView::Changed, this, updateCallback);
 
 		ui->preview->show();
-		connect(ui->preview, &OBSQTDisplay::DisplayCreated, addTransitionDrawCallback);
+		connect(ui->preview, &OBSQTDisplay::DisplayCreated, this, addTransitionDrawCallback);
 
 	} else {
 		ui->preview->hide();
@@ -187,7 +187,7 @@ void OBSBasicProperties::AddPreviewButton()
 		end = nullptr;
 	};
 
-	connect(playButton, &QPushButton::clicked, play);
+	connect(playButton, &QPushButton::clicked, this, play);
 }
 
 static obs_source_t *CreateLabel(const char *name, size_t h)

frontend/dialogs/OBSBasicSourceSelect.cpp

@@ -359,18 +359,18 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *id_, un
 
 	installEventFilter(CreateShortcutFilter());
 
-	connect(ui->createNew, &QRadioButton::pressed, [&]() {
+	connect(ui->createNew, &QRadioButton::pressed, this, [&]() {
 		QPushButton *button = ui->buttonBox->button(QDialogButtonBox::Ok);
 		if (!button->isEnabled())
 			button->setEnabled(true);
 	});
-	connect(ui->selectExisting, &QRadioButton::pressed, [&]() {
+	connect(ui->selectExisting, &QRadioButton::pressed, this, [&]() {
 		QPushButton *button = ui->buttonBox->button(QDialogButtonBox::Ok);
 		bool enabled = ui->sourceList->selectedItems().size() != 0;
 		if (button->isEnabled() != enabled)
 			button->setEnabled(enabled);
 	});
-	connect(ui->sourceList, &QListWidget::itemSelectionChanged, [&]() {
+	connect(ui->sourceList, &QListWidget::itemSelectionChanged, this, [&]() {
 		QPushButton *button = ui->buttonBox->button(QDialogButtonBox::Ok);
 		if (!button->isEnabled())
 			button->setEnabled(true);

frontend/dialogs/OBSYoutubeActions.cpp

@@ -48,9 +48,9 @@ OBSYoutubeActions::OBSYoutubeActions(QWidget *parent, Auth *auth, bool broadcast
 	connect(ui->helpAutoStartStop, &QLabel::linkActivated, this,
 		[](const QString &) { QToolTip::showText(QCursor::pos(), QTStr("YouTube.Actions.AutoStartStop.TT")); });
 	connect(ui->help360Video, &QLabel::linkActivated, this,
-		[](const QString &link) { QDesktopServices::openUrl(link); });
+		[](const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
 	connect(ui->helpMadeForKids, &QLabel::linkActivated, this,
-		[](const QString &link) { QDesktopServices::openUrl(link); });
+		[](const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
 
 	ui->scheduledTime->setVisible(false);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
@@ -712,7 +712,7 @@ void OBSYoutubeActions::OpenYouTubeDashboard()
 	QString uri =
 		QString("https://studio.youtube.com/channel/%1/videos/live?filter=[]&sort={\"columnType\"%3A\"date\"%2C\"sortOrder\"%3A\"DESCENDING\"}")
 			.arg(channel.id);
-	QDesktopServices::openUrl(uri);
+	QDesktopServices::openUrl(QUrl(uri));
 }
 
 void OBSYoutubeActions::Cancel()

frontend/importer/ImporterEntryPathItemDelegate.cpp

@@ -68,7 +68,7 @@ QWidget *ImporterEntryPathItemDelegate::createEditor(QWidget *parent, const QSty
 	browseButton->setSizePolicy(buttonSizePolicy);
 	layout->addWidget(browseButton);
 
-	container->connect(browseButton, &QToolButton::clicked, browseCallback);
+	connect(browseButton, &QToolButton::clicked, this, browseCallback);
 
 	// The "clear" button is not shown in output cells
 	// or the insertion point's input cell.
@@ -78,7 +78,7 @@ QWidget *ImporterEntryPathItemDelegate::createEditor(QWidget *parent, const QSty
 		clearButton->setSizePolicy(buttonSizePolicy);
 		layout->addWidget(clearButton);
 
-		container->connect(clearButton, &QToolButton::clicked, clearCallback);
+		connect(clearButton, &QToolButton::clicked, this, clearCallback);
 	}
 
 	container->setLayout(layout);

frontend/plugins/aja-output-ui/aja-ui-main.cpp

@@ -374,7 +374,7 @@ void addOutputUI(void)
 		ajaOutputUI->ShowHideDialog();
 	};
 
-	action->connect(action, &QAction::triggered, cb);
+	QObject::connect(action, &QAction::triggered, action, cb);
 }
 
 static void OBSEvent(enum obs_frontend_event event, void *)

frontend/plugins/decklink-captions/decklink-captions.cpp

@@ -133,7 +133,7 @@ void addOutputUI(void)
 
 	obs_frontend_add_save_callback(save_decklink_caption_data, nullptr);
 
-	action->connect(action, &QAction::triggered, cb);
+	QObject::connect(action, &QAction::triggered, action, cb);
 }
 
 bool obs_module_load(void)

frontend/plugins/decklink-output-ui/decklink-ui-main.cpp

@@ -427,7 +427,7 @@ void addOutputUI(void)
 		doUI->ShowHideDialog();
 	};
 
-	action->connect(action, &QAction::triggered, cb);
+	QObject::connect(action, &QAction::triggered, action, cb);
 }
 
 static void OBSEvent(enum obs_frontend_event event, void *)

frontend/plugins/frontend-tools/auto-scene-switcher.cpp

@@ -503,5 +503,5 @@ extern "C" void InitSceneSwitcher()
 	obs_frontend_add_save_callback(SaveSceneSwitcher, nullptr);
 	obs_frontend_add_event_callback(OBSEvent, nullptr);
 
-	action->connect(action, &QAction::triggered, cb);
+	QObject::connect(action, &QAction::triggered, action, cb);
 }

frontend/plugins/frontend-tools/output-timer.cpp

@@ -315,5 +315,5 @@ extern "C" void InitOutputTimer()
 	obs_frontend_add_save_callback(SaveOutputTimer, nullptr);
 	obs_frontend_add_event_callback(OBSEvent, nullptr);
 
-	action->connect(action, &QAction::triggered, cb);
+	QObject::connect(action, &QAction::triggered, action, cb);
 }

frontend/plugins/frontend-tools/scripts.cpp

@@ -677,5 +677,5 @@ extern "C" void InitScripts()
 	obs_frontend_add_preload_callback(load_script_data, nullptr);
 	obs_frontend_add_event_callback(obs_event, nullptr);
 
-	action->connect(action, &QAction::triggered, cb);
+	QObject::connect(action, &QAction::triggered, action, cb);
 }

frontend/settings/OBSBasicSettings.cpp

@@ -113,16 +113,16 @@ static inline bool WidgetChanged(QWidget *widget)
 	return widget->property("changed").toBool();
 }
 
-static inline void SetComboByName(QComboBox *combo, const char *name)
+static inline void SetComboByName(QComboBox *combo, const QString &name)
 {
-	int idx = combo->findText(QT_UTF8(name));
+	int idx = combo->findText(name);
 	if (idx != -1)
 		combo->setCurrentIndex(idx);
 }
 
-static inline bool SetComboByValue(QComboBox *combo, const char *name)
+static inline bool SetComboByValue(QComboBox *combo, const QString &name)
 {
-	int idx = combo->findData(QT_UTF8(name));
+	int idx = combo->findData(name);
 	if (idx != -1) {
 		combo->setCurrentIndex(idx);
 		return true;
@@ -131,7 +131,7 @@ static inline bool SetComboByValue(QComboBox *combo, const char *name)
 	return false;
 }
 
-static inline bool SetInvalidValue(QComboBox *combo, const char *name, const char *data = nullptr)
+static inline bool SetInvalidValue(QComboBox *combo, const QString &name, const QVariant &data)
 {
 	combo->insertItem(0, name, data);
 
@@ -1177,8 +1177,8 @@ void OBSBasicSettings::LoadLanguageList()
 #if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
 void TranslateBranchInfo(const QString &name, QString &displayName, QString &description)
 {
-	QString translatedName = QTStr("Basic.Settings.General.ChannelName." + name.toUtf8());
-	QString translatedDesc = QTStr("Basic.Settings.General.ChannelDescription." + name.toUtf8());
+	QString translatedName = QTStr(QT_TO_UTF8(("Basic.Settings.General.ChannelName." + name)));
+	QString translatedDesc = QTStr(QT_TO_UTF8(("Basic.Settings.General.ChannelDescription." + name)));
 
 	if (!translatedName.startsWith("Basic.Settings."))
 		displayName = translatedName;
@@ -1748,7 +1748,7 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
 	if (!IsSurround(speakers))
 		RestrictResetBitrates({ui->simpleOutputABitrate}, 320);
 
-	SetComboByName(ui->simpleOutputABitrate, std::to_string(audioBitrate).c_str());
+	SetComboByName(ui->simpleOutputABitrate, QString::number(audioBitrate));
 
 	ui->simpleOutAdvanced->setChecked(advanced);
 	ui->simpleOutCustom->setText(custom);
@@ -2143,12 +2143,12 @@ void OBSBasicSettings::LoadAdvOutputAudioSettings()
 				      320);
 	}
 
-	SetComboByName(ui->advOutTrack1Bitrate, std::to_string(track1Bitrate).c_str());
-	SetComboByName(ui->advOutTrack2Bitrate, std::to_string(track2Bitrate).c_str());
-	SetComboByName(ui->advOutTrack3Bitrate, std::to_string(track3Bitrate).c_str());
-	SetComboByName(ui->advOutTrack4Bitrate, std::to_string(track4Bitrate).c_str());
-	SetComboByName(ui->advOutTrack5Bitrate, std::to_string(track5Bitrate).c_str());
-	SetComboByName(ui->advOutTrack6Bitrate, std::to_string(track6Bitrate).c_str());
+	SetComboByName(ui->advOutTrack1Bitrate, QString::number(track1Bitrate));
+	SetComboByName(ui->advOutTrack2Bitrate, QString::number(track2Bitrate));
+	SetComboByName(ui->advOutTrack3Bitrate, QString::number(track3Bitrate));
+	SetComboByName(ui->advOutTrack4Bitrate, QString::number(track4Bitrate));
+	SetComboByName(ui->advOutTrack5Bitrate, QString::number(track5Bitrate));
+	SetComboByName(ui->advOutTrack6Bitrate, QString::number(track6Bitrate));
 
 	ui->advOutTrack1Name->setText(name1);
 	ui->advOutTrack2Name->setText(name2);
@@ -2403,9 +2403,9 @@ void OBSBasicSettings::LoadAudioSources()
 		TruncateLabel(label, label->text());
 		label->setMinimumSize(QSize(170, 0));
 		label->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
-		connect(label, &OBSSourceLabel::Removed,
+		connect(label, &OBSSourceLabel::Removed, this,
 			[=]() { QMetaObject::invokeMethod(this, "ReloadAudioSources"); });
-		connect(label, &OBSSourceLabel::Destroyed,
+		connect(label, &OBSSourceLabel::Destroyed, this,
 			[=]() { QMetaObject::invokeMethod(this, "ReloadAudioSources"); });
 
 		layout->addRow(label, form);
@@ -2548,8 +2548,8 @@ void OBSBasicSettings::LoadAdvancedSettings()
 
 	LoadRendererList();
 
-	if (obs_audio_monitoring_available() && !SetComboByValue(ui->monitoringDevice, monDevId.toUtf8()))
-		SetInvalidValue(ui->monitoringDevice, monDevName.toUtf8(), monDevId.toUtf8());
+	if (obs_audio_monitoring_available() && !SetComboByValue(ui->monitoringDevice, monDevId))
+		SetInvalidValue(ui->monitoringDevice, monDevName, monDevId);
 
 	ui->confirmOnExit->setChecked(confirmOnExit);
 
@@ -2838,7 +2838,7 @@ void OBSBasicSettings::LoadHotkeySettings(obs_hotkey_id ignoreKey)
 			HotkeysChanged();
 			ScanDuplicateHotkeys(hotkeysLayout);
 		});
-		connect(hw, &OBSHotkeyWidget::SearchKey, [=](obs_key_combination_t combo) {
+		connect(hw, &OBSHotkeyWidget::SearchKey, this, [=](obs_key_combination_t combo) {
 			ui->hotkeyFilterSearch->setText("");
 			ui->hotkeyFilterInput->HandleNewKey(combo);
 			ui->hotkeyFilterInput->KeyChanged(combo);
@@ -4535,7 +4535,7 @@ void OBSBasicSettings::AdvOutRecCheckCodecs()
 	QString recFormatName = ui->advOutRecFormat->currentText();
 
 	/* Set tooltip if available */
-	QString tooltip = QTStr("Basic.Settings.Output.Format.TT." + recFormat.toUtf8());
+	QString tooltip = QTStr(QT_TO_UTF8(("Basic.Settings.Output.Format.TT." + recFormat)));
 
 	if (!tooltip.startsWith("Basic.Settings.Output"))
 		ui->advOutRecFormat->setToolTip(tooltip);
@@ -5198,7 +5198,7 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged()
 
 	QString format = ui->simpleOutRecFormat->currentData().toString();
 	/* Set tooltip if available */
-	QString tooltip = QTStr("Basic.Settings.Output.Format.TT." + format.toUtf8());
+	QString tooltip = QTStr(QT_TO_UTF8(("Basic.Settings.Output.Format.TT." + format)));
 
 	if (!tooltip.startsWith("Basic.Settings.Output"))
 		ui->simpleOutRecFormat->setToolTip(tooltip);

frontend/settings/OBSHotkeyEdit.cpp

@@ -207,7 +207,7 @@ void OBSHotkeyEdit::CreateDupeIcon()
 {
 	dupeIcon = addAction(settings->GetHotkeyConflictIcon(), ActionPosition::TrailingPosition);
 	dupeIcon->setToolTip(QTStr("Basic.Settings.Hotkeys.DuplicateWarning"));
-	QObject::connect(dupeIcon, &QAction::triggered, [=] { emit SearchKey(key); });
+	QObject::connect(dupeIcon, &QAction::triggered, this, [=] { emit SearchKey(key); });
 	dupeIcon->setVisible(false);
 }