From 86dd2886d2bfa7c62d8db2b7b7ddf3f5af3da434 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 13 Sep 2024 00:41:35 +0200
Subject: [PATCH] Settings: Remove compatibility code

---
 src/core/settings.cpp | 90 -------------------------------------------
 src/core/settings.h   | 16 --------
 2 files changed, 106 deletions(-)

diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index f412ea05e..c08bfbb2e 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -28,93 +28,3 @@ Settings::Settings(QObject *parent)
 
 Settings::Settings(const QString &filename, const Format format, QObject *parent)
     : QSettings(filename, format, parent) {}
-
-// Compatibility with older Qt versions
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-
-void Settings::beginGroup(const char *prefix) {
-
-  QSettings::beginGroup(QLatin1String(prefix));
-
-}
-
-void Settings::beginGroup(const QString &prefix) {
-
-  QSettings::beginGroup(prefix);
-
-}
-
-bool Settings::contains(const char *key) const {
-
-  return QSettings::contains(QLatin1String(key));
-
-}
-
-bool Settings::contains(const QString &key) const {
-
-  return QSettings::contains(key);
-
-}
-
-QVariant Settings::value(const char *key, const QVariant &default_value) const {
-
-  return QSettings::value(QLatin1String(key), default_value);
-
-}
-
-QVariant Settings::value(const QString &key, const QVariant &default_value) const {
-
-  return QSettings::value(key, default_value);
-
-}
-
-void Settings::setValue(const char *key, const QVariant &value) {
-
-  QSettings::setValue(QLatin1String(key), value);
-
-}
-
-void Settings::setValue(const QString &key, const QVariant &value) {
-
-  QSettings::setValue(key, value);
-
-}
-
-int Settings::beginReadArray(const char *prefix) {
-
-  return QSettings::beginReadArray(QLatin1String(prefix));
-
-}
-
-int Settings::beginReadArray(const QString &prefix) {
-
-  return QSettings::beginReadArray(prefix);
-
-}
-
-void Settings::beginWriteArray(const char *prefix, int size) {
-
-  QSettings::beginWriteArray(QLatin1String(prefix), size);
-
-}
-
-void Settings::beginWriteArray(const QString &prefix, int size) {
-
-  QSettings::beginWriteArray(prefix, size);
-
-}
-
-void Settings::remove(const char *key) {
-
-  QSettings::remove(QLatin1String(key));
-
-}
-
-void Settings::remove(const QString &key) {
-
-  QSettings::remove(key);
-
-}
-
-#endif
diff --git a/src/core/settings.h b/src/core/settings.h
index d6bb439f6..716d8c79f 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -30,22 +30,6 @@ class Settings : public QSettings {
  public:
   explicit Settings(QObject *parent = nullptr);
   explicit Settings(const QString &filename, const Format format, QObject *parent = nullptr);
-#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)  // Compatibility with older Qt versions
-  void beginGroup(const char *prefix);
-  void beginGroup(const QString &prefix);
-  bool contains(const char *key) const;
-  bool contains(const QString &key) const;
-  QVariant value(const char *key, const QVariant &default_value = QVariant()) const;
-  QVariant value(const QString &key, const QVariant &default_value = QVariant()) const;
-  void setValue(const char *key, const QVariant &value);
-  void setValue(const QString &key, const QVariant &value);
-  int beginReadArray(const char *prefix);
-  int beginReadArray(const QString &prefix);
-  void beginWriteArray(const char *prefix, int size = -1);
-  void beginWriteArray(const QString &prefix, int size = -1);
-  void remove(const char *key);
-  void remove(const QString &key);
-#endif
 };
 
 #endif  // SETTINGS_H