build: search headers in all source directories

* removed paths in include directives
* changed cmake to provide necessary header search paths
* changed name of version.h to productVersion.h due to name conflict

src/lib/settings/ApplicationSettings.cpp

@@ -1,17 +1,17 @@
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 #include "License.h"
-#include "settings/migration/SettingsMigrator.h"
-#include "settings/migration/SettingsMigrationLambda.h"
-#include "settings/migration/SettingsMigrationMoveKey.h"
-#include "utility/AppPath.h"
-#include "utility/ResourcePaths.h"
-#include "utility/Status.h"
-#include "utility/TimeStamp.h"
-#include "utility/utility.h"
-#include "utility/utilityCxx.h"
-#include "utility/UserPaths.h"
-#include "utility/Version.h"
+#include "SettingsMigrator.h"
+#include "SettingsMigrationLambda.h"
+#include "SettingsMigrationMoveKey.h"
+#include "AppPath.h"
+#include "ResourcePaths.h"
+#include "Status.h"
+#include "TimeStamp.h"
+#include "utility.h"
+#include "utilityCxx.h"
+#include "UserPaths.h"
+#include "Version.h"
 
 const size_t ApplicationSettings::VERSION = 5;
 

src/lib/settings/ApplicationSettings.h

@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "data/GroupType.h"
-#include "settings/Settings.h"
+#include "GroupType.h"
+#include "Settings.h"
 
 class TimeStamp;
 class Version;

src/lib/settings/ColorScheme.cpp

@@ -1,6 +1,6 @@
-#include "settings/ColorScheme.h"
+#include "ColorScheme.h"
 
-#include "utility/utilityString.h"
+#include "utilityString.h"
 
 std::shared_ptr<ColorScheme> ColorScheme::s_instance;
 

src/lib/settings/ColorScheme.h

@@ -1,9 +1,9 @@
 #ifndef COLOR_SCHEME_H
 #define COLOR_SCHEME_H
 
-#include "data/graph/Edge.h"
-#include "data/graph/Node.h"
-#include "settings/Settings.h"
+#include "Edge.h"
+#include "Node.h"
+#include "Settings.h"
 
 class ColorScheme
 	: public Settings

src/lib/settings/LanguageType.cpp

