Convert remaining settings to the new settings system

src/widgets/accountpopup.cpp

@@ -95,18 +95,18 @@ AccountPopupWidget::AccountPopupWidget(std::shared_ptr<Channel> _channel)
     });
 
     QObject::connect(this->ui->disableHighlights, &QPushButton::clicked, this, [=, &settings]() {
-        QString str = settings.highlightUserBlacklist.getnonConst();
+        QString str = settings.highlightUserBlacklist;
         str.append(this->ui->lblUsername->text() + "\n");
-        settings.highlightUserBlacklist.set(str);
+        settings.highlightUserBlacklist = str;
         this->ui->disableHighlights->hide();
         this->ui->enableHighlights->show();
     });
 
     QObject::connect(this->ui->enableHighlights, &QPushButton::clicked, this, [=, &settings]() {
-        QString str = settings.highlightUserBlacklist.getnonConst();
+        QString str = settings.highlightUserBlacklist;
         QStringList list = str.split("\n");
         list.removeAll(this->ui->lblUsername->text());
-        settings.highlightUserBlacklist.set(list.join("\n"));
+        settings.highlightUserBlacklist = list.join("\n");
         this->ui->enableHighlights->hide();
         this->ui->disableHighlights->show();
     });
@@ -267,8 +267,7 @@ void AccountPopupWidget::showEvent(QShowEvent *)
         this->updateButtons(this->ui->ownerLayout, false);
     }
 
-    QString blacklisted =
-        singletons::SettingManager::getInstance().highlightUserBlacklist.getnonConst();
+    QString blacklisted = singletons::SettingManager::getInstance().highlightUserBlacklist;
     QStringList list = blacklisted.split("\n", QString::SkipEmptyParts);
     if (list.contains(this->ui->lblUsername->text(), Qt::CaseInsensitive)) {
         this->ui->disableHighlights->hide();

src/widgets/accountpopup.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "basewidget.hpp"
-#include "util/concurrentmap.hpp"
 #include "twitch/twitchchannel.hpp"
+#include "util/concurrentmap.hpp"
 
 #include <QPushButton>
 #include <QWidget>

src/widgets/settingsdialog.cpp

@@ -422,7 +422,7 @@ QVBoxLayout *SettingsDialog::createHighlightingTab()
     for (const auto &highlightProperty : highlightProperties) {
         highlights->addItem(highlightProperty.key);
     }
-    highlightUserBlacklist->setText(settings.highlightUserBlacklist.getnonConst());
+    highlightUserBlacklist->setText(settings.highlightUserBlacklist);
     auto highlightTab = new QTabWidget();
     auto customSound = new QHBoxLayout();
     auto soundForm = new QFormLayout();
@@ -439,7 +439,7 @@ QVBoxLayout *SettingsDialog::createHighlightingTab()
         QObject::connect(selectBtn, &QPushButton::clicked, this, [&settings, this] {
             auto fileName = QFileDialog::getOpenFileName(this, tr("Open Sound"), "",
                                                          tr("Audio Files (*.mp3 *.wav)"));
-            settings.pathHighlightSound.set(fileName);
+            settings.pathHighlightSound = fileName;
         });
         customSound->addWidget(selectBtn);
     }
@@ -617,11 +617,12 @@ QVBoxLayout *SettingsDialog::createHighlightingTab()
         QStringList list =
             highlightUserBlacklist->toPlainText().split("\n", QString::SkipEmptyParts);
         list.removeDuplicates();
-        settings.highlightUserBlacklist.set(list.join("\n") + "\n");
+        settings.highlightUserBlacklist = list.join("\n") + "\n";
     });
 
-    settings.highlightUserBlacklist.valueChanged.connect(
-        [=](const QString &str) { highlightUserBlacklist->setPlainText(str); });
+    settings.highlightUserBlacklist.connect([=](const QString &str, auto) {
+        highlightUserBlacklist->setPlainText(str);  //
+    });
 
     return layout;
 }
@@ -739,20 +740,6 @@ QVBoxLayout *SettingsDialog::createTabLayout()
     return layout;
 }
 
-QCheckBox *SettingsDialog::createCheckbox(const QString &title, Setting<bool> &setting)
-{
-    auto checkbox = new QCheckBox(title);
-
-    // Set checkbox initial state
-    checkbox->setChecked(setting.get());
-
-    QObject::connect(checkbox, &QCheckBox::toggled, this, [&setting](bool state) {
-        setting.set(state);  //
-    });
-
-    return checkbox;
-}
-
 QCheckBox *SettingsDialog::createCheckbox(const QString &title,
                                           pajlada::Settings::Setting<bool> &setting)
 {

src/widgets/settingsdialog.hpp

@@ -88,7 +88,6 @@ private:
 
     /// Widget creation helpers
     QVBoxLayout *createTabLayout();
-    QCheckBox *createCheckbox(const QString &title, Setting<bool> &setting);
     QCheckBox *createCheckbox(const QString &title, pajlada::Settings::Setting<bool> &setting);
     QHBoxLayout *createCombobox(const QString &title, pajlada::Settings::Setting<int> &setting,
                                 QStringList items,