build: fix cyclic file dependencies that break the build on Linux

This commit is contained in:
malte_langkabel
2017-04-03 09:53:04 +02:00
parent 0f94104005
commit da063377cd
5 changed files with 4 additions and 7 deletions
+1
View File
@@ -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"
+1
View File
@@ -4,6 +4,7 @@
#include <memory>
#include <vector>
#include "settings/migration/SettingsMigrator.h"
#include "settings/LanguageType.h"
#include "settings/Settings.h"
+1 -5
View File
@@ -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;
};
@@ -1,5 +1,6 @@
#include "settings/migration/SettingsMigrator.h"
#include "settings/migration/Migration.h"
#include "settings/Settings.h"
SettingsMigrator::SettingsMigrator()
@@ -11,8 +11,6 @@ class Settings;
class SettingsMigrator
{
public:
static SettingsMigrator createApplicationSettingsMigrator();
SettingsMigrator();
virtual ~SettingsMigrator();