From 18da95e4f8dd82fb7058b0cb5e17c06259e0961f Mon Sep 17 00:00:00 2001
From: cfcohen <cfcohen@verizon.net>
Date: Wed, 25 Nov 2015 13:08:53 -0500
Subject: [PATCH] Make openmw-launcher pass comments through settings.cfg, and
 reuse the Settings::Manager code to do most of the work.  Stop loading both
 the global settings-default.cfg and the one in the current directory, while
 continuing to prefer the latter one.  Cleanup paths slightly and remove what
 appears to have been debugging in the launcher settings.

---
 apps/launcher/settings/graphicssettings.cpp | 44 ---------------------
 apps/launcher/settings/graphicssettings.hpp | 18 ---------
 2 files changed, 62 deletions(-)
 delete mode 100644 apps/launcher/settings/graphicssettings.cpp
 delete mode 100644 apps/launcher/settings/graphicssettings.hpp

diff --git a/apps/launcher/settings/graphicssettings.cpp b/apps/launcher/settings/graphicssettings.cpp
deleted file mode 100644
index 9dad3dee6..000000000
--- a/apps/launcher/settings/graphicssettings.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "graphicssettings.hpp"
-
-#include <QTextStream>
-#include <QString>
-#include <QRegExp>
-#include <QMap>
-
-Launcher::GraphicsSettings::GraphicsSettings()
-{
-}
-
-Launcher::GraphicsSettings::~GraphicsSettings()
-{
-}
-
-bool Launcher::GraphicsSettings::writeFile(QTextStream &stream)
-{
-    QString sectionPrefix;
-    QRegExp sectionRe("([^/]+)/(.+)$");
-    QMap<QString, QString> settings = SettingsBase::getSettings();
-
-    QMapIterator<QString, QString> i(settings);
-    while (i.hasNext()) {
-        i.next();
-
-        QString prefix;
-        QString key;
-
-        if (sectionRe.exactMatch(i.key())) {
-             prefix = sectionRe.cap(1);
-             key = sectionRe.cap(2);
-        }
-
-        if (sectionPrefix != prefix) {
-            sectionPrefix = prefix;
-            stream << "\n[" << prefix << "]\n";
-        }
-
-        stream << key << " = " << i.value() << "\n";
-    }
-
-    return true;
-
-}
diff --git a/apps/launcher/settings/graphicssettings.hpp b/apps/launcher/settings/graphicssettings.hpp
deleted file mode 100644
index a52e0aa84..000000000
--- a/apps/launcher/settings/graphicssettings.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef GRAPHICSSETTINGS_HPP
-#define GRAPHICSSETTINGS_HPP
-
-#include <components/config/settingsbase.hpp>
-
-namespace Launcher
-{
-    class GraphicsSettings : public Config::SettingsBase<QMap<QString, QString> >
-    {
-    public:
-        GraphicsSettings();
-        ~GraphicsSettings();
-
-        bool writeFile(QTextStream &stream);
-
-    };
-}
-#endif // GRAPHICSSETTINGS_HPP