@@ -1,4 +1,4 @@
-#include "settings/LanguageType.h"
+#include "LanguageType.h"
 
 std::string languageTypeToString(LanguageType t)
 {

src/lib/settings/LanguageType.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "settings/SourceGroupType.h"
+#include "SourceGroupType.h"
 
 enum LanguageType
 {

src/lib/settings/ProjectSettings.cpp

@@ -1,21 +1,21 @@
-#include "settings/ProjectSettings.h"
+#include "ProjectSettings.h"
 
-#include "project/Project.h"
-#include "settings/migration/SettingsMigrationDeleteKey.h"
-#include "settings/migration/SettingsMigrationLambda.h"
-#include "settings/migration/SettingsMigrationMoveKey.h"
-#include "settings/SourceGroupSettingsCEmpty.h"
-#include "settings/SourceGroupSettingsCppEmpty.h"
-#include "settings/SourceGroupSettingsCxxCdb.h"
-#include "settings/SourceGroupSettingsCxxCodeblocks.h"
-#include "settings/SourceGroupSettingsCxxSonargraph.h"
-#include "settings/SourceGroupSettingsJavaEmpty.h"
-#include "settings/SourceGroupSettingsJavaMaven.h"
-#include "settings/SourceGroupSettingsJavaGradle.h"
-#include "settings/SourceGroupSettingsJavaSonargraph.h"
-#include "utility/logging/logging.h"
-#include "utility/utilityString.h"
-#include "utility/utilityUuid.h"
+#include "Project.h"
+#include "SettingsMigrationDeleteKey.h"
+#include "SettingsMigrationLambda.h"
+#include "SettingsMigrationMoveKey.h"
+#include "SourceGroupSettingsCEmpty.h"
+#include "SourceGroupSettingsCppEmpty.h"
+#include "SourceGroupSettingsCxxCdb.h"
+#include "SourceGroupSettingsCxxCodeblocks.h"
+#include "SourceGroupSettingsCxxSonargraph.h"
+#include "SourceGroupSettingsJavaEmpty.h"
+#include "SourceGroupSettingsJavaMaven.h"
+#include "SourceGroupSettingsJavaGradle.h"
+#include "SourceGroupSettingsJavaSonargraph.h"
+#include "logging.h"
+#include "utilityString.h"
+#include "utilityUuid.h"
 
 const size_t ProjectSettings::VERSION = 7;
 

src/lib/settings/ProjectSettings.h

@@ -4,9 +4,9 @@
 #include <memory>
 #include <vector>
 
-#include "settings/migration/SettingsMigrator.h"
-#include "settings/LanguageType.h"
-#include "settings/Settings.h"
+#include "SettingsMigrator.h"
+#include "LanguageType.h"
+#include "Settings.h"
 
 class SourceGroupSettings;
 

src/lib/settings/Settings.cpp

@@ -1,8 +1,8 @@
-#include "settings/Settings.h"
+#include "Settings.h"
 
-#include "utility/logging/logging.h"
-#include "utility/text/TextAccess.h"
-#include "utility/utility.h"
+#include "logging.h"
+#include "TextAccess.h"
+#include "utility.h"
 
 Settings::Settings(const Settings& other)
 	: m_config(other.m_config->createCopy())

src/lib/settings/Settings.h

@@ -5,8 +5,8 @@
 #include <memory>
 #include <vector>
 
-#include "utility/ConfigManager.h"
-#include "utility/file/FilePath.h"
+#include "ConfigManager.h"
+#include "FilePath.h"
 
 class SettingsMigration;
 

src/lib/settings/SourceGroupSettings.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettings.h"
+#include "SourceGroupSettings.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/ConfigManager.h"
+#include "ProjectSettings.h"
+#include "ConfigManager.h"
 
 const size_t SourceGroupSettings::s_version = 1;
 const std::string SourceGroupSettings::s_keyPrefix = "source_groups/source_group_";

src/lib/settings/SourceGroupSettings.h

@@ -4,9 +4,9 @@
 #include <memory>
 #include <vector>
 
-#include "settings/LanguageType.h"
-#include "settings/SourceGroupStatusType.h"
-#include "settings/SourceGroupType.h"
+#include "LanguageType.h"
+#include "SourceGroupStatusType.h"
+#include "SourceGroupType.h"
 
 class ConfigManager;
 class FilePath;

src/lib/settings/SourceGroupSettingsCEmpty.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsCEmpty.h"
+#include "SourceGroupSettingsCEmpty.h"
 
 SourceGroupSettingsCEmpty::SourceGroupSettingsCEmpty(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsCxx(id, SOURCE_GROUP_C_EMPTY, projectSettings)

src/lib/settings/SourceGroupSettingsCEmpty.h

@@ -1,12 +1,12 @@
 #ifndef SOURCE_GROUP_SETTINGS_C_EMPTY_H
 #define SOURCE_GROUP_SETTINGS_C_EMPTY_H
 
-#include "settings/SourceGroupSettingsCxx.h"
-#include "settings/SourceGroupSettingsWithCStandard.h"
-#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h"
-#include "settings/SourceGroupSettingsWithExcludeFilters.h"
-#include "settings/SourceGroupSettingsWithSourceExtensions.h"
-#include "settings/SourceGroupSettingsWithSourcePaths.h"
+#include "SourceGroupSettingsCxx.h"
+#include "SourceGroupSettingsWithCStandard.h"
+#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h"
+#include "SourceGroupSettingsWithExcludeFilters.h"
+#include "SourceGroupSettingsWithSourceExtensions.h"
+#include "SourceGroupSettingsWithSourcePaths.h"
 
 class SourceGroupSettingsCEmpty
 	: public SourceGroupSettingsCxx

src/lib/settings/SourceGroupSettingsCppEmpty.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsCppEmpty.h"
+#include "SourceGroupSettingsCppEmpty.h"
 
 SourceGroupSettingsCppEmpty::SourceGroupSettingsCppEmpty(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsCxx(id, SOURCE_GROUP_CPP_EMPTY, projectSettings)

src/lib/settings/SourceGroupSettingsCppEmpty.h

@@ -1,12 +1,12 @@
 #ifndef SOURCE_GROUP_SETTINGS_CPP_EMPTY_H
 #define SOURCE_GROUP_SETTINGS_CPP_EMPTY_H
 
-#include "settings/SourceGroupSettingsCxx.h"
-#include "settings/SourceGroupSettingsWithCppStandard.h"
-#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h"
-#include "settings/SourceGroupSettingsWithExcludeFilters.h"
-#include "settings/SourceGroupSettingsWithSourceExtensions.h"
-#include "settings/SourceGroupSettingsWithSourcePaths.h"
+#include "SourceGroupSettingsCxx.h"
+#include "SourceGroupSettingsWithCppStandard.h"
+#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h"
+#include "SourceGroupSettingsWithExcludeFilters.h"
+#include "SourceGroupSettingsWithSourceExtensions.h"
+#include "SourceGroupSettingsWithSourcePaths.h"
 
 class SourceGroupSettingsCppEmpty
 	: public SourceGroupSettingsCxx

src/lib/settings/SourceGroupSettingsCxx.cpp

@@ -1,8 +1,8 @@
-#include "settings/SourceGroupSettingsCxx.h"
+#include "SourceGroupSettingsCxx.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/ConfigManager.h"
-#include "utility/utility.h"
+#include "ProjectSettings.h"
+#include "ConfigManager.h"
+#include "utility.h"
 
 SourceGroupSettingsCxx::SourceGroupSettingsCxx(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings)
 	: SourceGroupSettings(id, type, projectSettings)

src/lib/settings/SourceGroupSettingsCxx.h

@@ -1,9 +1,9 @@
 #ifndef SOURCE_GROUP_SETTINGS_CXX_H
 #define SOURCE_GROUP_SETTINGS_CXX_H
 
-#include "settings/SourceGroupSettings.h"
+#include "SourceGroupSettings.h"
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class SourceGroupSettingsCxx
 	: public SourceGroupSettings

src/lib/settings/SourceGroupSettingsCxxCdb.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsCxxCdb.h"
+#include "SourceGroupSettingsCxxCdb.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/ConfigManager.h"
+#include "ProjectSettings.h"
+#include "ConfigManager.h"
 
 SourceGroupSettingsCxxCdb::SourceGroupSettingsCxxCdb(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsCxx(id, SOURCE_GROUP_CXX_CDB, projectSettings)

src/lib/settings/SourceGroupSettingsCxxCdb.h

@@ -1,10 +1,10 @@
 #ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_H
 #define SOURCE_GROUP_SETTINGS_CXX_CDB_H
 
-#include "settings/SourceGroupSettingsCxx.h"
-#include "settings/SourceGroupSettingsWithExcludeFilters.h"
-#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h"
-#include "utility/file/FilePath.h"
+#include "SourceGroupSettingsCxx.h"
+#include "SourceGroupSettingsWithExcludeFilters.h"
+#include "SourceGroupSettingsWithIndexedHeaderPaths.h"
+#include "FilePath.h"
 
 class SourceGroupSettingsCxxCdb
 	: public SourceGroupSettingsCxx

src/lib/settings/SourceGroupSettingsCxxCdbVs.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsCxxCdbVs.h"
+#include "SourceGroupSettingsCxxCdbVs.h"
 
 SourceGroupSettingsCxxCdbVs::SourceGroupSettingsCxxCdbVs(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsCxxCdb(id, projectSettings)

src/lib/settings/SourceGroupSettingsCxxCdbVs.h

@@ -1,8 +1,8 @@
 #ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H
 #define SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H
 
-#include "settings/SourceGroupSettingsCxxCdb.h"
-#include "utility/file/FilePath.h"
+#include "SourceGroupSettingsCxxCdb.h"
+#include "FilePath.h"
 
 class SourceGroupSettingsCxxCdbVs
 	: public SourceGroupSettingsCxxCdb

src/lib/settings/SourceGroupSettingsCxxCodeblocks.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsCxxCodeblocks.h"
+#include "SourceGroupSettingsCxxCodeblocks.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/ConfigManager.h"
+#include "ProjectSettings.h"
+#include "ConfigManager.h"
 
 SourceGroupSettingsCxxCodeblocks::SourceGroupSettingsCxxCodeblocks(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsCxx(id, SOURCE_GROUP_CXX_CODEBLOCKS, projectSettings)

src/lib/settings/SourceGroupSettingsCxxCodeblocks.h

@@ -1,12 +1,12 @@
 #ifndef SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H
 #define SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H
 
-#include "settings/SourceGroupSettingsCxx.h"
-#include "settings/SourceGroupSettingsWithCppStandard.h"
-#include "settings/SourceGroupSettingsWithCStandard.h"
-#include "settings/SourceGroupSettingsWithExcludeFilters.h"
-#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h"
-#include "settings/SourceGroupSettingsWithSourceExtensions.h"
+#include "SourceGroupSettingsCxx.h"
+#include "SourceGroupSettingsWithCppStandard.h"
+#include "SourceGroupSettingsWithCStandard.h"
+#include "SourceGroupSettingsWithExcludeFilters.h"
+#include "SourceGroupSettingsWithIndexedHeaderPaths.h"
+#include "SourceGroupSettingsWithSourceExtensions.h"
 
 class SourceGroupSettingsCxxCodeblocks
 	: public SourceGroupSettingsCxx

src/lib/settings/SourceGroupSettingsCxxSonargraph.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsCxxSonargraph.h"
+#include "SourceGroupSettingsCxxSonargraph.h"
 
 SourceGroupSettingsCxxSonargraph::SourceGroupSettingsCxxSonargraph(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsCxx(id, SOURCE_GROUP_CXX_SONARGRAPH, projectSettings)

src/lib/settings/SourceGroupSettingsCxxSonargraph.h

@@ -1,10 +1,10 @@
 #ifndef SOURCE_GROUP_SETTINGS_CXX_SONARGRAPH_H
 #define SOURCE_GROUP_SETTINGS_CXX_SONARGRAPH_H
 
-#include "settings/SourceGroupSettingsCxx.h"
-#include "settings/SourceGroupSettingsWithCppStandard.h"
-#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h"
-#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h"
+#include "SourceGroupSettingsCxx.h"
+#include "SourceGroupSettingsWithCppStandard.h"
+#include "SourceGroupSettingsWithIndexedHeaderPaths.h"
+#include "SourceGroupSettingsWithSonargraphProjectPath.h"
 
 class SourceGroupSettingsCxxSonargraph
 	: public SourceGroupSettingsCxx

src/lib/settings/SourceGroupSettingsJava.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsJava.h"
+#include "SourceGroupSettingsJava.h"
 
 SourceGroupSettingsJava::SourceGroupSettingsJava(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings)
 	: SourceGroupSettings(id, type, projectSettings)

src/lib/settings/SourceGroupSettingsJava.h

@@ -4,10 +4,10 @@
 #include <memory>
 #include <vector>
 
-#include "settings/SourceGroupSettings.h"
-#include "settings/SourceGroupSettingsWithExcludeFilters.h"
-#include "settings/SourceGroupSettingsWithJavaStandard.h"
-#include "settings/SourceGroupSettingsWithSourceExtensions.h"
+#include "SourceGroupSettings.h"
+#include "SourceGroupSettingsWithExcludeFilters.h"
+#include "SourceGroupSettingsWithJavaStandard.h"
+#include "SourceGroupSettingsWithSourceExtensions.h"
 
 class SourceGroupSettingsJava
 	: public SourceGroupSettings

src/lib/settings/SourceGroupSettingsJavaEmpty.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsJavaEmpty.h"
+#include "SourceGroupSettingsJavaEmpty.h"
 
 SourceGroupSettingsJavaEmpty::SourceGroupSettingsJavaEmpty(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsJava(id, SOURCE_GROUP_JAVA_EMPTY, projectSettings)

src/lib/settings/SourceGroupSettingsJavaEmpty.h

@@ -1,9 +1,9 @@
 #ifndef SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H
 #define SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H
 
-#include "settings/SourceGroupSettingsJava.h"
-#include "settings/SourceGroupSettingsWithClasspath.h"
-#include "settings/SourceGroupSettingsWithSourcePaths.h"
+#include "SourceGroupSettingsJava.h"
+#include "SourceGroupSettingsWithClasspath.h"
+#include "SourceGroupSettingsWithSourcePaths.h"
 
 class SourceGroupSettingsJavaEmpty
 	: public SourceGroupSettingsJava

src/lib/settings/SourceGroupSettingsJavaGradle.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsJavaGradle.h"
+#include "SourceGroupSettingsJavaGradle.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/ConfigManager.h"
+#include "ProjectSettings.h"
+#include "ConfigManager.h"
 
 SourceGroupSettingsJavaGradle::SourceGroupSettingsJavaGradle(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsJava(id, SOURCE_GROUP_JAVA_GRADLE, projectSettings)

src/lib/settings/SourceGroupSettingsJavaGradle.h

@@ -1,8 +1,8 @@
 #ifndef SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H
 #define SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H
 
-#include "settings/SourceGroupSettingsJava.h"
-#include "utility/file/FilePath.h"
+#include "SourceGroupSettingsJava.h"
+#include "FilePath.h"
 
 class SourceGroupSettingsJavaGradle
 	: public SourceGroupSettingsJava

src/lib/settings/SourceGroupSettingsJavaMaven.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsJavaMaven.h"
+#include "SourceGroupSettingsJavaMaven.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/ConfigManager.h"
+#include "ProjectSettings.h"
+#include "ConfigManager.h"
 
 SourceGroupSettingsJavaMaven::SourceGroupSettingsJavaMaven(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettingsJava(id, SOURCE_GROUP_JAVA_MAVEN, projectSettings)

src/lib/settings/SourceGroupSettingsJavaMaven.h

@@ -1,8 +1,8 @@
 #ifndef SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H
 #define SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H
 
-#include "settings/SourceGroupSettingsJava.h"
-#include "utility/file/FilePath.h"
+#include "SourceGroupSettingsJava.h"
+#include "FilePath.h"
 
 class SourceGroupSettingsJavaMaven
 	: public SourceGroupSettingsJava

src/lib/settings/SourceGroupSettingsJavaSonargraph.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupSettingsJavaSonargraph.h"
+#include "SourceGroupSettingsJavaSonargraph.h"
 
 SourceGroupSettingsJavaSonargraph::SourceGroupSettingsJavaSonargraph(const std::string& id, const ProjectSettings* projectSettings)
 	: SourceGroupSettings(id, SOURCE_GROUP_JAVA_SONARGRAPH, projectSettings)

src/lib/settings/SourceGroupSettingsJavaSonargraph.h

@@ -1,10 +1,10 @@
 #ifndef SOURCE_GROUP_SETTINGS_JAVA_SONARGRAPH_H
 #define SOURCE_GROUP_SETTINGS_JAVA_SONARGRAPH_H
 
-#include "settings/SourceGroupSettings.h"
-#include "settings/SourceGroupSettingsWithClasspath.h"
-#include "settings/SourceGroupSettingsWithJavaStandard.h"
-#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h"
+#include "SourceGroupSettings.h"
+#include "SourceGroupSettingsWithClasspath.h"
+#include "SourceGroupSettingsWithJavaStandard.h"
+#include "SourceGroupSettingsWithSonargraphProjectPath.h"
 
 class SourceGroupSettingsJavaSonargraph
 	: public SourceGroupSettings

src/lib/settings/SourceGroupSettingsWithCStandard.cpp

@@ -1,6 +1,6 @@
-#include "settings/SourceGroupSettingsWithCStandard.h"
+#include "SourceGroupSettingsWithCStandard.h"
 
-#include "settings/ProjectSettings.h"
+#include "ProjectSettings.h"
 
 std::wstring SourceGroupSettingsWithCStandard::getDefaultCStandardStatic()
 {

src/lib/settings/SourceGroupSettingsWithClasspath.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsWithClasspath.h"
+#include "SourceGroupSettingsWithClasspath.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/utility.h"
+#include "ProjectSettings.h"
+#include "utility.h"
 
 SourceGroupSettingsWithClasspath::SourceGroupSettingsWithClasspath()
 	: m_classpath(std::vector<FilePath>())

src/lib/settings/SourceGroupSettingsWithClasspath.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class ConfigManager;
 class ProjectSettings;

src/lib/settings/SourceGroupSettingsWithCppStandard.cpp

@@ -1,6 +1,6 @@
-#include "settings/SourceGroupSettingsWithCppStandard.h"
+#include "SourceGroupSettingsWithCppStandard.h"
 
-#include "settings/ProjectSettings.h"
+#include "ProjectSettings.h"
 
 std::wstring SourceGroupSettingsWithCppStandard::getDefaultCppStandardStatic()
 {

src/lib/settings/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp

@@ -1,6 +1,6 @@
-#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h"
+#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h"
 
-#include "settings/ProjectSettings.h"
+#include "ProjectSettings.h"
 
 
 std::vector<std::wstring> SourceGroupSettingsWithCxxCrossCompilationOptions::getAvailableArchTypes()

src/lib/settings/SourceGroupSettingsWithExcludeFilters.cpp

@@ -1,9 +1,9 @@
-#include "settings/SourceGroupSettingsWithExcludeFilters.h"
+#include "SourceGroupSettingsWithExcludeFilters.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/file/FilePathFilter.h"
-#include "utility/file/FileSystem.h"
-#include "utility/utility.h"
+#include "ProjectSettings.h"
+#include "FilePathFilter.h"
+#include "FileSystem.h"
+#include "utility.h"
 
 SourceGroupSettingsWithExcludeFilters::SourceGroupSettingsWithExcludeFilters()
 	: m_excludeFilters(std::vector<std::wstring>())

src/lib/settings/SourceGroupSettingsWithIndexedHeaderPaths.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h"
+#include "SourceGroupSettingsWithIndexedHeaderPaths.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/utility.h"
+#include "ProjectSettings.h"
+#include "utility.h"
 
 SourceGroupSettingsWithIndexedHeaderPaths::SourceGroupSettingsWithIndexedHeaderPaths()
 	: m_indexedHeaderPaths(std::vector<FilePath>())

src/lib/settings/SourceGroupSettingsWithJavaStandard.cpp

@@ -1,6 +1,6 @@
-#include "settings/SourceGroupSettingsWithJavaStandard.h"
+#include "SourceGroupSettingsWithJavaStandard.h"
 
-#include "settings/ProjectSettings.h"
+#include "ProjectSettings.h"
 
 std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandardStatic()
 {

src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.cpp

@@ -1,6 +1,6 @@
-#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h"
+#include "SourceGroupSettingsWithSonargraphProjectPath.h"
 
-#include "settings/ProjectSettings.h"
+#include "ProjectSettings.h"
 
 SourceGroupSettingsWithSonargraphProjectPath::SourceGroupSettingsWithSonargraphProjectPath()
 {

src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class ConfigManager;
 class ProjectSettings;

src/lib/settings/SourceGroupSettingsWithSourceExtensions.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsWithSourceExtensions.h"
+#include "SourceGroupSettingsWithSourceExtensions.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/utility.h"
+#include "ProjectSettings.h"
+#include "utility.h"
 
 SourceGroupSettingsWithSourceExtensions::SourceGroupSettingsWithSourceExtensions()
 	: m_sourceExtensions(std::vector<std::wstring>())

src/lib/settings/SourceGroupSettingsWithSourcePaths.cpp

@@ -1,7 +1,7 @@
-#include "settings/SourceGroupSettingsWithSourcePaths.h"
+#include "SourceGroupSettingsWithSourcePaths.h"
 
-#include "settings/ProjectSettings.h"
-#include "utility/utility.h"
+#include "ProjectSettings.h"
+#include "utility.h"
 
 SourceGroupSettingsWithSourcePaths::SourceGroupSettingsWithSourcePaths()
 	: m_sourcePaths(std::vector<FilePath>())

src/lib/settings/SourceGroupStatusType.cpp

@@ -1,6 +1,6 @@
-#include "settings/SourceGroupStatusType.h"
+#include "SourceGroupStatusType.h"
 
-#include "utility/logging/logging.h"
+#include "logging.h"
 
 std::string sourceGroupStatusTypeToString(SourceGroupStatusType v)
 {

src/lib/settings/SourceGroupType.cpp

@@ -1,4 +1,4 @@
-#include "settings/SourceGroupType.h"
+#include "SourceGroupType.h"
 
 std::string sourceGroupTypeToString(SourceGroupType v)
 {

src/lib/settings/migration/SettingsMigration.cpp

@@ -1,6 +1,6 @@
-#include "settings/migration/SettingsMigration.h"
+#include "SettingsMigration.h"
 
-#include "settings/Settings.h"
+#include "Settings.h"
 
 SettingsMigration::~SettingsMigration()
 {

src/lib/settings/migration/SettingsMigration.h

@@ -4,8 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "settings/Settings.h"
-#include "utility/migration/Migration.h"
+#include "Settings.h"
+#include "Migration.h"
 
 class SettingsMigration: public Migration<Settings>
 {

src/lib/settings/migration/SettingsMigrationDeleteKey.cpp

@@ -1,4 +1,4 @@
-#include "settings/migration/SettingsMigrationDeleteKey.h"
+#include "SettingsMigrationDeleteKey.h"
 
 SettingsMigrationDeleteKey::SettingsMigrationDeleteKey(const std::string& key)
 	: m_key(key)

src/lib/settings/migration/SettingsMigrationDeleteKey.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "settings/migration/SettingsMigration.h"
+#include "SettingsMigration.h"
 
 class SettingsMigrationDeleteKey: public SettingsMigration
 {

src/lib/settings/migration/SettingsMigrationLambda.cpp

@@ -1,4 +1,4 @@
-#include "settings/migration/SettingsMigrationLambda.h"
+#include "SettingsMigrationLambda.h"
 
 SettingsMigrationLambda::SettingsMigrationLambda(std::function<void(const SettingsMigration*, Settings*)> m_lambda)
 	: m_lambda(m_lambda)

src/lib/settings/migration/SettingsMigrationLambda.h

@@ -3,7 +3,7 @@
 
 #include <functional>
 
-#include "settings/migration/SettingsMigration.h"
+#include "SettingsMigration.h"
 
 class SettingsMigrationLambda: public SettingsMigration
 {

src/lib/settings/migration/SettingsMigrationMoveKey.cpp

@@ -1,4 +1,4 @@
-#include "settings/migration/SettingsMigrationMoveKey.h"
+#include "SettingsMigrationMoveKey.h"
 
 SettingsMigrationMoveKey::SettingsMigrationMoveKey(const std::string& oldKey, const std::string& newKey)
 	: m_oldKey(oldKey)

src/lib/settings/migration/SettingsMigrationMoveKey.h

@@ -1,7 +1,7 @@
 #ifndef SETTINGS_MIGRATION_MOVE_KEY_H
 #define SETTINGS_MIGRATION_MOVE_KEY_H
 
-#include "settings/migration/SettingsMigration.h"
+#include "SettingsMigration.h"
 
 class SettingsMigrationMoveKey: public SettingsMigration
 {

src/lib/settings/migration/SettingsMigrator.h

@@ -1,7 +1,7 @@
 #ifndef SETTNGS_MIGRATOR_H
 #define SETTNGS_MIGRATOR_H
 
-#include "utility/migration/Migrator.h"
+#include "Migrator.h"
 
 class Settings;