From 12f0d51c0cd03d660425566264b502736b104310 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:51:34 -0700
Subject: Fix: signal/slot macro -> func pointer & network fixes - convert qt
 connect calls to use function pointers instead of the signal/slot macros
 wherever practical (UI classes were mostly left alone, target was tasks and
 processes) - give signals an explicit receivers to use the static method over
 the instance method wherever practical - ensure networks tasks are using the
 `errorOccured` signal added in Qt5.15 over the deprecated `error` signal -
 ensure all networks tasks have an sslErrors signal connected - add seemingly
 missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive`
 login flow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/settings/SettingsObject.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'launcher/settings')

diff --git a/launcher/settings/SettingsObject.cpp b/launcher/settings/SettingsObject.cpp
index 8a0bc045..634acd34 100644
--- a/launcher/settings/SettingsObject.cpp
+++ b/launcher/settings/SettingsObject.cpp
@@ -132,11 +132,10 @@ bool SettingsObject::reload()
 
 void SettingsObject::connectSignals(const Setting &setting)
 {
-    connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)),
-            SLOT(changeSetting(const Setting &, QVariant)));
-    connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)),
+    connect(&setting, &Setting::SettingChanged, this, &SettingsObject::changeSetting);
+    connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)), this,
             SIGNAL(SettingChanged(const Setting &, QVariant)));
 
-    connect(&setting, SIGNAL(settingReset(Setting)), SLOT(resetSetting(const Setting &)));
-    connect(&setting, SIGNAL(settingReset(Setting)), SIGNAL(settingReset(const Setting &)));
+    connect(&setting, &Setting::settingReset, this, &SettingsObject::resetSetting);
+    connect(&setting, SIGNAL(settingReset(Setting)), this, SIGNAL(settingReset(const Setting &)));
 }
-- 
cgit 


From b77fb059083ba04a3ccbc1b6e9ce4f5353b200ad Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 13 Jun 2023 21:07:05 +0300
Subject: Added back the INIFile read function

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/settings/INIFile.cpp | 85 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 8 deletions(-)

(limited to 'launcher/settings')

diff --git a/launcher/settings/INIFile.cpp b/launcher/settings/INIFile.cpp
index f0347cab..cb909ae7 100644
--- a/launcher/settings/INIFile.cpp
+++ b/launcher/settings/INIFile.cpp
@@ -45,12 +45,12 @@
 
 #include <QSettings>
 
-INIFile::INIFile()
-{
-}
+INIFile::INIFile() {}
 
 bool INIFile::saveFile(QString fileName)
 {
+    if (!contains("ConfigVersion"))
+        insert("ConfigVersion", "1.1");
     QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
     _settings_obj.setFallbacksEnabled(false);
 
@@ -71,6 +71,67 @@ bool INIFile::saveFile(QString fileName)
 
     return true;
 }
+QString unescape(QString orig)
+{
+    QString out;
+    QChar prev = QChar::Null;
+    for (auto c : orig) {
+        if (prev == '\\') {
+            if (c == 'n')
+                out += '\n';
+            else if (c == 't')
+                out += '\t';
+            else if (c == '#')
+                out += '#';
+            else
+                out += c;
+            prev = QChar::Null;
+        } else {
+            if (c == '\\') {
+                prev = c;
+                continue;
+            }
+            out += c;
+            prev = QChar::Null;
+        }
+    }
+    return out;
+}
+bool parseOldFileFormat(QIODevice& device, QSettings::SettingsMap& map)
+{
+    QTextStream in(device.readAll());
+#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
+    in.setCodec("UTF-8");
+#endif
+
+    QStringList lines = in.readAll().split('\n');
+    for (int i = 0; i < lines.count(); i++) {
+        QString& lineRaw = lines[i];
+        // Ignore comments.
+        int commentIndex = 0;
+        QString line = lineRaw;
+        // Search for comments until no more escaped # are available
+        while ((commentIndex = line.indexOf('#', commentIndex + 1)) != -1) {
+            if (commentIndex > 0 && line.at(commentIndex - 1) == '\\') {
+                continue;
+            }
+            line = line.left(lineRaw.indexOf('#')).trimmed();
+        }
+
+        int eqPos = line.indexOf('=');
+        if (eqPos == -1)
+            continue;
+        QString key = line.left(eqPos).trimmed();
+        QString valueStr = line.right(line.length() - eqPos - 1).trimmed();
+
+        valueStr = unescape(valueStr);
+
+        QVariant value(valueStr);
+        map.insert(key, value);
+    }
+
+    return true;
+}
 
 bool INIFile::loadFile(QString fileName)
 {
@@ -84,10 +145,19 @@ bool INIFile::loadFile(QString fileName)
             qCritical() << "A format error occurred (e.g. loading a malformed INI file).";
         return false;
     }
-
-    for (auto&& key : _settings_obj.allKeys())
-        insert(key, _settings_obj.value(key));
- 
+    if (!_settings_obj.value("ConfigVersion").isValid()) {
+        QFile file(fileName);
+        if (!file.open(QIODevice::ReadOnly))
+            return false;
+        QSettings::SettingsMap map;
+        parseOldFileFormat(file, map);
+        file.close();
+        for (auto&& key : map.keys())
+            insert(key, map.value(key));
+        insert("ConfigVersion", "1.1");
+    } else
+        for (auto&& key : _settings_obj.allKeys())
+            insert(key, _settings_obj.value(key));
     return true;
 }
 
@@ -103,4 +173,3 @@ void INIFile::set(QString key, QVariant val)
 {
     this->operator[](key) = val;
 }
-
-- 
cgit