2 files changed, 1 insertions, 62 deletions
diff --git a/launcher/settings/INIFile_test.cpp b/launcher/settings/INIFile_test.cpp
deleted file mode 100644
index d23f9fdf..00000000
--- a/launcher/settings/INIFile_test.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <QTest>
-
-#include "settings/INIFile.h"
-
-class IniFileTest : public QObject
-{
-    Q_OBJECT
-private
-slots:
-    void initTestCase()
-    {
-
-    }
-    void cleanupTestCase()
-    {
-
-    }
-
-    void test_Escape_data()
-    {
-        QTest::addColumn<QString>("through");
-
-        QTest::newRow("unix path") << "/abc/def/ghi/jkl";
-        QTest::newRow("windows path") << "C:\\Program files\\terrible\\name\\of something\\";
-        QTest::newRow("Plain text") << "Lorem ipsum dolor sit amet.";
-        QTest::newRow("Escape sequences") << "Lorem\n\t\n\\n\\tAAZ\nipsum dolor\n\nsit amet.";
-        QTest::newRow("Escape sequences 2") << "\"\n\n\"";
-        QTest::newRow("Hashtags") << "some data#something";
-    }
-    void test_Escape()
-    {
-        QFETCH(QString, through);
-
-        QString there = INIFile::escape(through);
-        QString back = INIFile::unescape(there);
-
-        QCOMPARE(back, through);
-    }
-
-    void test_SaveLoad()
-    {
-        QString a = "a";
-        QString b = "a\nb\t\n\\\\\\C:\\Program files\\terrible\\name\\of something\\#thisIsNotAComment";
-        QString filename = "test_SaveLoad.ini";
-
-        // save
-        INIFile f;
-        f.set("a", a);
-        f.set("b", b);
-        f.saveFile(filename);
-
-        // load
-        INIFile f2;
-        f2.loadFile(filename);
-        QCOMPARE(a, f2.get("a","NOT SET").toString());
-        QCOMPARE(b, f2.get("b","NOT SET").toString());
-    }
-};
-
-QTEST_GUILESS_MAIN(IniFileTest)
-
-#include "INIFile_test.moc"
diff --git a/launcher/settings/SettingsObject.h b/launcher/settings/SettingsObject.h
index 3d61e707..6200bc3a 100644
--- a/launcher/settings/SettingsObject.h
+++ b/launcher/settings/SettingsObject.h
@@ -25,6 +25,7 @@ class Setting;
 class SettingsObject;
 
 typedef std::shared_ptr<SettingsObject> SettingsObjectPtr;
+typedef std::weak_ptr<SettingsObject> SettingsObjectWeakPtr;
 
 /*!
  * \brief The SettingsObject handles communicating settings between the application and a