Merge branch 'master' into new_vfs_library

1 files changed, 25 insertions, 11 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index b86e2289..fc740302 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -19,24 +19,44 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "settings.h"
 
+#include "pluginsetting.h"
+#include "serverinfo.h"
 #include "settingsdialog.h"
-#include "utility.h"
-#include "helper.h"
-#include <appconfig.h>
+#include "versioninfo.h"
+#include "appconfig.h"
 #include <utility.h>
+#include <iplugin.h>
 #include <iplugingame.h>
+#include <questionboxmemory.h>
 
 #include <QCheckBox>
 #include <QCoreApplication>
-#include <QDesktopServices>
+#include <QComboBox>
+#include <QDate>
+#include <QDialog>
+#include <QDir>
 #include <QDirIterator>
+#include <QFileInfo>
 #include <QLineEdit>
+#include <QListWidgetItem>
+#include <QLocale>
 #include <QMessageBox>
 #include <QApplication>
 #include <QRegExp>
 #include <QDir>
+#include <QStringList>
+#include <QVariantMap>
+
+#include <Qt> // for Qt::UserRole, etc
+#include <QtDebug> // for qDebug, qWarning
+
+#include <Windows.h> // For ShellExecuteW, HINSTANCE, etc
 
+#include <algorithm> // for sort
 #include <memory>
+#include <stdexcept> // for runtime_error
+#include <string>
+#include <utility> // for pair, make_pair
 
 using namespace MOBase;
 
@@ -547,13 +567,7 @@ void Settings::addStyles(QComboBox *styleBox)
 
 void Settings::resetDialogs()
 {
-  m_Settings.beginGroup("DialogChoices");
-  QStringList keys = m_Settings.childKeys();
-  for (QString key : keys) {
-    m_Settings.remove(key);
-  }
-
-  m_Settings.endGroup();
+  QuestionBoxMemory::resetDialogs();
 }