@@ -45,17 +45,20 @@ SettingsWidget::SettingsWidget(UpdateCheck& updateCheck, IAudioControl& audio, C
4545 settingsWidgets->setTabPosition (QTabWidget::North);
4646 bodyLayout->addWidget (settingsWidgets.get ());
4747
48- std::unique_ptr<GeneralForm> gfrm ( new GeneralForm (settings, style) );
48+ std::unique_ptr<GeneralForm> gfrm = std::make_unique< GeneralForm> (settings, style);
4949 connect (gfrm.get (), &GeneralForm::updateIcons, parent, &Widget::updateIcons);
5050
51- std::unique_ptr<UserInterfaceForm> uifrm (new UserInterfaceForm (smileyPack, settings, style, this ));
52- std::unique_ptr<PrivacyForm> pfrm (new PrivacyForm (core, settings, style, profile));
51+ std::unique_ptr<UserInterfaceForm> uifrm =
52+ std::make_unique<UserInterfaceForm>(smileyPack, settings, style, this );
53+ std::unique_ptr<PrivacyForm> pfrm = std::make_unique<PrivacyForm>(core, settings, style, profile);
5354 connect (pfrm.get (), &PrivacyForm::clearAllReceipts, parent, &Widget::clearAllReceipts);
5455
55- auto * rawAvfrm = new AVForm (audio, coreAV, cameraSource, audioSettings, videoSettings, style);
56- std::unique_ptr<AVForm> avfrm (rawAvfrm);
57- std::unique_ptr<AdvancedForm> expfrm (new AdvancedForm (settings, style, messageBoxManager));
58- std::unique_ptr<AboutForm> abtfrm (new AboutForm (updateCheck, core->getSelfId ().toString (), style));
56+ std::unique_ptr<AVForm> avfrm =
57+ std::make_unique<AVForm>(audio, coreAV, cameraSource, audioSettings, videoSettings, style);
58+ std::unique_ptr<AdvancedForm> expfrm =
59+ std::make_unique<AdvancedForm>(settings, style, messageBoxManager);
60+ std::unique_ptr<AboutForm> abtfrm =
61+ std::make_unique<AboutForm>(updateCheck, core->getSelfId ().toString (), style);
5962
6063 connect (&updateCheck, &UpdateCheck::updateAvailable, this , &SettingsWidget::onUpdateAvailable);
6164
0 commit comments