refactor(widget): remove Widget singleton access from GeneralForm

src/widget/form/settings/generalform.cpp

@@ -152,8 +152,7 @@ GeneralForm::GeneralForm(SettingsWidget* myParent)
 
 
 #ifndef QTOX_PLATFORM_EXT
-    bodyUI->autoAwayLabel->setEnabled(
-        false); // these don't seem to change the appearance of the widgets,
+    bodyUI->autoAwayLabel->setEnabled(false); // these don't seem to change the appearance of the widgets,
     bodyUI->autoAwaySpinBox->setEnabled(false); // though they are unusable
 #endif
 
@@ -203,7 +202,7 @@ void GeneralForm::on_closeToTray_stateChanged()
 void GeneralForm::on_lightTrayIcon_stateChanged()
 {
     Settings::getInstance().setLightTrayIcon(bodyUI->lightTrayIcon->isChecked());
-    Widget::getInstance()->updateIcons();
+    emit updateIcons();
 }
 
 void GeneralForm::on_minimizeToTray_stateChanged()

src/widget/form/settings/generalform.h

@@ -38,6 +38,8 @@ public:
     {
         return tr("General");
     }
+signals:
+    void updateIcons();
 
 private slots:
     void on_transComboBox_currentIndexChanged(int index);

src/widget/form/settingswidget.cpp

@@ -41,7 +41,7 @@
 
 #include <memory>
 
-SettingsWidget::SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, QWidget* parent)
+SettingsWidget::SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Widget* parent)
     : QWidget(parent, Qt::Window)
 {
     CoreAV* coreAV = Core::getInstance()->getAv();
@@ -58,6 +58,8 @@ SettingsWidget::SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Q
     bodyLayout->addWidget(settingsWidgets.get());
 
     std::unique_ptr<GeneralForm> gfrm(new GeneralForm(this));
+    connect(gfrm.get(), &GeneralForm::updateIcons, parent, &Widget::updateIcons);
+
     std::unique_ptr<UserInterfaceForm> uifrm(new UserInterfaceForm(this));
     std::unique_ptr<PrivacyForm> pfrm(new PrivacyForm());
     AVForm* rawAvfrm = new AVForm(audio, coreAV, camera, audioSettings, videoSettings);

src/widget/form/settingswidget.h

@@ -37,12 +37,13 @@ class QLabel;
 class QTabWidget;
 class ContentLayout;
 class UpdateCheck;
+class Widget;
 
 class SettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, QWidget* parent = nullptr);
+    SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Widget* parent = nullptr);
     ~SettingsWidget();
 
     bool isShown() const;