Remove BaseSettings & merge ConcurrentSettings (#4775)

src/widgets/BaseWidget.cpp

@@ -1,6 +1,5 @@
 #include "widgets/BaseWidget.hpp"
 
-#include "BaseSettings.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/hotkeys/HotkeyController.hpp"
 #include "singletons/Theme.hpp"

src/widgets/BaseWindow.cpp

@@ -710,7 +710,7 @@ void BaseWindow::updateScale()
     auto scale =
         this->nativeScale_ * (this->flags_.has(DisableCustomScaling)
                                   ? 1
-                                  : getABSettings()->getClampedUiScale());
+                                  : getSettings()->getClampedUiScale());
 
     this->setScale(scale);
 

src/widgets/dialogs/SelectChannelFiltersDialog.cpp

@@ -49,7 +49,7 @@ SelectChannelFiltersDialog::SelectChannelFiltersDialog(
         (this->windowFlags() & ~(Qt::WindowContextHelpButtonHint)) |
         Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint);
 
-    auto availableFilters = getCSettings().filterRecords.readOnly();
+    auto availableFilters = getSettings()->filterRecords.readOnly();
 
     if (availableFilters->size() == 0)
     {