From d97d3a1871412e0be4538ba3d915654d61c4a997 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Tue, 28 Mar 2023 22:04:34 +0200 Subject: [PATCH] UI: Replace SIGNAL and SLOT macros in window-basic-main --- UI/window-basic-main.cpp | 201 +++++++++++++++----------------- UI/window-basic-main.hpp | 4 - UI/window-basic-status-bar.cpp | 4 +- UI/window-basic-status-bar.hpp | 4 +- UI/window-basic-vcam-config.cpp | 4 +- 5 files changed, 100 insertions(+), 117 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 9807cfd83..60706e68b 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -267,7 +267,7 @@ void setupDockAction(QDockWidget *dock) }; // Replace the slot connected by default - action->disconnect(SIGNAL(triggered(bool))); + QObject::disconnect(action, &QAction::triggered, nullptr, 0); dock->connect(action, &QAction::triggered, newToggleView); // Make the action unable to be disabled @@ -372,28 +372,29 @@ OBSBasic::OBSBasic(QWidget *parent) UpdateTitleBar(); - connect(ui->scenes->itemDelegate(), SIGNAL(closeEditor(QWidget *)), - this, SLOT(SceneNameEdited(QWidget *))); + connect(ui->scenes->itemDelegate(), &QAbstractItemDelegate::closeEditor, + this, &OBSBasic::SceneNameEdited); cpuUsageInfo = os_cpu_usage_info_start(); cpuUsageTimer = new QTimer(this); - connect(cpuUsageTimer.data(), SIGNAL(timeout()), ui->statusbar, - SLOT(UpdateCPUUsage())); + connect(cpuUsageTimer.data(), &QTimer::timeout, ui->statusbar, + &OBSBasicStatusBar::UpdateCPUUsage); cpuUsageTimer->start(3000); diskFullTimer = new QTimer(this); - connect(diskFullTimer, SIGNAL(timeout()), this, - SLOT(CheckDiskSpaceRemaining())); + connect(diskFullTimer, &QTimer::timeout, this, + &OBSBasic::CheckDiskSpaceRemaining); renameScene = new QAction(QTStr("Rename"), ui->scenesDock); renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut); - connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName())); + connect(renameScene, &QAction::triggered, this, + &OBSBasic::EditSceneName); ui->scenesDock->addAction(renameScene); renameSource = new QAction(QTStr("Rename"), ui->sourcesDock); renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut); - connect(renameSource, SIGNAL(triggered()), this, - SLOT(EditSceneItemName())); + connect(renameSource, &QAction::triggered, this, + &OBSBasic::EditSceneItemName); ui->sourcesDock->addAction(renameSource); #ifdef __APPLE__ @@ -498,11 +499,11 @@ OBSBasic::OBSBasic(QWidget *parent) statsDock->move(newPos); ui->previewDisabledWidget->setContextMenuPolicy(Qt::CustomContextMenu); - connect(ui->enablePreviewButton, SIGNAL(clicked()), this, - SLOT(TogglePreview())); + connect(ui->enablePreviewButton, &QPushButton::clicked, this, + &OBSBasic::TogglePreview); - connect(ui->scenes, SIGNAL(scenesReordered()), this, - SLOT(ScenesReordered())); + connect(ui->scenes, &SceneTree::scenesReordered, + []() { OBSProjector::UpdateMultiviewProjectors(); }); connect(ui->broadcastButton, &QPushButton::clicked, this, &OBSBasic::BroadcastButtonClicked); @@ -4988,7 +4989,7 @@ void OBSBasic::closeEvent(QCloseEvent *event) * could be inside of an Auth::LoadUI call. Keep trying once per * second until we've exit any known sub-loops. */ if (os_atomic_load_long(&insideEventLoop) != 0) { - QTimer::singleShot(1000, this, SLOT(close())); + QTimer::singleShot(1000, this, &OBSBasic::close); event->ignore(); return; } @@ -4996,7 +4997,7 @@ void OBSBasic::closeEvent(QCloseEvent *event) #ifdef YOUTUBE_ENABLED /* Also don't close the window if the youtube stream check is active */ if (youtubeStreamCheckThread) { - QTimer::singleShot(1000, this, SLOT(close())); + QTimer::singleShot(1000, this, &OBSBasic::close); event->ignore(); return; } @@ -5193,7 +5194,7 @@ void OBSBasic::on_action_Settings_triggered() * once per second until we've exit any known sub-loops. */ if (os_atomic_load_long(&insideEventLoop) != 0) { QTimer::singleShot(1000, this, - SLOT(on_action_Settings_triggered())); + &OBSBasic::on_action_Settings_triggered); return; } @@ -5400,23 +5401,23 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos) QMenu order(QTStr("Basic.MainMenu.Edit.Order"), this); popup.addAction(QTStr("Add"), this, - SLOT(on_actionAddScene_triggered())); + &OBSBasic::on_actionAddScene_triggered); if (item) { QAction *copyFilters = new QAction(QTStr("Copy.Filters"), this); copyFilters->setEnabled(false); - connect(copyFilters, SIGNAL(triggered()), this, - SLOT(SceneCopyFilters())); + connect(copyFilters, &QAction::triggered, this, + &OBSBasic::SceneCopyFilters); QAction *pasteFilters = new QAction(QTStr("Paste.Filters"), this); pasteFilters->setEnabled( !obs_weak_source_expired(copyFiltersSource)); - connect(pasteFilters, SIGNAL(triggered()), this, - SLOT(ScenePasteFilters())); + connect(pasteFilters, &QAction::triggered, this, + &OBSBasic::ScenePasteFilters); popup.addSeparator(); popup.addAction(QTStr("Duplicate"), this, - SLOT(DuplicateSelectedScene())); + &OBSBasic::DuplicateSelectedScene); popup.addAction(copyFilters); popup.addAction(pasteFilters); popup.addSeparator(); @@ -5425,14 +5426,14 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos) popup.addSeparator(); order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), this, - SLOT(on_actionSceneUp_triggered())); + &OBSBasic::on_actionSceneUp_triggered); order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveDown"), - this, SLOT(on_actionSceneDown_triggered())); + this, &OBSBasic::on_actionSceneDown_triggered); order.addSeparator(); order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveToTop"), - this, SLOT(MoveSceneToTop())); + this, &OBSBasic::MoveSceneToTop); order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveToBottom"), - this, SLOT(MoveSceneToBottom())); + this, &OBSBasic::MoveSceneToBottom); popup.addMenu(&order); popup.addSeparator(); @@ -5444,14 +5445,14 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos) popup.addMenu(sceneProjectorMenu); QAction *sceneWindow = popup.addAction( - QTStr("SceneWindow"), this, SLOT(OpenSceneWindow())); + QTStr("SceneWindow"), this, &OBSBasic::OpenSceneWindow); popup.addAction(sceneWindow); popup.addAction(QTStr("Screenshot.Scene"), this, - SLOT(ScreenshotScene())); + &OBSBasic::ScreenshotScene); popup.addSeparator(); popup.addAction(QTStr("Filters"), this, - SLOT(OpenSceneFilters())); + &OBSBasic::OpenSceneFilters); popup.addSeparator(); @@ -5494,8 +5495,8 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos) QAction *gridAction = new QAction(grid ? QTStr("Basic.Main.ListMode") : QTStr("Basic.Main.GridMode"), this); - connect(gridAction, SIGNAL(triggered()), this, - SLOT(GridActionClicked())); + connect(gridAction, &QAction::triggered, this, + &OBSBasic::GridActionClicked); popup.addAction(gridAction); popup.exec(QCursor::pos()); @@ -5666,11 +5667,11 @@ QMenu *OBSBasic::AddDeinterlacingMenu(QMenu *menu, obs_source_t *source) obs_source_get_deinterlace_field_order(source); QAction *action; -#define ADD_MODE(name, mode) \ - action = menu->addAction(QTStr("" name), this, \ - SLOT(SetDeinterlacingMode())); \ - action->setProperty("mode", (int)mode); \ - action->setCheckable(true); \ +#define ADD_MODE(name, mode) \ + action = menu->addAction(QTStr("" name), this, \ + &OBSBasic::SetDeinterlacingMode); \ + action->setProperty("mode", (int)mode); \ + action->setCheckable(true); \ action->setChecked(deinterlaceMode == mode); ADD_MODE("Disable", OBS_DEINTERLACE_MODE_DISABLE); @@ -5688,7 +5689,7 @@ QMenu *OBSBasic::AddDeinterlacingMenu(QMenu *menu, obs_source_t *source) #define ADD_ORDER(name, order) \ action = menu->addAction(QTStr("Deinterlacing." name), this, \ - SLOT(SetDeinterlacingOrder())); \ + &OBSBasic::SetDeinterlacingOrder); \ action->setProperty("order", (int)order); \ action->setCheckable(true); \ action->setChecked(deinterlaceOrder == order); @@ -5714,11 +5715,11 @@ QMenu *OBSBasic::AddScaleFilteringMenu(QMenu *menu, obs_sceneitem_t *item) obs_scale_type scaleFilter = obs_sceneitem_get_scale_filter(item); QAction *action; -#define ADD_MODE(name, mode) \ - action = \ - menu->addAction(QTStr("" name), this, SLOT(SetScaleFilter())); \ - action->setProperty("mode", (int)mode); \ - action->setCheckable(true); \ +#define ADD_MODE(name, mode) \ + action = menu->addAction(QTStr("" name), this, \ + &OBSBasic::SetScaleFilter); \ + action->setProperty("mode", (int)mode); \ + action->setCheckable(true); \ action->setChecked(scaleFilter == mode); ADD_MODE("Disable", OBS_SCALE_DISABLE); @@ -5748,11 +5749,11 @@ QMenu *OBSBasic::AddBlendingMethodMenu(QMenu *menu, obs_sceneitem_t *item) obs_sceneitem_get_blending_method(item); QAction *action; -#define ADD_MODE(name, method) \ - action = menu->addAction(QTStr("" name), this, \ - SLOT(SetBlendingMethod())); \ - action->setProperty("method", (int)method); \ - action->setCheckable(true); \ +#define ADD_MODE(name, method) \ + action = menu->addAction(QTStr("" name), this, \ + &OBSBasic::SetBlendingMethod); \ + action->setProperty("method", (int)method); \ + action->setCheckable(true); \ action->setChecked(blendingMethod == method); ADD_MODE("BlendingMethod.Default", OBS_BLEND_METHOD_DEFAULT); @@ -5777,11 +5778,11 @@ QMenu *OBSBasic::AddBlendingModeMenu(QMenu *menu, obs_sceneitem_t *item) obs_blending_type blendingMode = obs_sceneitem_get_blending_mode(item); QAction *action; -#define ADD_MODE(name, mode) \ - action = menu->addAction(QTStr("" name), this, \ - SLOT(SetBlendingMode())); \ - action->setProperty("mode", (int)mode); \ - action->setCheckable(true); \ +#define ADD_MODE(name, mode) \ + action = menu->addAction(QTStr("" name), this, \ + &OBSBasic::SetBlendingMode); \ + action->setProperty("mode", (int)mode); \ + action->setCheckable(true); \ action->setChecked(blendingMode == mode); ADD_MODE("BlendingMode.Normal", OBS_BLEND_NORMAL); @@ -5819,13 +5820,13 @@ QMenu *OBSBasic::AddBackgroundColorMenu(QMenu *menu, obs_data_set_default_int(privData, "color-preset", 0); int preset = obs_data_get_int(privData, "color-preset"); - action = menu->addAction(QTStr("Clear"), this, +SLOT(ColorChange())); + action = menu->addAction(QTStr("Clear"), this, &OBSBasic::ColorChange); action->setCheckable(true); action->setProperty("bgColor", 0); action->setChecked(preset == 0); action = menu->addAction(QTStr("CustomColor"), this, - +SLOT(ColorChange())); + &OBSBasic::ColorChange); action->setCheckable(true); action->setProperty("bgColor", 1); action->setChecked(preset == 1); @@ -5843,8 +5844,8 @@ QMenu *OBSBasic::AddBackgroundColorMenu(QMenu *menu, colorButton->setStyleSheet("border: 2px solid black"); colorButton->setProperty("bgColor", i); - select->connect(colorButton, SIGNAL(released()), this, - SLOT(ColorChange())); + select->connect(colorButton, &QPushButton::released, this, + &OBSBasic::ColorChange); } menu->addAction(widgetAction); @@ -5875,7 +5876,7 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) if (preview) { QAction *action = popup.addAction( QTStr("Basic.Main.PreviewConextMenu.Enable"), this, - SLOT(TogglePreview())); + &OBSBasic::TogglePreview); action->setCheckable(true); action->setChecked( obs_display_enabled(ui->preview->GetDisplay())); @@ -5893,12 +5894,12 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) QAction *previewWindow = popup.addAction(QTStr("PreviewWindow"), this, - SLOT(OpenPreviewWindow())); + &OBSBasic::OpenPreviewWindow); popup.addAction(previewWindow); popup.addAction(QTStr("Screenshot.Preview"), this, - SLOT(ScreenshotScene())); + &OBSBasic::ScreenshotScene); popup.addSeparator(); } @@ -5910,12 +5911,12 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) if (ui->sources->MultipleBaseSelected()) { popup.addSeparator(); popup.addAction(QTStr("Basic.Main.GroupItems"), ui->sources, - SLOT(GroupSelectedItems())); + &SourceTree::GroupSelectedItems); } else if (ui->sources->GroupsSelected()) { popup.addSeparator(); popup.addAction(QTStr("Basic.Main.Ungroup"), ui->sources, - SLOT(UngroupSelectedGroups())); + &SourceTree::UngroupSelectedGroups); } popup.addSeparator(); @@ -5960,7 +5961,7 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) if (hasAudio) { QAction *actionHideMixer = popup.addAction(QTStr("HideMixer"), this, - SLOT(ToggleHideMixer())); + &OBSBasic::ToggleHideMixer); actionHideMixer->setCheckable(true); actionHideMixer->setChecked(SourceMixerHidden(source)); popup.addSeparator(); @@ -5969,7 +5970,7 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) if (hasVideo) { QAction *resizeOutput = popup.addAction( QTStr("ResizeOutputSizeOfSource"), this, - SLOT(ResizeOutputSizeOfSource())); + &OBSBasic::ResizeOutputSizeOfSource); int width = obs_source_get_width(source); int height = obs_source_get_height(source); @@ -6006,22 +6007,23 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) SLOT(OpenSourceProjector())); popup.addMenu(sourceProjector); popup.addAction(QTStr("SourceWindow"), this, - SLOT(OpenSourceWindow())); + &OBSBasic::OpenSourceWindow); popup.addAction(QTStr("Screenshot.Source"), this, - SLOT(ScreenshotSelectedSource())); + &OBSBasic::ScreenshotSelectedSource); } popup.addSeparator(); if (flags & OBS_SOURCE_INTERACTION) popup.addAction(QTStr("Interact"), this, - SLOT(on_actionInteract_triggered())); + &OBSBasic::on_actionInteract_triggered); - popup.addAction(QTStr("Filters"), this, SLOT(OpenFilters())); + popup.addAction(QTStr("Filters"), this, + [&]() { OpenFilters(); }); QAction *action = popup.addAction( QTStr("Properties"), this, - SLOT(on_actionSourceProperties_triggered())); + &OBSBasic::on_actionSourceProperties_triggered); action->setEnabled(obs_source_configurable(source)); } @@ -6105,9 +6107,8 @@ QMenu *OBSBasic::CreateAddSourcePopupMenu() const char *name) { QString qname = QT_UTF8(name); QAction *popupItem = new QAction(qname, this); - popupItem->setData(QT_UTF8(type)); - connect(popupItem, SIGNAL(triggered(bool)), this, - SLOT(AddSourceFromAction())); + connect(popupItem, &QAction::triggered, + [this, type]() { AddSource(type); }); QIcon icon; @@ -6142,10 +6143,9 @@ QMenu *OBSBasic::CreateAddSourcePopupMenu() popup->addSeparator(); QAction *addGroup = new QAction(QTStr("Group"), this); - addGroup->setData(QT_UTF8("group")); addGroup->setIcon(GetGroupIcon()); - connect(addGroup, SIGNAL(triggered(bool)), this, - SLOT(AddSourceFromAction())); + connect(addGroup, &QAction::triggered, + [this]() { AddSource("group"); }); popup->addAction(addGroup); if (!foundDeprecated) { @@ -6165,15 +6165,6 @@ QMenu *OBSBasic::CreateAddSourcePopupMenu() return popup; } -void OBSBasic::AddSourceFromAction() -{ - QAction *action = qobject_cast(sender()); - if (!action) - return; - - AddSource(QT_TO_UTF8(action->data().toString())); -} - void OBSBasic::AddSourcePopupMenu(const QPoint &pos) { if (!GetCurrentScene()) { @@ -7275,9 +7266,9 @@ void OBSBasic::StreamDelayStarting(int sec) startStreamMenu = new QMenu(); startStreamMenu->addAction(QTStr("Basic.Main.StopStreaming"), this, - SLOT(StopStreaming())); + &OBSBasic::StopStreaming); startStreamMenu->addAction(QTStr("Basic.Main.ForceStopStreaming"), this, - SLOT(ForceStopStreaming())); + &OBSBasic::ForceStopStreaming); ui->streamButton->setMenu(startStreamMenu); ui->statusbar->StreamDelayStarting(sec); @@ -7301,9 +7292,9 @@ void OBSBasic::StreamDelayStopping(int sec) startStreamMenu = new QMenu(); startStreamMenu->addAction(QTStr("Basic.Main.StartStreaming"), this, - SLOT(StartStreaming())); + &OBSBasic::StartStreaming); startStreamMenu->addAction(QTStr("Basic.Main.ForceStopStreaming"), this, - SLOT(ForceStopStreaming())); + &OBSBasic::ForceStopStreaming); ui->streamButton->setMenu(startStreamMenu); ui->statusbar->StreamDelayStopping(sec); @@ -8251,12 +8242,12 @@ void OBSBasic::ProgramViewContextMenuRequested() QAction *studioProgramWindow = popup.addAction(QTStr("StudioProgramWindow"), this, - SLOT(OpenStudioProgramWindow())); + &OBSBasic::OpenStudioProgramWindow); popup.addAction(studioProgramWindow); popup.addAction(QTStr("Screenshot.StudioProgram"), this, - SLOT(ScreenshotProgram())); + &OBSBasic::ScreenshotProgram); popup.exec(QCursor::pos()); } @@ -8268,7 +8259,7 @@ void OBSBasic::on_previewDisabledWidget_customContextMenuRequested() QAction *action = popup.addAction(QTStr("Basic.Main.PreviewConextMenu.Enable"), - this, SLOT(TogglePreview())); + this, &OBSBasic::TogglePreview); action->setCheckable(true); action->setChecked(obs_display_enabled(ui->preview->GetDisplay())); @@ -8277,7 +8268,7 @@ void OBSBasic::on_previewDisabledWidget_customContextMenuRequested() SLOT(OpenPreviewProjector())); QAction *previewWindow = popup.addAction(QTStr("PreviewWindow"), this, - SLOT(OpenPreviewWindow())); + &OBSBasic::OpenPreviewWindow); popup.addMenu(previewProjectorMain); popup.addAction(previewWindow); @@ -9586,7 +9577,7 @@ void OBSBasic::SetShowing(bool showing) if (showHide) showHide->setText(QTStr("Basic.SystemTray.Show")); - QTimer::singleShot(0, this, SLOT(hide())); + QTimer::singleShot(0, this, &OBSBasic::hide); if (previewEnabled) EnablePreviewDisplay(false); @@ -9598,7 +9589,7 @@ void OBSBasic::SetShowing(bool showing) } else if (showing && !isVisible()) { if (showHide) showHide->setText(QTStr("Basic.SystemTray.Hide")); - QTimer::singleShot(0, this, SLOT(show())); + QTimer::singleShot(0, this, &OBSBasic::show); if (previewEnabled) EnablePreviewDisplay(true); @@ -9703,19 +9694,18 @@ void OBSBasic::SystemTrayInit() if (Active()) OnActivate(true); - connect(trayIcon.data(), - SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, - SLOT(IconActivated(QSystemTrayIcon::ActivationReason))); - connect(showHide, SIGNAL(triggered()), this, SLOT(ToggleShowHide())); - connect(sysTrayStream, SIGNAL(triggered()), this, - SLOT(on_streamButton_clicked())); - connect(sysTrayRecord, SIGNAL(triggered()), this, - SLOT(on_recordButton_clicked())); + connect(trayIcon.data(), &QSystemTrayIcon::activated, this, + &OBSBasic::IconActivated); + connect(showHide, &QAction::triggered, this, &OBSBasic::ToggleShowHide); + connect(sysTrayStream, &QAction::triggered, this, + &OBSBasic::on_streamButton_clicked); + connect(sysTrayRecord, &QAction::triggered, this, + &OBSBasic::on_recordButton_clicked); connect(sysTrayReplayBuffer.data(), &QAction::triggered, this, &OBSBasic::ReplayBufferClicked); connect(sysTrayVirtualCam.data(), &QAction::triggered, this, &OBSBasic::VCamButtonClicked); - connect(exit, SIGNAL(triggered()), this, SLOT(close())); + connect(exit, &QAction::triggered, this, &OBSBasic::close); } void OBSBasic::IconActivated(QSystemTrayIcon::ActivationReason reason) @@ -10721,11 +10711,6 @@ void OBSBasic::CheckDiskSpaceRemaining() } } -void OBSBasic::ScenesReordered() -{ - OBSProjector::UpdateMultiviewProjectors(); -} - void OBSBasic::ResetStatsHotkey() { QList list = findChildren(); diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 3ba3ba423..8158b0288 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -810,8 +810,6 @@ private slots: void CheckDiskSpaceRemaining(); void OpenSavedProjector(SavedProjectorInfo *info); - void ScenesReordered(); - void ResetStatsHotkey(); void SetImageIcon(const QIcon &icon); @@ -1171,8 +1169,6 @@ private slots: void updateCheckFinished(); - void AddSourceFromAction(); - void MoveSceneToTop(); void MoveSceneToBottom(); diff --git a/UI/window-basic-status-bar.cpp b/UI/window-basic-status-bar.cpp index fa16fd1b0..97f5c794c 100644 --- a/UI/window-basic-status-bar.cpp +++ b/UI/window-basic-status-bar.cpp @@ -67,8 +67,8 @@ void OBSBasicStatusBar::Activate() { if (!active) { refreshTimer = new QTimer(this); - connect(refreshTimer, SIGNAL(timeout()), this, - SLOT(UpdateStatusBar())); + connect(refreshTimer, &QTimer::timeout, this, + &OBSBasicStatusBar::UpdateStatusBar); int skipped = video_output_get_skipped_frames(obs_get_video()); int total = video_output_get_total_frames(obs_get_video()); diff --git a/UI/window-basic-status-bar.hpp b/UI/window-basic-status-bar.hpp index a37e3313c..fd1f1c294 100644 --- a/UI/window-basic-status-bar.hpp +++ b/UI/window-basic-status-bar.hpp @@ -87,11 +87,13 @@ private: static void OBSOutputReconnect(void *data, calldata_t *params); static void OBSOutputReconnectSuccess(void *data, calldata_t *params); +public slots: + void UpdateCPUUsage(); + private slots: void Reconnect(int seconds); void ReconnectSuccess(); void UpdateStatusBar(); - void UpdateCPUUsage(); void UpdateCurrentFPS(); void UpdateIcons(); diff --git a/UI/window-basic-vcam-config.cpp b/UI/window-basic-vcam-config.cpp index 5fae29fae..9cb5d15eb 100644 --- a/UI/window-basic-vcam-config.cpp +++ b/UI/window-basic-vcam-config.cpp @@ -31,8 +31,8 @@ OBSBasicVCamConfig::OBSBasicVCamConfig(const VCamConfig &_config, ui->outputType->setCurrentIndex( ui->outputType->findData((int)config.type)); OutputTypeChanged(); - connect(ui->outputType, SIGNAL(currentIndexChanged(int)), this, - SLOT(OutputTypeChanged())); + connect(ui->outputType, &QComboBox::currentIndexChanged, this, + &OBSBasicVCamConfig::OutputTypeChanged); connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &OBSBasicVCamConfig::UpdateConfig);