From da063377cd1a8c66961a132e0a73f08d92d01ca4 Mon Sep 17 00:00:00 2001
From: malte_langkabel <malte.langkabel@gmail.com>
Date: Mon, 3 Apr 2017 09:53:04 +0200
Subject: [PATCH] build: fix cyclic file dependencies that break the build on
 Linux

---
 src/lib/settings/ApplicationSettings.cpp        | 1 +
 src/lib/settings/ProjectSettings.h              | 1 +
 src/lib/settings/Settings.h                     | 6 +-----
 src/lib/settings/migration/SettingsMigrator.cpp | 1 +
 src/lib/settings/migration/SettingsMigrator.h   | 2 --
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp
index 7f3ab016..46ec9ddb 100644
--- a/src/lib/settings/ApplicationSettings.cpp
+++ b/src/lib/settings/ApplicationSettings.cpp
@@ -1,5 +1,6 @@
 #include "settings/ApplicationSettings.h"
 
+#include "settings/migration/SettingsMigrator.h"
 #include "settings/migration/MigrationMoveKey.h"
 #include "utility/ResourcePaths.h"
 #include "utility/Status.h"
diff --git a/src/lib/settings/ProjectSettings.h b/src/lib/settings/ProjectSettings.h
index 24b2349a..3cf5bd17 100644
--- a/src/lib/settings/ProjectSettings.h
+++ b/src/lib/settings/ProjectSettings.h
@@ -4,6 +4,7 @@
 #include <memory>
 #include <vector>
 
+#include "settings/migration/SettingsMigrator.h"
 #include "settings/LanguageType.h"
 #include "settings/Settings.h"
 
diff --git a/src/lib/settings/Settings.h b/src/lib/settings/Settings.h
index 33f192c2..72fd981f 100644
--- a/src/lib/settings/Settings.h
+++ b/src/lib/settings/Settings.h
@@ -8,8 +8,7 @@
 #include "utility/ConfigManager.h"
 #include "utility/file/FilePath.h"
 
-#include "settings/migration/SettingsMigrator.h"
-#include "settings/migration/Migration.h"
+class Migration;
 
 class Settings
 {
@@ -60,14 +59,11 @@ protected:
 	void enableWarnings() const;
 	void disableWarnings() const;
 
-	friend bool SettingsMigrator::migrate(Settings* settings, size_t targetVersion) const;
-
 	std::shared_ptr<ConfigManager> m_config;
 
 private:
 	FilePath m_filePath;
 
-	friend SettingsMigrator;
 	friend Migration;
 };
 
diff --git a/src/lib/settings/migration/SettingsMigrator.cpp b/src/lib/settings/migration/SettingsMigrator.cpp
index 50272426..a57a5dd4 100644
--- a/src/lib/settings/migration/SettingsMigrator.cpp
+++ b/src/lib/settings/migration/SettingsMigrator.cpp
@@ -1,5 +1,6 @@
 #include "settings/migration/SettingsMigrator.h"
 
+#include "settings/migration/Migration.h"
 #include "settings/Settings.h"
 
 SettingsMigrator::SettingsMigrator()
diff --git a/src/lib/settings/migration/SettingsMigrator.h b/src/lib/settings/migration/SettingsMigrator.h
index d6939b04..61ea0c95 100644
--- a/src/lib/settings/migration/SettingsMigrator.h
+++ b/src/lib/settings/migration/SettingsMigrator.h
@@ -11,8 +11,6 @@ class Settings;
 class SettingsMigrator
 {
 public:
-	static SettingsMigrator createApplicationSettingsMigrator();
-
 	SettingsMigrator();
 	virtual ~SettingsMigrator();