Disable automatic conversions from 8-bit strings

src/settings/appearancesettingspage.cpp

@@ -44,6 +44,7 @@
 #include "utilities/colorutils.h"
 #include "core/iconloader.h"
 #include "core/stylehelper.h"
+#include "core/settings.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "settingspage.h"
 #include "settingsdialog.h"
@@ -89,7 +90,7 @@ AppearanceSettingsPage::AppearanceSettingsPage(SettingsDialog *dialog, QWidget *
   ui_->setupUi(this);
   setWindowIcon(IconLoader::Load(QStringLiteral("view-media-visualization"), true, 0, 32));
 
-  ui_->combobox_style->addItem(QStringLiteral("default"), "default");
+  ui_->combobox_style->addItem(QStringLiteral("default"), QStringLiteral("default"));
   for (const QString &style : QStyleFactory::keys()) {
     ui_->combobox_style->addItem(style, style);
   }
@@ -139,10 +140,10 @@ AppearanceSettingsPage::~AppearanceSettingsPage() {
 
 void AppearanceSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
-  ComboBoxLoadFromSettings(s, ui_->combobox_style, kStyle, QStringLiteral("default"));
+  ComboBoxLoadFromSettings(s, ui_->combobox_style, QLatin1String(kStyle), QStringLiteral("default"));
 
 #if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
   ui_->checkbox_system_icons->setChecked(s.value(kSystemThemeIcons, false).toBool());
@@ -215,13 +216,13 @@ void AppearanceSettingsPage::Load() {
 
   Init(ui_->layout_appearancesettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void AppearanceSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   s.setValue("style", ui_->combobox_style->currentText());
@@ -297,7 +298,7 @@ void AppearanceSettingsPage::UpdateColorSelectorColor(QWidget *color_selector, c
 
 void AppearanceSettingsPage::SelectBackgroundImage() {
 
-  QString selected_filename = QFileDialog::getOpenFileName(this, tr("Select background image"), background_image_filename_, tr(AlbumCoverChoiceController::kLoadImageFileFilter) + ";;" + tr(AlbumCoverChoiceController::kAllFilesFilter));
+  QString selected_filename = QFileDialog::getOpenFileName(this, tr("Select background image"), background_image_filename_, tr(AlbumCoverChoiceController::kLoadImageFileFilter) + QStringLiteral(";;") + tr(AlbumCoverChoiceController::kAllFilesFilter));
   if (selected_filename.isEmpty()) return;
   background_image_filename_ = selected_filename;
   ui_->background_image_filename->setText(background_image_filename_);

src/settings/backendsettingspage.cpp

@@ -43,6 +43,7 @@
 #include "core/iconloader.h"
 #include "core/player.h"
 #include "core/logging.h"
+#include "core/settings.h"
 #include "engine/enginebase.h"
 #include "engine/enginedevice.h"
 #include "engine/devicefinders.h"
@@ -55,12 +56,15 @@
 #include "ui_backendsettingspage.h"
 
 const char *BackendSettingsPage::kSettingsGroup = "Backend";
-const char *BackendSettingsPage::kOutputAutomaticallySelect = "Automatically select";
-const char *BackendSettingsPage::kOutputCustom = "Custom";
 const qint64 BackendSettingsPage::kDefaultBufferDuration = 4000;
 const double BackendSettingsPage::kDefaultBufferLowWatermark = 0.33;
 const double BackendSettingsPage::kDefaultBufferHighWatermark = 0.99;
 
+namespace {
+constexpr char kOutputAutomaticallySelect[] = "Automatically select";
+constexpr char kOutputCustom[] = "Custom";
+}  // namespace
+
 BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog, QWidget *parent)
     : SettingsPage(dialog, parent),
       ui_(new Ui_BackendSettingsPage),
@@ -115,7 +119,7 @@ void BackendSettingsPage::Load() {
   configloaded_ = false;
   engineloaded_ = false;
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   EngineBase::Type enginetype = EngineBase::TypeFromName(s.value("engine", EngineBase::Name(EngineBase::Type::None)).toString());
@@ -226,7 +230,7 @@ void BackendSettingsPage::Load() {
 #endif
 
   Init(ui_->layout_backendsettingspage->parentWidget());
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
   // Check if engine, output or device is set to a different setting than the configured to force saving settings.
 
@@ -241,7 +245,7 @@ void BackendSettingsPage::Load() {
   }
   QVariant device_value;
   if (ui_->combobox_device->currentText().isEmpty()) device_value = QVariant();
-  else if (ui_->combobox_device->currentText() == kOutputCustom) device_value = ui_->lineedit_device->text();
+  else if (ui_->combobox_device->currentText() == QLatin1String(kOutputCustom)) device_value = ui_->lineedit_device->text();
   else device_value = ui_->combobox_device->itemData(ui_->combobox_device->currentIndex()).value<QVariant>();
 
   if (enginetype_current_ != enginetype || output_name != output_current_ || device_value != device_current_) {
@@ -364,7 +368,7 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
 #ifdef Q_OS_WIN
   if (engine()->type() != EngineBase::Type::GStreamer)
 #endif
-    ui_->combobox_device->addItem(IconLoader::Load(QStringLiteral("soundcard")), kOutputAutomaticallySelect, QVariant());
+    ui_->combobox_device->addItem(IconLoader::Load(QStringLiteral("soundcard")), QLatin1String(kOutputAutomaticallySelect), QVariant());
 
   for (DeviceFinder *f : dialog()->app()->device_finders()->ListFinders()) {
     if (!f->outputs().contains(output)) continue;
@@ -376,7 +380,7 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
   }
 
   if (engine()->CustomDeviceSupport(output)) {
-    ui_->combobox_device->addItem(IconLoader::Load(QStringLiteral("soundcard")), kOutputCustom, QVariant());
+    ui_->combobox_device->addItem(IconLoader::Load(QStringLiteral("soundcard")), QLatin1String(kOutputCustom), QVariant());
     ui_->lineedit_device->setEnabled(true);
   }
   else {
@@ -446,8 +450,8 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
     ui_->lineedit_device->setText(device.toString());
     if (!found) {
       for (int i = 0; i < ui_->combobox_device->count(); ++i) {
-        if (ui_->combobox_device->itemText(i) == kOutputCustom) {
-          if (ui_->combobox_device->currentText() != kOutputCustom) ui_->combobox_device->setCurrentIndex(i);
+        if (ui_->combobox_device->itemText(i) == QLatin1String(kOutputCustom)) {
+          if (ui_->combobox_device->currentText() != QLatin1String(kOutputCustom)) ui_->combobox_device->setCurrentIndex(i);
           break;
         }
       }
@@ -478,10 +482,10 @@ void BackendSettingsPage::Save() {
   }
 
   if (ui_->combobox_device->currentText().isEmpty()) device_value = QVariant();
-  else if (ui_->combobox_device->currentText() == kOutputCustom) device_value = ui_->lineedit_device->text();
+  else if (ui_->combobox_device->currentText() == QLatin1String(kOutputCustom)) device_value = ui_->lineedit_device->text();
   else device_value = ui_->combobox_device->itemData(ui_->combobox_device->currentIndex()).value<QVariant>();
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   s.setValue("engine", EngineBase::Name(enginetype));
@@ -586,7 +590,7 @@ void BackendSettingsPage::DeviceSelectionChanged(int index) {
 
   if (engine()->CustomDeviceSupport(output.name)) {
     ui_->lineedit_device->setEnabled(true);
-    if (ui_->combobox_device->currentText() != kOutputCustom) {
+    if (ui_->combobox_device->currentText() != QLatin1String(kOutputCustom)) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
       if (device.metaType().id() == QMetaType::QString)
 #else
@@ -638,7 +642,7 @@ void BackendSettingsPage::DeviceStringChanged() {
 #endif
     QString device_str = device.toString();
     if (device_str.isEmpty()) continue;
-    if (ui_->combobox_device->itemText(i) == kOutputCustom) continue;
+    if (ui_->combobox_device->itemText(i) == QLatin1String(kOutputCustom)) continue;
     if (device_str == ui_->lineedit_device->text()) {
       if (ui_->combobox_device->currentIndex() != i) ui_->combobox_device->setCurrentIndex(i);
       found = true;
@@ -647,15 +651,15 @@ void BackendSettingsPage::DeviceStringChanged() {
 
   if (engine()->CustomDeviceSupport(output.name)) {
     ui_->lineedit_device->setEnabled(true);
-    if ((!found) && (ui_->combobox_device->currentText() != kOutputCustom)) {
+    if ((!found) && (ui_->combobox_device->currentText() != QLatin1String(kOutputCustom))) {
       for (int i = 0; i < ui_->combobox_device->count(); ++i) {
-        if (ui_->combobox_device->itemText(i) == kOutputCustom) {
+        if (ui_->combobox_device->itemText(i) == QLatin1String(kOutputCustom)) {
           ui_->combobox_device->setCurrentIndex(i);
           break;
         }
       }
     }
-    if (ui_->combobox_device->currentText() == kOutputCustom) {
+    if (ui_->combobox_device->currentText() == QLatin1String(kOutputCustom)) {
       if ((ui_->lineedit_device->text().isEmpty()) && (ui_->combobox_device->count() > 0) && (ui_->combobox_device->currentIndex() != 0)) ui_->combobox_device->setCurrentIndex(0);
     }
   }
@@ -806,7 +810,7 @@ void BackendSettingsPage::SelectDevice(const QString &device_new) {
 
   if (device_new.isEmpty()) {
     for (int i = 0; i < ui_->combobox_device->count(); ++i) {
-      if (ui_->combobox_device->itemText(i) == kOutputAutomaticallySelect && ui_->combobox_device->currentIndex() != i) {
+      if (ui_->combobox_device->itemText(i) == QLatin1String(kOutputAutomaticallySelect) && ui_->combobox_device->currentIndex() != i) {
         ui_->combobox_device->setCurrentIndex(i);
         break;
       }
@@ -833,7 +837,7 @@ void BackendSettingsPage::SelectDevice(const QString &device_new) {
     if (!found) {
       ui_->lineedit_device->setText(device_new);
       for (int i = 0; i < ui_->combobox_device->count(); ++i) {
-        if (ui_->combobox_device->itemText(i) == kOutputCustom && ui_->combobox_device->currentIndex() != i) {
+        if (ui_->combobox_device->itemText(i) == QLatin1String(kOutputCustom) && ui_->combobox_device->currentIndex() != i) {
           ui_->combobox_device->setCurrentIndex(i);
           break;
         }

src/settings/backendsettingspage.h

@@ -91,9 +91,6 @@ class BackendSettingsPage : public SettingsPage {
   void SelectDevice(const QString &device_new);
 
  private:
-  static const char *kOutputAutomaticallySelect;
-  static const char *kOutputCustom;
-
   Ui_BackendSettingsPage *ui_;
   bool configloaded_;
   bool engineloaded_;

src/settings/behavioursettingspage.cpp

@@ -40,6 +40,7 @@
 
 #include "core/iconloader.h"
 #include "core/mainwindow.h"
+#include "core/settings.h"
 #include "settings/settingspage.h"
 #include "behavioursettingspage.h"
 #include "ui_behavioursettingspage.h"
@@ -77,13 +78,13 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *pa
 
 #ifdef HAVE_TRANSLATIONS
   // Populate the language combo box.  We do this by looking at all the compiled in translations.
-  QDir dir1(":/translations/");
-  QDir dir2(TRANSLATIONS_DIR);
-  QStringList codes(dir1.entryList(QStringList() << "*.qm"));
+  QDir dir1(QStringLiteral(":/translations/"));
+  QDir dir2(QStringLiteral(TRANSLATIONS_DIR));
+  QStringList codes(dir1.entryList(QStringList() << QStringLiteral("*.qm")));
   if (dir2.exists()) {
-    codes << dir2.entryList(QStringList() << "*.qm");
+    codes << dir2.entryList(QStringList() << QStringLiteral("*.qm"));
   }
-  QRegularExpression lang_re("^strawberry_(.*).qm$");
+  QRegularExpression lang_re(QStringLiteral("^strawberry_(.*).qm$"));
   for (const QString &filename : codes) {
 
     QRegularExpressionMatch re_match = lang_re.match(filename);
@@ -93,21 +94,21 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *pa
 
     QString code = re_match.captured(1);
     QString lookup_code = QString(code)
-                              .replace("@latin", "_Latn")
-                              .replace("_CN", "_Hans_CN")
-                              .replace("_TW", "_Hant_TW");
+                              .replace(QStringLiteral("@latin"), QStringLiteral("_Latn"))
+                              .replace(QStringLiteral("_CN"), QStringLiteral("_Hans_CN"))
+                              .replace(QStringLiteral("_TW"), QStringLiteral("_Hant_TW"));
 
     QString language_name = QLocale::languageToString(QLocale(lookup_code).language());
     QString native_name = QLocale(lookup_code).nativeLanguageName();
     if (!native_name.isEmpty()) {
       language_name = native_name;
     }
-    QString name = QString("%1 (%2)").arg(language_name, code);
+    QString name = QStringLiteral("%1 (%2)").arg(language_name, code);
 
     language_map_[name] = code;
   }
 
-  language_map_["English (en)"] = "en";
+  language_map_[QStringLiteral("English (en)")] = QStringLiteral("en");
 
   // Sort the names and show them in the UI
   QStringList names = language_map_.keys();
@@ -145,7 +146,7 @@ BehaviourSettingsPage::~BehaviourSettingsPage() {
 
 void BehaviourSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
 #ifdef Q_OS_MACOS
@@ -217,13 +218,13 @@ void BehaviourSettingsPage::Load() {
 
   Init(ui_->layout_behavioursettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void BehaviourSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   s.setValue("showtrayicon", ui_->checkbox_showtrayicon->isChecked());

src/settings/collectionsettingspage.cpp

@@ -43,6 +43,7 @@
 
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "utilities/strutils.h"
 #include "utilities/timeutils.h"
 #include "collection/collection.h"
@@ -112,7 +113,7 @@ CollectionSettingsPage::~CollectionSettingsPage() { delete ui_; }
 
 void CollectionSettingsPage::Add() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   QString path(s.value("last_path", QStandardPaths::writableLocation(QStandardPaths::MusicLocation)).toString());
@@ -173,7 +174,7 @@ void CollectionSettingsPage::Load() {
     QObject::connect(ui_->list->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &CollectionSettingsPage::CurrentRowChanged);
   }
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(kSettingsGroup);
   ui_->auto_open->setChecked(s.value("auto_open", true).toBool());
@@ -215,13 +216,13 @@ void CollectionSettingsPage::Load() {
   ui_->disk_cache_in_use->setText((dialog()->app()->collection_model()->icon_cache_disk_size() == 0 ? QStringLiteral("empty") : Utilities::PrettySize(dialog()->app()->collection_model()->icon_cache_disk_size())));
 
   Init(ui_->layout_collectionsettingspage->parentWidget());
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void CollectionSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(kSettingsGroup);
   s.setValue("auto_open", ui_->auto_open->isChecked());
@@ -238,9 +239,9 @@ void CollectionSettingsPage::Save() {
   QString filter_text = ui_->cover_art_patterns->text();
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-  QStringList filters = filter_text.split(',', Qt::SkipEmptyParts);
+  QStringList filters = filter_text.split(QLatin1Char(','), Qt::SkipEmptyParts);
 #else
-  QStringList filters = filter_text.split(',', QString::SkipEmptyParts);
+  QStringList filters = filter_text.split(QLatin1Char(','), QString::SkipEmptyParts);
 #endif
 
   s.setValue("cover_art_patterns", filters);

src/settings/contextsettingspage.cpp

@@ -38,6 +38,7 @@
 
 #include "core/iconloader.h"
 #include "core/mainwindow.h"
+#include "core/settings.h"
 #include "settingspage.h"
 #include "settingsdialog.h"
 #include "contextsettingspage.h"
@@ -113,7 +114,7 @@ ContextSettingsPage::ContextSettingsPage(SettingsDialog *dialog, QWidget *parent
 
   QFile file(QStringLiteral(":/text/ghosts.txt"));
   if (file.open(QIODevice::ReadOnly)) {
-    QString text = file.readAll();
+    QString text = QString::fromUtf8(file.readAll());
     ui_->preview_headline->setText(text);
     ui_->preview_normal->setText(text);
     file.close();
@@ -128,11 +129,11 @@ ContextSettingsPage::~ContextSettingsPage() { delete ui_; }
 
 void ContextSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
-  ui_->context_custom_text1->setText(s.value(kSettingsTitleFmt, "%title% - %artist%").toString());
-  ui_->context_custom_text2->setText(s.value(kSettingsSummaryFmt, "%album%").toString());
+  ui_->context_custom_text1->setText(s.value(kSettingsTitleFmt, QStringLiteral("%title% - %artist%")).toString());
+  ui_->context_custom_text2->setText(s.value(kSettingsSummaryFmt, QStringLiteral("%album%")).toString());
 
   for (int i = 0; i < static_cast<int>(ContextSettingsOrder::NELEMS); ++i) {
     checkboxes_[i]->setChecked(s.value(kSettingsGroupEnable[i], checkboxes_[i]->isChecked()).toBool());
@@ -140,9 +141,9 @@ void ContextSettingsPage::Load() {
 
   // Fonts
   QString default_font;
-  int i = ui_->font_headline->findText(kDefaultFontFamily);
+  int i = ui_->font_headline->findText(QLatin1String(kDefaultFontFamily));
   if (i >= 0) {
-    default_font = kDefaultFontFamily;
+    default_font = QLatin1String(kDefaultFontFamily);
   }
   else {
     default_font = font().family();
@@ -160,13 +161,13 @@ void ContextSettingsPage::Load() {
 
   Init(ui_->layout_contextsettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void ContextSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(kSettingsGroup);
   s.setValue(kSettingsTitleFmt, ui_->context_custom_text1->text());

src/settings/coverssettingspage.cpp

@@ -39,6 +39,7 @@
 #include "ui_coverssettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "utilities/coveroptions.h"
 #include "covermanager/coverproviders.h"
 #include "covermanager/coverprovider.h"
@@ -107,7 +108,7 @@ void CoversSettingsPage::Load() {
     item->setForeground(provider->is_enabled() ? palette().color(QPalette::Active, QPalette::Text) : palette().color(QPalette::Disabled, QPalette::Text));
   }
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   const QStringList all_types = QStringList() << QStringLiteral("art_unset")
@@ -160,13 +161,13 @@ void CoversSettingsPage::Load() {
 
   Init(ui_->layout_coverssettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void CoversSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   QStringList providers;
@@ -220,11 +221,11 @@ void CoversSettingsPage::ProvidersCurrentItemChanged(QListWidgetItem *item_curre
     CoverProvider *provider = dialog()->app()->cover_providers()->ProviderByName(item_current->text());
     if (provider) {
       if (provider->AuthenticationRequired()) {
-        if (provider->name() == "Tidal" && !provider->IsAuthenticated()) {
+        if (provider->name() == QStringLiteral("Tidal") && !provider->IsAuthenticated()) {
           DisableAuthentication();
           ui_->label_auth_info->setText(tr("Use Tidal settings to authenticate."));
         }
-        else if (provider->name() == "Qobuz" && !provider->IsAuthenticated()) {
+        else if (provider->name() == QStringLiteral("Qobuz") && !provider->IsAuthenticated()) {
           DisableAuthentication();
           ui_->label_auth_info->setText(tr("Use Qobuz settings to authenticate."));
         }
@@ -333,11 +334,11 @@ void CoversSettingsPage::LogoutClicked() {
   if (!provider) return;
   provider->Deauthenticate();
 
-  if (provider->name() == "Tidal") {
+  if (provider->name() == QStringLiteral("Tidal")) {
     DisableAuthentication();
     ui_->label_auth_info->setText(tr("Use Tidal settings to authenticate."));
   }
-  else if (provider->name() == "Qobuz") {
+  else if (provider->name() == QStringLiteral("Qobuz")) {
     DisableAuthentication();
     ui_->label_auth_info->setText(tr("Use Qobuz settings to authenticate."));
   }
@@ -419,16 +420,16 @@ void CoversSettingsPage::AddAlbumCoverArtType(const QString &name, const QString
 
 QString CoversSettingsPage::AlbumCoverArtTypeDescription(const QString &type) const {
 
-  if (type == "art_unset") {
+  if (type == QStringLiteral("art_unset")) {
     return tr("Manually unset (%1)").arg(type);
   }
-  if (type == "art_manual") {
+  if (type == QStringLiteral("art_manual")) {
     return tr("Set through album cover search (%1)").arg(type);
   }
-  if (type == "art_automatic") {
+  if (type == QStringLiteral("art_automatic")) {
     return tr("Automatically picked up from album directory (%1)").arg(type);
   }
-  if (type == "art_embedded") {
+  if (type == QStringLiteral("art_embedded")) {
     return tr("Embedded album cover art (%1)").arg(type);
   }
 

src/settings/globalshortcutssettingspage.cpp

@@ -40,6 +40,7 @@
 
 #include "core/iconloader.h"
 #include "core/logging.h"
+#include "core/settings.h"
 #include "utilities/envutils.h"
 #include "globalshortcuts/globalshortcutgrabber.h"
 #include "globalshortcuts/globalshortcutsmanager.h"
@@ -95,7 +96,7 @@ GlobalShortcutsSettingsPage::~GlobalShortcutsSettingsPage() { delete ui_; }
 
 void GlobalShortcutsSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   GlobalShortcutsManager *manager = dialog()->global_shortcuts_manager();
@@ -205,13 +206,13 @@ void GlobalShortcutsSettingsPage::Load() {
 
   Init(ui_->layout_globalshortcutssettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void GlobalShortcutsSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   QList<Shortcut> shortcuts = shortcuts_.values();
@@ -344,18 +345,18 @@ void GlobalShortcutsSettingsPage::ChangeClicked() {
 void GlobalShortcutsSettingsPage::X11Warning() {
 
   QString de = de_.toLower();
-  if (de == "kde" || de == "gnome" || de == "x-cinnamon" || de == "mate") {
+  if (de == QStringLiteral("kde") || de == QStringLiteral("gnome") || de == QStringLiteral("x-cinnamon") || de == QStringLiteral("mate")) {
     QString text(tr("Using X11 shortcuts on %1 is not recommended and can cause keyboard to become unresponsive!").arg(de_));
-    if (de == "kde") {
+    if (de == QStringLiteral("kde")) {
       text += tr(" Shortcuts on %1 are usually used through MPRIS and KGlobalAccel.").arg(de_);
     }
-    else if (de == "gnome") {
+    else if (de == QStringLiteral("gnome")) {
       text += tr(" Shortcuts on %1 are usually used through Gnome Settings Daemon and should be configured in gnome-settings-daemon instead.").arg(de_);
     }
-    else if (de == "x-cinnamon") {
+    else if (de == QStringLiteral("x-cinnamon")) {
       text += tr(" Shortcuts on %1 are usually used through Gnome Settings Daemon and should be configured in cinnamon-settings-daemon instead.").arg(de_);
     }
-    else if (de == "mate") {
+    else if (de == QStringLiteral("mate")) {
       text += tr(" Shortcuts on %1 are usually used through MATE Settings Daemon and should be configured there instead.").arg(de_);
     }
     ui_->label_warn_text->setText(text);

src/settings/globalshortcutssettingspage.h

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <QObject>
-#include <QSettings>
 #include <QMap>
 #include <QString>
 #include <QKeySequence>

src/settings/lyricssettingspage.cpp

@@ -39,6 +39,7 @@
 #include "ui_lyricssettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "lyrics/lyricsproviders.h"
 #include "lyrics/lyricsprovider.h"
 #include "widgets/loginstatewidget.h"
@@ -89,7 +90,7 @@ void LyricsSettingsPage::Load() {
 
   Init(ui_->layout_lyricssettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
@@ -101,7 +102,7 @@ void LyricsSettingsPage::Save() {
     if (item->checkState() == Qt::Checked) providers << item->text();  // clazy:exclude=reserve-candidates
   }
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("providers", providers);
   s.endGroup();

src/settings/moodbarsettingspage.cpp

@@ -33,6 +33,7 @@
 
 #include "core/iconloader.h"
 #include "core/logging.h"
+#include "core/settings.h"
 
 #include "settingsdialog.h"
 #include "settingspage.h"
@@ -64,7 +65,7 @@ MoodbarSettingsPage::~MoodbarSettingsPage() { delete ui_; }
 
 void MoodbarSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   ui_->moodbar_enabled->setChecked(s.value("enabled", false).toBool());
   ui_->moodbar_show->setChecked(s.value("show", false).toBool());
@@ -76,13 +77,13 @@ void MoodbarSettingsPage::Load() {
 
   Init(ui_->layout_moodbarsettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void MoodbarSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("enabled", ui_->moodbar_enabled->isChecked());
   s.setValue("show", ui_->moodbar_show->isChecked());

src/settings/networkproxysettingspage.cpp

@@ -32,6 +32,7 @@
 
 #include "core/iconloader.h"
 #include "core/networkproxyfactory.h"
+#include "core/settings.h"
 #include "networkproxysettingspage.h"
 #include "settings/settingspage.h"
 #include "ui_networkproxysettingspage.h"
@@ -53,7 +54,7 @@ NetworkProxySettingsPage::~NetworkProxySettingsPage() { delete ui_; }
 
 void NetworkProxySettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(NetworkProxyFactory::kSettingsGroup);
   const NetworkProxyFactory::Mode mode = static_cast<NetworkProxyFactory::Mode>(s.value("mode", static_cast<int>(NetworkProxyFactory::Mode::System)).toInt());
@@ -82,13 +83,13 @@ void NetworkProxySettingsPage::Load() {
 
   Init(ui_->layout_networkproxysettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void NetworkProxySettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
 
   NetworkProxyFactory::Mode mode = NetworkProxyFactory::Mode::System;
   if (ui_->proxy_direct->isChecked()) mode = NetworkProxyFactory::Mode::Direct;

src/settings/notificationssettingspage.cpp

@@ -46,6 +46,7 @@
 #include <QSettings>
 
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "osd/osdbase.h"
 #include "osd/osdpretty.h"
 #include "settingspage.h"
@@ -151,7 +152,7 @@ void NotificationsSettingsPage::hideEvent(QHideEvent*) {
 
 void NotificationsSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(OSDBase::kSettingsGroup);
   const OSDBase::Behaviour osd_behaviour = static_cast<OSDBase::Behaviour>(s.value("Behaviour", static_cast<int>(OSDBase::Behaviour::Native)).toInt());
@@ -221,13 +222,13 @@ void NotificationsSettingsPage::Load() {
 
   Init(ui_->layout_notificationssettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(OSDBase::kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(OSDBase::kSettingsGroup))) set_changed();
 
 }
 
 void NotificationsSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
 
   OSDBase::Behaviour osd_behaviour = OSDBase::Behaviour::Disabled;
   if      (ui_->notifications_none->isChecked())   osd_behaviour = OSDBase::Behaviour::Disabled;

src/settings/playlistsettingspage.cpp

@@ -27,6 +27,7 @@
 #include <QRadioButton>
 
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "playlist/playlist.h"
 #include "settingspage.h"
 #include "playlistsettingspage.h"
@@ -51,7 +52,7 @@ PlaylistSettingsPage::~PlaylistSettingsPage() {
 
 void PlaylistSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   ui_->checkbox_alternating_row_colors->setChecked(s.value("alternating_row_colors", true).toBool());
@@ -105,7 +106,7 @@ void PlaylistSettingsPage::Load() {
 
   Init(ui_->layout_playlistsettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
@@ -125,7 +126,7 @@ void PlaylistSettingsPage::Save() {
     path_type = PathType::Ask_User;
   }
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("alternating_row_colors", ui_->checkbox_alternating_row_colors->isChecked());
   s.setValue("show_bars", ui_->checkbox_barscurrenttrack->isChecked());

src/settings/qobuzsettingspage.cpp

@@ -36,6 +36,7 @@
 #include "ui_qobuzsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "widgets/loginstatewidget.h"
 #include "internet/internetservices.h"
 #include "qobuz/qobuzservice.h"
@@ -71,7 +72,7 @@ QobuzSettingsPage::~QobuzSettingsPage() { delete ui_; }
 
 void QobuzSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   if (!s.contains(kSettingsGroup)) set_changed();
 
   s.beginGroup(kSettingsGroup);
@@ -98,13 +99,13 @@ void QobuzSettingsPage::Load() {
 
   Init(ui_->layout_qobuzsettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void QobuzSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("enabled", ui_->enable->isChecked());
   s.setValue("app_id", ui_->app_id->text());

src/settings/scrobblersettingspage.cpp

@@ -34,6 +34,7 @@
 #include "core/application.h"
 #include "core/iconloader.h"
 #include "core/song.h"
+#include "core/settings.h"
 #include "widgets/loginstatewidget.h"
 
 #include "scrobbler/audioscrobbler.h"
@@ -78,7 +79,7 @@ ScrobblerSettingsPage::ScrobblerSettingsPage(SettingsDialog *dialog, QWidget *pa
   QObject::connect(ui_->widget_listenbrainz_login_state, &LoginStateWidget::LogoutClicked, this, &ScrobblerSettingsPage::ListenBrainz_Logout);
   ui_->widget_listenbrainz_login_state->AddCredentialGroup(ui_->widget_listenbrainz_login);
 
-  ui_->label_listenbrainz_token->setText("<html><head/><body><p>" + tr("Enter your user token from") + " " + "<a href=\"https://listenbrainz.org/profile/\"><span style=\"text-decoration: underline; color:#0000ff;\">https://listenbrainz.org/profile/</span></a></p></body></html>");
+  ui_->label_listenbrainz_token->setText(QStringLiteral("<html><head/><body><p>") + tr("Enter your user token from") + QLatin1Char(' ') + QStringLiteral("<a href=\"https://listenbrainz.org/profile/\"><span style=\"text-decoration: underline; color:#0000ff;\">https://listenbrainz.org/profile/</span></a></p></body></html>"));
 
   resize(sizeHint());
 
@@ -88,7 +89,7 @@ ScrobblerSettingsPage::~ScrobblerSettingsPage() { delete ui_; }
 
 void ScrobblerSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   if (!s.contains(kSettingsGroup)) set_changed();
 
   ui_->checkbox_enable->setChecked(scrobbler_->enabled());
@@ -124,13 +125,13 @@ void ScrobblerSettingsPage::Load() {
 
   Init(ui_->layout_scrobblersettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void ScrobblerSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(kSettingsGroup);
   s.setValue("enabled", ui_->checkbox_enable->isChecked());

src/settings/settingsdialog.cpp

@@ -49,6 +49,7 @@
 
 #include "core/application.h"
 #include "core/player.h"
+#include "core/settings.h"
 #include "utilities/screenutils.h"
 #include "widgets/groupediconview.h"
 #include "collection/collectionmodel.h"
@@ -237,8 +238,8 @@ void SettingsDialog::reject() {
 
 void SettingsDialog::LoadGeometry() {
 
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
+  Settings s;
+  s.beginGroup(QLatin1String(kSettingsGroup));
   if (s.contains("geometry")) {
     restoreGeometry(s.value("geometry").toByteArray());
   }
@@ -251,8 +252,8 @@ void SettingsDialog::LoadGeometry() {
 
 void SettingsDialog::SaveGeometry() {
 
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
+  Settings s;
+  s.beginGroup(QLatin1String(kSettingsGroup));
   s.setValue("geometry", saveGeometry());
   s.endGroup();
 
@@ -353,7 +354,7 @@ void SettingsDialog::CurrentItemChanged(QTreeWidgetItem *item) {
   }
 
   // Set the title
-  ui_->title->setText("<b>" + item->text(0) + "</b>");
+  ui_->title->setText(QStringLiteral("<b>") + item->text(0) + QStringLiteral("</b>"));
 
   // Display the right page
   QList<PageData> pages = pages_.values();

src/settings/settingsdialog.h

@@ -32,7 +32,6 @@
 #include <QMap>
 #include <QSize>
 #include <QString>
-#include <QSettings>
 
 #include "core/shared_ptr.h"
 #include "engine/enginebase.h"

src/settings/settingspage.cpp

@@ -31,6 +31,7 @@
 #include <QShowEvent>
 
 #include "core/logging.h"
+#include "core/settings.h"
 
 #include "settingsdialog.h"
 #include "settingspage.h"
@@ -151,7 +152,7 @@ void SettingsPage::Apply() {
 
 }
 
-void SettingsPage::ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const QString &default_value) {
+void SettingsPage::ComboBoxLoadFromSettings(const Settings &s, QComboBox *combobox, const QString &setting, const QString &default_value) {
 
   QString value = s.value(setting, default_value).toString();
   int i = combobox->findData(value);
@@ -160,7 +161,7 @@ void SettingsPage::ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combo
 
 }
 
-void SettingsPage::ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value) {
+void SettingsPage::ComboBoxLoadFromSettings(const Settings &s, QComboBox *combobox, const QString &setting, const int default_value) {
 
   int value = s.value(setting, default_value).toInt();
   int i = combobox->findData(value);
@@ -169,7 +170,7 @@ void SettingsPage::ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combo
 
 }
 
-void SettingsPage::ComboBoxLoadFromSettingsByIndex(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value) {
+void SettingsPage::ComboBoxLoadFromSettingsByIndex(const Settings &s, QComboBox *combobox, const QString &setting, const int default_value) {
 
   if (combobox->count() == 0) return;
   int i = s.value(setting, default_value).toInt();

src/settings/settingspage.h

@@ -34,6 +34,7 @@
 
 #include "osd/osdbase.h"
 #include "core/logging.h"
+#include "core/settings.h"
 
 class QCheckBox;
 class QComboBox;
@@ -68,9 +69,9 @@ class SettingsPage : public QWidget {
 
   void set_changed() { changed_ = true; }
 
-  static void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const QString &default_value);
-  static void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value);
-  static void ComboBoxLoadFromSettingsByIndex(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value);
+  static void ComboBoxLoadFromSettings(const Settings &s, QComboBox *combobox, const QString &setting, const QString &default_value);
+  static void ComboBoxLoadFromSettings(const Settings &s, QComboBox *combobox, const QString &setting, const int default_value);
+  static void ComboBoxLoadFromSettingsByIndex(const Settings &s, QComboBox *combobox, const QString &setting, const int default_value);
 
  private:
   virtual void Save() = 0;

src/settings/subsonicsettingspage.cpp

@@ -36,6 +36,7 @@
 #include "ui_subsonicsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "internet/internetservices.h"
 #include "subsonic/subsonicservice.h"
 
@@ -71,7 +72,7 @@ SubsonicSettingsPage::~SubsonicSettingsPage() { delete ui_; }
 
 void SubsonicSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   ui_->enable->setChecked(s.value("enabled", false).toBool());
   ui_->server_url->setText(s.value("url").toString());
@@ -98,13 +99,13 @@ void SubsonicSettingsPage::Load() {
 
   Init(ui_->layout_subsonicsettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void SubsonicSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("enabled", ui_->enable->isChecked());
   s.setValue("url", QUrl(ui_->server_url->text()));

src/settings/tidalsettingspage.cpp

@@ -36,6 +36,7 @@
 #include "ui_tidalsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "internet/internetservices.h"
 #include "tidal/tidalservice.h"
 #include "widgets/loginstatewidget.h"
@@ -62,16 +63,16 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *dialog, QWidget *parent)
 
   dialog->installEventFilter(this);
 
-  ui_->quality->addItem(QStringLiteral("Low"), "LOW");
-  ui_->quality->addItem(QStringLiteral("High"), "HIGH");
-  ui_->quality->addItem(QStringLiteral("Lossless"), "LOSSLESS");
-  ui_->quality->addItem(QStringLiteral("Hi resolution"), "HI_RES");
+  ui_->quality->addItem(QStringLiteral("Low"), QStringLiteral("LOW"));
+  ui_->quality->addItem(QStringLiteral("High"), QStringLiteral("HIGH"));
+  ui_->quality->addItem(QStringLiteral("Lossless"), QStringLiteral("LOSSLESS"));
+  ui_->quality->addItem(QStringLiteral("Hi resolution"), QStringLiteral("HI_RES"));
 
-  ui_->coversize->addItem(QStringLiteral("160x160"), "160x160");
-  ui_->coversize->addItem(QStringLiteral("320x320"), "320x320");
-  ui_->coversize->addItem(QStringLiteral("640x640"), "640x640");
-  ui_->coversize->addItem(QStringLiteral("750x750"), "750x750");
-  ui_->coversize->addItem(QStringLiteral("1280x1280"), "1280x1280");
+  ui_->coversize->addItem(QStringLiteral("160x160"), QStringLiteral("160x160"));
+  ui_->coversize->addItem(QStringLiteral("320x320"), QStringLiteral("320x320"));
+  ui_->coversize->addItem(QStringLiteral("640x640"), QStringLiteral("640x640"));
+  ui_->coversize->addItem(QStringLiteral("750x750"), QStringLiteral("750x750"));
+  ui_->coversize->addItem(QStringLiteral("1280x1280"), QStringLiteral("1280x1280"));
 
   ui_->streamurl->addItem(QStringLiteral("streamurl"), static_cast<int>(StreamUrlMethod::StreamUrl));
   ui_->streamurl->addItem(QStringLiteral("urlpostpaywall"), static_cast<int>(StreamUrlMethod::UrlPostPaywall));
@@ -83,7 +84,7 @@ TidalSettingsPage::~TidalSettingsPage() { delete ui_; }
 
 void TidalSettingsPage::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   ui_->enable->setChecked(s.value("enabled", false).toBool());
   ui_->oauth->setChecked(s.value("oauth", true).toBool());
@@ -114,13 +115,13 @@ void TidalSettingsPage::Load() {
 
   Init(ui_->layout_tidalsettingspage->parentWidget());
 
-  if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
+  if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
 
 }
 
 void TidalSettingsPage::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("enabled", ui_->enable->isChecked());
   s.setValue("oauth", ui_->oauth->isChecked());