From bf094b52daae2e90ab3f4d785140cfd1244279eb Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Wed, 26 Apr 2017 11:24:13 +0200 Subject: [PATCH] logic: fix initialization of source groups SourceGroups have been initialized with wrong default values which have later been used to write for writing the ProjectSettings file if not overwritten. --- src/lib/settings/SourceGroupSettings.cpp | 4 ++++ src/lib/settings/SourceGroupSettingsCxx.cpp | 6 ++++++ src/lib/settings/SourceGroupSettingsJava.cpp | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/lib/settings/SourceGroupSettings.cpp b/src/lib/settings/SourceGroupSettings.cpp index acccc39f..5321ce90 100644 --- a/src/lib/settings/SourceGroupSettings.cpp +++ b/src/lib/settings/SourceGroupSettings.cpp @@ -6,6 +6,10 @@ SourceGroupSettings::SourceGroupSettings(const std::string& id, SourceGroupType : m_projectSettings(projectSettings) , m_id(id) , m_type(type) + , m_standard("") + , m_sourcePaths(std::vector()) + , m_excludePaths(std::vector()) + , m_sourceExtensions(std::vector()) { } diff --git a/src/lib/settings/SourceGroupSettingsCxx.cpp b/src/lib/settings/SourceGroupSettingsCxx.cpp index 6b6e7b2a..e7084dc6 100644 --- a/src/lib/settings/SourceGroupSettingsCxx.cpp +++ b/src/lib/settings/SourceGroupSettingsCxx.cpp @@ -4,6 +4,12 @@ SourceGroupSettingsCxx::SourceGroupSettingsCxx(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings) : SourceGroupSettings(id, type, projectSettings) + , m_headerSearchPaths(std::vector()) + , m_frameworkSearchPaths(std::vector()) + , m_compilerFlags(std::vector()) + , m_useSourcePathsForHeaderSearch(false) + , m_hasDefinedUseSourcePathsForHeaderSearch(false) + , m_compilationDatabasePath(FilePath()) { } diff --git a/src/lib/settings/SourceGroupSettingsJava.cpp b/src/lib/settings/SourceGroupSettingsJava.cpp index c0d43c17..fc9c4bf9 100644 --- a/src/lib/settings/SourceGroupSettingsJava.cpp +++ b/src/lib/settings/SourceGroupSettingsJava.cpp @@ -4,6 +4,10 @@ SourceGroupSettingsJava::SourceGroupSettingsJava(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings) : SourceGroupSettings(id, type, projectSettings) + , m_classpaths(std::vector()) + , m_mavenProjectFilePath(FilePath()) + , m_mavenDependenciesDirectory(FilePath()) + , m_shouldIndexMavenTests(false) { }