From 47c7c4c777d848a96c799374dedf999ca3d320d9 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 29 Aug 2021 14:57:32 +0200
Subject: [PATCH] cleanup QSettings usage a bit

---
 src/ChatPage.cpp   | 13 ++++++-------
 src/MainWindow.cpp | 22 +++++++++++-----------
 src/main.cpp       |  1 -
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 615e96fe..d0de7ab8 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -6,7 +6,6 @@
 #include <QApplication>
 #include <QInputDialog>
 #include <QMessageBox>
-#include <QSettings>
 
 #include <mtx/responses.hpp>
 
@@ -277,15 +276,15 @@ ChatPage::resetUI()
 void
 ChatPage::deleteConfigs()
 {
-        QSettings settings;
+        auto settings = UserSettings::instance()->qsettings();
 
         if (UserSettings::instance()->profile() != "") {
-                settings.beginGroup("profile");
-                settings.beginGroup(UserSettings::instance()->profile());
+                settings->beginGroup("profile");
+                settings->beginGroup(UserSettings::instance()->profile());
         }
-        settings.beginGroup("auth");
-        settings.remove("");
-        settings.endGroup(); // auth
+        settings->beginGroup("auth");
+        settings->remove("");
+        settings->endGroup(); // auth
 
         http::client()->shutdown();
         cache::deleteData();
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 396e1ab1..7eadc6df 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -7,7 +7,6 @@
 #include <QLayout>
 #include <QMessageBox>
 #include <QPluginLoader>
-#include <QSettings>
 #include <QShortcut>
 
 #include <mtx/requests.hpp>
@@ -188,9 +187,10 @@ MainWindow::event(QEvent *event)
 void
 MainWindow::restoreWindowSize()
 {
-        QSettings settings;
-        int savedWidth  = settings.value("window/width").toInt();
-        int savedheight = settings.value("window/height").toInt();
+        int savedWidth  = userSettings_->qsettings()->value("window/width").toInt();
+        int savedheight = userSettings_->qsettings()->value("window/height").toInt();
+
+        nhlog::ui()->info("Restoring window size {}x{}", savedWidth, savedheight);
 
         if (savedWidth == 0 || savedheight == 0)
                 resize(conf::window::width, conf::window::height);
@@ -201,11 +201,11 @@ MainWindow::restoreWindowSize()
 void
 MainWindow::saveCurrentWindowSize()
 {
-        QSettings settings;
+        auto settings = userSettings_->qsettings();
         QSize current = size();
 
-        settings.setValue("window/width", current.width());
-        settings.setValue("window/height", current.height());
+        settings->setValue("window/width", current.width());
+        settings->setValue("window/height", current.height());
 }
 
 void
@@ -301,14 +301,14 @@ MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason)
 bool
 MainWindow::hasActiveUser()
 {
-        QSettings settings;
+        auto settings = userSettings_->qsettings();
         QString prefix;
         if (userSettings_->profile() != "")
                 prefix = "profile/" + userSettings_->profile() + "/";
 
-        return settings.contains(prefix + "auth/access_token") &&
-               settings.contains(prefix + "auth/home_server") &&
-               settings.contains(prefix + "auth/user_id");
+        return settings->contains(prefix + "auth/access_token") &&
+               settings->contains(prefix + "auth/home_server") &&
+               settings->contains(prefix + "auth/user_id");
 }
 
 void
diff --git a/src/main.cpp b/src/main.cpp
index 29e93d49..09168e0c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,6 @@
 #include <QMessageBox>
 #include <QPoint>
 #include <QScreen>
-#include <QSettings>
 #include <QStandardPaths>
 #include <QTranslator>