From baa32b99f53399cd3ea7c9990a2b6312ee83e8a4 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 24 Aug 2019 13:10:50 -0400
Subject: finished moving mod info dialog directinterface to settings

---
 src/modinfodialogesps.cpp      |  4 ++--
 src/modinfodialogimages.cpp    | 12 ++++--------
 src/modinfodialogtab.h         | 34 ----------------------------------
 src/modinfodialogtextfiles.cpp |  4 ++--
 4 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp
index 3130b4bd..e5f1637f 100644
--- a/src/modinfodialogesps.cpp
+++ b/src/modinfodialogesps.cpp
@@ -277,12 +277,12 @@ void ESPsTab::update()
 
 void ESPsTab::saveState(Settings& s)
 {
-  saveWidgetState(s.directInterface(), ui->ESPsSplitter);
+  s.geometry().saveState(ui->ESPsSplitter);
 }
 
 void ESPsTab::restoreState(const Settings& s)
 {
-  restoreWidgetState(s.directInterface(), ui->ESPsSplitter);
+  s.geometry().restoreState(ui->ESPsSplitter);
 }
 
 void ESPsTab::onActivate()
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 10362058..38c12d8a 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -130,18 +130,14 @@ void ImagesTab::update()
 
 void ImagesTab::saveState(Settings& s)
 {
-  s.directInterface().setValue(
-    "mod_info_dialog_images_show_dds", m_ddsEnabled);
-
-  saveWidgetState(s.directInterface(), ui->tabImagesSplitter);
+  s.saveChecked(ui->imagesShowDDS);
+  s.geometry().saveState(ui->tabImagesSplitter);
 }
 
 void ImagesTab::restoreState(const Settings& s)
 {
-  ui->imagesShowDDS->setChecked(s.directInterface()
-    .value("mod_info_dialog_images_show_dds", false).toBool());
-
-  restoreWidgetState(s.directInterface(), ui->tabImagesSplitter);
+  s.restoreChecked(ui->imagesShowDDS);
+  s.geometry().restoreState(ui->tabImagesSplitter);
 }
 
 void ImagesTab::checkFiltering()
diff --git a/src/modinfodialogtab.h b/src/modinfodialogtab.h
index c43fa076..d0a58574 100644
--- a/src/modinfodialogtab.h
+++ b/src/modinfodialogtab.h
@@ -253,32 +253,6 @@ protected:
   //
   void setFocus();
 
-
-  // saves the sate of the given widget in geometry/modinfodialog_[objectname]
-  //
-  // this needs to be a template because saveState() and restoreState() are
-  // not in QWidget, but they're in various widgets
-  //
-  template <class Widget>
-  void saveWidgetState(QSettings& s, Widget* w)
-  {
-    s.setValue(settingName(w), w->saveState());
-  }
-
-  // restores the sate of the given widget from
-  // geometry/modinfodialog_[objectname]
-  //
-  // this needs to be a template because saveState() and restoreState() are
-  // not in QWidget, but they're in various widgets
-  //
-  template <class Widget>
-  void restoreWidgetState(const QSettings& s, Widget* w)
-  {
-    if (s.contains(settingName(w))) {
-      w->restoreState(s.value(settingName(w)).toByteArray());
-    }
-  }
-
 private:
   // core
   OrganizerCore& m_core;
@@ -303,14 +277,6 @@ private:
 
   // true if the tab has never been selected for the current mod
   bool m_firstActivation;
-
-
-  // used by saveWidgetState() and restoreWidgetState()
-  //
-  QString settingName(QWidget* w)
-  {
-    return "geometry/modinfodialog_" + w->objectName();
-  }
 };
 
 
diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp
index 7a09fa4e..fdf12568 100644
--- a/src/modinfodialogtextfiles.cpp
+++ b/src/modinfodialogtextfiles.cpp
@@ -176,12 +176,12 @@ void GenericFilesTab::update()
 
 void GenericFilesTab::saveState(Settings& s)
 {
-  saveWidgetState(s.directInterface(), m_splitter);
+  s.geometry().saveState(m_splitter);
 }
 
 void GenericFilesTab::restoreState(const Settings& s)
 {
-  restoreWidgetState(s.directInterface(), m_splitter);
+  s.geometry().restoreState(m_splitter);
 }
 
 void GenericFilesTab::onSelection(
-- 
cgit v1.3.1