diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index a4e2cfaf..d1e439ba 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -344,39 +344,6 @@ add_files( settings/migration/SettingsMigrationMoveKey.h settings/migration/SettingsMigrator.h - settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp - settings/source_group/component/java/SourceGroupSettingsWithClasspath.h - settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp - settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h - settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp - settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h - settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp - settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h - settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h - - settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h - settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h - settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h - settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h - settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h - settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h - settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.h - settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.cpp - settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h - settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h - settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h - - settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.cpp - settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.h - settings/source_group/component/python/SourceGroupSettingsWithSourceExtensionsPython.h - settings/source_group/component/SourceGroupSettingsWithCustomCommand.cpp settings/source_group/component/SourceGroupSettingsWithCustomCommand.h settings/source_group/component/SourceGroupSettingsWithExcludeFilters.cpp @@ -387,16 +354,6 @@ add_files( settings/source_group/component/SourceGroupSettingsWithSourcePaths.cpp settings/source_group/component/SourceGroupSettingsWithSourcePaths.h - settings/source_group/type/SourceGroupSettingsCEmpty.h - settings/source_group/type/SourceGroupSettingsCppEmpty.h - settings/source_group/type/SourceGroupSettingsCustomCommand.h - settings/source_group/type/SourceGroupSettingsCxxCdb.h - settings/source_group/type/SourceGroupSettingsCxxCdbVs.h - settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h - settings/source_group/type/SourceGroupSettingsJavaEmpty.h - settings/source_group/type/SourceGroupSettingsJavaGradle.h - settings/source_group/type/SourceGroupSettingsJavaMaven.h - settings/source_group/type/SourceGroupSettingsPythonEmpty.h settings/source_group/type/SourceGroupSettingsUnloadable.h settings/source_group/SourceGroupSettings.cpp @@ -661,3 +618,67 @@ if (WIN32) utility/utilityWindows.h ) endif() + +if (BUILD_CXX_LANGUAGE_PACKAGE) + add_files( + LIB + + settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h + settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h + settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h + settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h + settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h + settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h + settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.h + settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.cpp + settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h + settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h + settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h + + settings/source_group/type/SourceGroupSettingsCEmpty.h + settings/source_group/type/SourceGroupSettingsCppEmpty.h + settings/source_group/type/SourceGroupSettingsCustomCommand.h + settings/source_group/type/SourceGroupSettingsCxxCdb.h + settings/source_group/type/SourceGroupSettingsCxxCdbVs.h + settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h + ) +endif() + +if (BUILD_JAVA_LANGUAGE_PACKAGE) + add_files( + LIB + + settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp + settings/source_group/component/java/SourceGroupSettingsWithClasspath.h + settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp + settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h + settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp + settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h + settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp + settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h + settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h + + settings/source_group/type/SourceGroupSettingsJavaEmpty.h + settings/source_group/type/SourceGroupSettingsJavaGradle.h + settings/source_group/type/SourceGroupSettingsJavaMaven.h + ) +endif() + +if (BUILD_PYTHON_LANGUAGE_PACKAGE) + add_files( + LIB + + settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.cpp + settings/source_group/component/python/SourceGroupSettingsWithPythonEnvironmentPath.h + settings/source_group/component/python/SourceGroupSettingsWithSourceExtensionsPython.h + + settings/source_group/type/SourceGroupSettingsPythonEmpty.h + ) +endif() diff --git a/src/lib/settings/ProjectSettings.cpp b/src/lib/settings/ProjectSettings.cpp index b34fbecf..3b0b26e8 100644 --- a/src/lib/settings/ProjectSettings.cpp +++ b/src/lib/settings/ProjectSettings.cpp @@ -3,21 +3,30 @@ #include "SettingsMigrationDeleteKey.h" #include "SettingsMigrationLambda.h" #include "SettingsMigrationMoveKey.h" -#include "SourceGroupSettingsCEmpty.h" -#include "SourceGroupSettingsCppEmpty.h" #include "SourceGroupSettingsCustomCommand.h" -#include "SourceGroupSettingsCxxCdb.h" -#include "SourceGroupSettingsCxxCodeblocks.h" -#include "SourceGroupSettingsJavaEmpty.h" -#include "SourceGroupSettingsJavaMaven.h" -#include "SourceGroupSettingsJavaGradle.h" -#include "SourceGroupSettingsPythonEmpty.h" #include "SourceGroupSettingsUnloadable.h" #include "logging.h" #include "utilityFile.h" #include "utilityString.h" #include "utilityUuid.h" +#if BUILD_CXX_LANGUAGE_PACKAGE +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#endif // BUILD_CXX_LANGUAGE_PACKAGE + +#if BUILD_JAVA_LANGUAGE_PACKAGE +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaGradle.h" +#endif // BUILD_JAVA_LANGUAGE_PACKAGE + +#if BUILD_PYTHON_LANGUAGE_PACKAGE +#include "SourceGroupSettingsPythonEmpty.h" +#endif // BUILD_PYTHON_LANGUAGE_PACKAGE + const std::wstring ProjectSettings::PROJECT_FILE_EXTENSION = L".srctrlprj"; const std::wstring ProjectSettings::BOOKMARK_DB_FILE_EXTENSION = L".srctrlbm"; const std::wstring ProjectSettings::INDEX_DB_FILE_EXTENSION = L".srctrldb"; diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp index 5ee6bbeb..ac81fa1b 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCStandard.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" std::wstring SourceGroupSettingsWithCStandard::getDefaultCStandardStatic() @@ -69,5 +67,3 @@ std::wstring SourceGroupSettingsWithCStandard::getDefaultCStandard() const { return getDefaultCStandardStatic(); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h index 9c6f9c79..8ba21da0 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCStandard.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_C_STANDARD_H #define SOURCE_GROUP_SETTINGS_WITH_C_STANDARD_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "SourceGroupSettingsComponent.h" @@ -34,6 +30,4 @@ private: std::wstring m_cStandard; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_C_STANDARD_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp index f29c1338..09c13d7b 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCppStandard.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" std::wstring SourceGroupSettingsWithCppStandard::getDefaultCppStandardStatic() @@ -69,5 +67,3 @@ std::wstring SourceGroupSettingsWithCppStandard::getDefaultCppStandard() const { return getDefaultCppStandardStatic(); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h index 3e5bcda3..32815434 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCppStandard.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_CPP_STANDARD_H #define SOURCE_GROUP_SETTINGS_WITH_CPP_STANDARD_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "SourceGroupSettingsComponent.h" @@ -34,6 +30,4 @@ private: std::wstring m_cppStandard; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_CPP_STANDARD_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp index 2e1b212c..37682c85 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCxxCdbPath.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" #include "utilityFile.h" @@ -41,5 +39,3 @@ void SourceGroupSettingsWithCxxCdbPath::save(ConfigManager* config, const std::s { config->setValue(key + "/build_file_path/compilation_db_path", getCompilationDatabasePath().wstr()); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h index a60b685c..3f928fef 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCdbPath.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_CDB_PATH_H #define SOURCE_GROUP_SETTINGS_WITH_CXX_CDB_PATH_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "FilePath.h" #include "SourceGroupSettingsComponent.h" @@ -28,6 +24,4 @@ private: FilePath m_compilationDatabasePath; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_CXX_CDB_PATH_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp index 63e6f6b5..d47fcd35 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCxxCodeblocksPath.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" #include "utilityFile.h" @@ -40,5 +38,3 @@ void SourceGroupSettingsWithCxxCodeblocksPath::save(ConfigManager* config, const { config->setValue(key + "/codeblocks_project_path", getCodeblocksProjectPath().wstr()); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h index 62f99fda..2cfc29ba 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCodeblocksPath.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_CODEBLOCKS_PATH_H #define SOURCE_GROUP_SETTINGS_WITH_CXX_CODEBLOCKS_PATH_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "FilePath.h" #include "SourceGroupSettingsComponent.h" @@ -28,6 +24,4 @@ private: FilePath m_codeblocksProjectPath; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_CXX_CODEBLOCKS_PATH_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp index cee76be5..c4eb3823 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCxxCrossCompilationOptions.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" std::vector SourceGroupSettingsWithCxxCrossCompilationOptions::getAvailableArchTypes() @@ -233,5 +231,3 @@ void SourceGroupSettingsWithCxxCrossCompilationOptions::save(ConfigManager* conf config->setValue(key + "/cross_compilation/target/sys", getTargetSys()); config->setValue(key + "/cross_compilation/target/abi", getTargetAbi()); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h index 14785f3a..161d5880 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxCrossCompilationOptions.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_CROSS_COMPILATION_OPTIONS_H #define SOURCE_GROUP_SETTINGS_WITH_CXX_CROSS_COMPILATION_OPTIONS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "SourceGroupSettingsComponent.h" @@ -51,6 +47,4 @@ private: std::wstring m_targetAbi; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_CXX_CROSS_COMPILATION_OPTIONS_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp index cb32fb9b..0472dde1 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCxxPathsAndFlags.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" #include "utility.h" @@ -71,5 +69,3 @@ void SourceGroupSettingsWithCxxPathsAndFlags::save(ConfigManager* config, const config->setValues(key + "/framework_search_paths/framework_search_path", getFrameworkSearchPaths()); config->setValues(key + "/compiler_flags/compiler_flag", getCompilerFlags()); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h index ebcc0252..7bed50a2 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPathsAndFlags.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_CXX_PATHS_AND_FLAGS_H #define SOURCE_GROUP_SETTINGS_WITH_CXX_PATHS_AND_FLAGS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "FilePath.h" @@ -39,6 +35,4 @@ private: std::vector m_compilerFlags; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_CXX_PATHS_AND_FLAGS_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp index 013063bd..aa44cdcf 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithCxxPchOptions.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithCxxPchOptions.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ProjectSettings.h" #include "utility.h" #include "utilityFile.h" @@ -72,5 +70,3 @@ void SourceGroupSettingsWithCxxPchOptions::setPchFlags(const std::vectorsetValues(key + "/indexed_header_paths/indexed_header_path", getIndexedHeaderPaths()); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h index 134a8672..a7d7fcf9 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithIndexedHeaderPaths.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_INDEXED_HEADER_PATHS_H #define SOURCE_GROUP_SETTINGS_WITH_INDEXED_HEADER_PATHS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "SourceGroupSettingsComponent.h" @@ -31,6 +27,4 @@ private: std::vector m_indexedHeaderPaths; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_INDEXED_HEADER_PATHS_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h index 81df76c2..3769c391 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsC.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_C_H #define SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_C_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithSourceExtensions.h" class SourceGroupSettingsWithSourceExtensionsC @@ -17,6 +13,4 @@ private: } }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_C_H diff --git a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h index 80792f96..e70df9d9 100644 --- a/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h +++ b/src/lib/settings/source_group/component/cxx/SourceGroupSettingsWithSourceExtensionsCpp.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_CPP_H #define SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_CPP_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithSourceExtensions.h" class SourceGroupSettingsWithSourceExtensionsCpp @@ -21,6 +17,4 @@ private: } }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_CPP_H diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp index 4b7dc8fd..35b3b51e 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithClasspath.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "ProjectSettings.h" #include "utility.h" @@ -52,5 +50,3 @@ void SourceGroupSettingsWithClasspath::save(ConfigManager* config, const std::st config->setValues(key + "/class_paths/class_path", getClasspath()); config->setValue(key + "/use_jre_system_library", getUseJreSystemLibrary()); } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.h b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.h index 285f6e89..d6107a68 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.h +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithClasspath.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_CLASSPATH_H #define SOURCE_GROUP_SETTINGS_WITH_CLASSPATH_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include #include "FilePath.h" @@ -34,6 +30,4 @@ private: bool m_useJreSystemLibrary = true; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_CLASSPATH_H diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp index d76c4dc8..b25dadb6 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithJavaGradle.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "ConfigManager.h" #include "ProjectSettings.h" #include "utilityFile.h" @@ -58,5 +56,3 @@ void SourceGroupSettingsWithJavaGradle::save(ConfigManager* config, const std::s config->setValue(key + "/gradle/project_file_path", getGradleProjectFilePath().wstr()); config->setValue(key + "/gradle/should_index_tests", getShouldIndexGradleTests()); } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h index 457aaf09..eac6de62 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaGradle.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_JAVA_GRADLE_H #define SOURCE_GROUP_SETTINGS_WITH_JAVA_GRADLE_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "FilePath.h" #include "SourceGroupSettingsComponent.h" @@ -34,6 +30,4 @@ private: bool m_shouldIndexGradleTests = false; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_JAVA_GRADLE_H diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp index 1c6e0e9b..f6b5121b 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithJavaMaven.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "ConfigManager.h" #include "ProjectSettings.h" #include "utilityFile.h" @@ -58,5 +56,3 @@ void SourceGroupSettingsWithJavaMaven::save(ConfigManager* config, const std::st config->setValue(key + "/maven/project_file_path", getMavenProjectFilePath().wstr()); config->setValue(key + "/maven/should_index_tests", getShouldIndexMavenTests()); } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h index 30850895..df9d0077 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaMaven.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_JAVA_MAVEN_H #define SOURCE_GROUP_SETTINGS_WITH_JAVA_MAVEN_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "FilePath.h" #include "SourceGroupSettingsComponent.h" @@ -34,6 +30,4 @@ private: bool m_shouldIndexMavenTests = false; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_JAVA_MAVEN_H diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp index 3550bb84..e46aa8dc 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.cpp @@ -1,7 +1,5 @@ #include "SourceGroupSettingsWithJavaStandard.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "ProjectSettings.h" std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandardStatic() @@ -52,5 +50,3 @@ std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandard() const { return getDefaultJavaStandardStatic(); } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h index ba91598d..96e68744 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithJavaStandard.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_JAVA_STANDARD_H #define SOURCE_GROUP_SETTINGS_WITH_JAVA_STANDARD_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include #include "SourceGroupSettingsComponent.h" @@ -34,6 +30,4 @@ private: std::wstring m_javaStandard; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_JAVA_STANDARD_H diff --git a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h index f89ead84..1379aea6 100644 --- a/src/lib/settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h +++ b/src/lib/settings/source_group/component/java/SourceGroupSettingsWithSourceExtensionsJava.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_JAVA_H #define SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_JAVA_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithSourceExtensions.h" class SourceGroupSettingsWithSourceExtensionsJava @@ -17,6 +13,4 @@ private: } }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_WITH_SOURCE_EXTENSIONS_JAVA_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsCEmpty.h b/src/lib/settings/source_group/type/SourceGroupSettingsCEmpty.h index 2c46faae..894cd3fd 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsCEmpty.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsCEmpty.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_C_EMPTY_H #define SOURCE_GROUP_SETTINGS_C_EMPTY_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithCStandard.h" #include "SourceGroupSettingsWithCxxCrossCompilationOptions.h" @@ -36,6 +32,4 @@ public: } }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_C_EMPTY_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdb.h b/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdb.h index bc7133fb..5ad26eb6 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdb.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdb.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_H #define SOURCE_GROUP_SETTINGS_CXX_CDB_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithCxxCdbPath.h" #include "SourceGroupSettingsWithCxxPathsAndFlags.h" @@ -32,6 +28,4 @@ public: } }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_CXX_CDB_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdbVs.h b/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdbVs.h index 2888ea41..df61ef74 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdbVs.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsCxxCdbVs.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H #define SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettingsCxxCdb.h" class SourceGroupSettingsCxxCdbVs @@ -13,6 +9,4 @@ class SourceGroupSettingsCxxCdbVs using SourceGroupSettingsCxxCdb::SourceGroupSettingsCxxCdb; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h b/src/lib/settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h index eef0c32b..795f6d5e 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsCxxCodeblocks.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H #define SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithCppStandard.h" #include "SourceGroupSettingsWithCStandard.h" @@ -36,6 +32,4 @@ public: } }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsJavaEmpty.h b/src/lib/settings/source_group/type/SourceGroupSettingsJavaEmpty.h index 67b5dc7e..f03e8500 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsJavaEmpty.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsJavaEmpty.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H #define SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithClasspath.h" #include "SourceGroupSettingsWithExcludeFilters.h" @@ -32,6 +28,4 @@ public: } }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsJavaGradle.h b/src/lib/settings/source_group/type/SourceGroupSettingsJavaGradle.h index 54ca9711..90d598f6 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsJavaGradle.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsJavaGradle.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H #define SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithExcludeFilters.h" #include "SourceGroupSettingsWithJavaGradle.h" @@ -30,6 +26,4 @@ public: } }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsJavaMaven.h b/src/lib/settings/source_group/type/SourceGroupSettingsJavaMaven.h index addd1e43..bc6cbe40 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsJavaMaven.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsJavaMaven.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H #define SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithExcludeFilters.h" #include "SourceGroupSettingsWithJavaMaven.h" @@ -30,6 +26,4 @@ public: } }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H diff --git a/src/lib/settings/source_group/type/SourceGroupSettingsPythonEmpty.h b/src/lib/settings/source_group/type/SourceGroupSettingsPythonEmpty.h index 6769d784..be75250e 100644 --- a/src/lib/settings/source_group/type/SourceGroupSettingsPythonEmpty.h +++ b/src/lib/settings/source_group/type/SourceGroupSettingsPythonEmpty.h @@ -1,10 +1,6 @@ #ifndef SOURCE_GROUP_SETTINGS_PYTHON_EMPTY_H #define SOURCE_GROUP_SETTINGS_PYTHON_EMPTY_H -#include "language_packages.h" - -#if BUILD_PYTHON_LANGUAGE_PACKAGE - #include "SourceGroupSettingsWithComponents.h" #include "SourceGroupSettingsWithExcludeFilters.h" #include "SourceGroupSettingsWithPythonEnvironmentPath.h" @@ -30,6 +26,4 @@ public: } }; -#endif // BUILD_PYTHON_LANGUAGE_PACKAGE - #endif // SOURCE_GROUP_SETTINGS_PYTHON_EMPTY_H diff --git a/src/lib_gui/CMakeLists.txt b/src/lib_gui/CMakeLists.txt index 633da536..35819428 100644 --- a/src/lib_gui/CMakeLists.txt +++ b/src/lib_gui/CMakeLists.txt @@ -146,58 +146,22 @@ add_files( qt/project_wizard/content/path/QtProjectWizardContentPath.cpp qt/project_wizard/content/path/QtProjectWizardContentPath.h - qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp - qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h - qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp - qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h - qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp - qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h - qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp - qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h - qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp - qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h - qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp - qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h qt/project_wizard/content/paths/QtProjectWizardContentPaths.cpp qt/project_wizard/content/paths/QtProjectWizardContentPaths.h - qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp - qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h qt/project_wizard/content/paths/QtProjectWizardContentPathsExclude.cpp qt/project_wizard/content/paths/QtProjectWizardContentPathsExclude.h - qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp - qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h - qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp - qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h - qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp - qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h - qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp - qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h - qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp - qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.h qt/project_wizard/content/QtProjectWizardContent.cpp qt/project_wizard/content/QtProjectWizardContent.h - qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp - qt/project_wizard/content/QtProjectWizardContentCppStandard.h - qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp - qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h - qt/project_wizard/content/QtProjectWizardContentCStandard.cpp - qt/project_wizard/content/QtProjectWizardContentCStandard.h qt/project_wizard/content/QtProjectWizardContentCustomCommand.cpp qt/project_wizard/content/QtProjectWizardContentCustomCommand.h - qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp - qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h qt/project_wizard/content/QtProjectWizardContentExtensions.cpp qt/project_wizard/content/QtProjectWizardContentExtensions.h - qt/project_wizard/content/QtProjectWizardContentFlags.cpp - qt/project_wizard/content/QtProjectWizardContentFlags.h qt/project_wizard/content/QtProjectWizardContentGroup.cpp qt/project_wizard/content/QtProjectWizardContentGroup.h - qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp - qt/project_wizard/content/QtProjectWizardContentJavaStandard.h qt/project_wizard/content/QtProjectWizardContentPreferences.cpp qt/project_wizard/content/QtProjectWizardContentPreferences.h qt/project_wizard/content/QtProjectWizardContentProjectData.cpp @@ -210,8 +174,6 @@ add_files( qt/project_wizard/content/QtProjectWizardContentSourceGroupInfoText.h qt/project_wizard/content/QtProjectWizardContentUnloadable.cpp qt/project_wizard/content/QtProjectWizardContentUnloadable.h - qt/project_wizard/content/QtProjectWizardContentVS.cpp - qt/project_wizard/content/QtProjectWizardContentVS.h qt/project_wizard/QtProjectWizard.cpp qt/project_wizard/QtProjectWizard.h @@ -333,40 +295,6 @@ add_files( qt/QtCoreApplication.cpp qt/QtCoreApplication.h - utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp - utility/path_detector/cxx_header/CxxFrameworkPathDetector.h - utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp - utility/path_detector/cxx_header/CxxHeaderPathDetector.h - utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp - utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h - utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp - utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h - utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp - utility/path_detector/cxx_header/utilityCxxHeaderDetection.h - - utility/path_detector/java_runtime/JavaPathDetector.cpp - utility/path_detector/java_runtime/JavaPathDetector.h - utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp - utility/path_detector/java_runtime/JavaPathDetectorLinux.h - utility/path_detector/java_runtime/JavaPathDetectorMac.cpp - utility/path_detector/java_runtime/JavaPathDetectorMac.h - utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp - utility/path_detector/java_runtime/JavaPathDetectorWindows.h - - utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp - utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h - utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp - utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h - utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp - utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h - utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp - utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h - - utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp - utility/path_detector/maven_executable/MavenPathDetectorUnix.h - utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp - utility/path_detector/maven_executable/MavenPathDetectorWindows.h - utility/path_detector/CombinedPathDetector.cpp utility/path_detector/CombinedPathDetector.h utility/path_detector/PathDetector.cpp @@ -378,3 +306,99 @@ add_files( utility/utilityPathDetection.h ) +if (BUILD_CXX_LANGUAGE_PACKAGE) + add_files( + LIB_GUI + + qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp + qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h + qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp + qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h + qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp + qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h + + qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp + qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h + qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp + qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h + qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp + qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h + qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp + qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h + qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp + qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h + + qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp + qt/project_wizard/content/QtProjectWizardContentCppStandard.h + qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp + qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h + qt/project_wizard/content/QtProjectWizardContentCStandard.cpp + qt/project_wizard/content/QtProjectWizardContentCStandard.h + qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp + qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h + qt/project_wizard/content/QtProjectWizardContentFlags.cpp + qt/project_wizard/content/QtProjectWizardContentFlags.h + qt/project_wizard/content/QtProjectWizardContentVS.cpp + qt/project_wizard/content/QtProjectWizardContentVS.h + + utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp + utility/path_detector/cxx_header/CxxFrameworkPathDetector.h + utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp + utility/path_detector/cxx_header/CxxHeaderPathDetector.h + utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp + utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h + utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp + utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h + utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp + utility/path_detector/cxx_header/utilityCxxHeaderDetection.h + ) +endif() + +if (BUILD_JAVA_LANGUAGE_PACKAGE) + add_files( + LIB_GUI + + qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp + qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h + qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp + qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h + + qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp + qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h + + qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp + qt/project_wizard/content/QtProjectWizardContentJavaStandard.h + + utility/path_detector/java_runtime/JavaPathDetector.cpp + utility/path_detector/java_runtime/JavaPathDetector.h + utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp + utility/path_detector/java_runtime/JavaPathDetectorLinux.h + utility/path_detector/java_runtime/JavaPathDetectorMac.cpp + utility/path_detector/java_runtime/JavaPathDetectorMac.h + utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp + utility/path_detector/java_runtime/JavaPathDetectorWindows.h + + utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp + utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h + utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp + utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h + utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp + utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h + utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp + utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h + + utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp + utility/path_detector/maven_executable/MavenPathDetectorUnix.h + utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp + utility/path_detector/maven_executable/MavenPathDetectorWindows.h + ) +endif() + +if (BUILD_PYTHON_LANGUAGE_PACKAGE) + add_files( + LIB_GUI + + qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp + qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h + ) +endif() diff --git a/src/lib_gui/qt/project_wizard/QtProjectWizard.cpp b/src/lib_gui/qt/project_wizard/QtProjectWizard.cpp index cb21943c..93c18190 100644 --- a/src/lib_gui/qt/project_wizard/QtProjectWizard.cpp +++ b/src/lib_gui/qt/project_wizard/QtProjectWizard.cpp @@ -10,48 +10,20 @@ #include "language_packages.h" #include "QtProjectWizardContent.h" -#include "QtProjectWizardContentCppStandard.h" -#include "QtProjectWizardContentCrossCompilationOptions.h" -#include "QtProjectWizardContentCStandard.h" #include "QtProjectWizardContentCustomCommand.h" -#include "QtProjectWizardContentCxxPchFlags.h" #include "QtProjectWizardContentExtensions.h" -#include "QtProjectWizardContentFlags.h" #include "QtProjectWizardContentGroup.h" -#include "QtProjectWizardContentJavaStandard.h" #include "QtProjectWizardContentPath.h" -#include "QtProjectWizardContentPathCDB.h" -#include "QtProjectWizardContentPathCodeblocksProject.h" -#include "QtProjectWizardContentPathCxxPch.h" -#include "QtProjectWizardContentPathPythonEnvironment.h" -#include "QtProjectWizardContentPathSourceGradle.h" -#include "QtProjectWizardContentPathSourceMaven.h" #include "QtProjectWizardContentPaths.h" -#include "QtProjectWizardContentPathsClassJava.h" #include "QtProjectWizardContentPathsExclude.h" -#include "QtProjectWizardContentPathsFrameworkSearch.h" -#include "QtProjectWizardContentPathsFrameworkSearchGlobal.h" -#include "QtProjectWizardContentPathsHeaderSearch.h" -#include "QtProjectWizardContentPathsHeaderSearchGlobal.h" -#include "QtProjectWizardContentPathsIndexedHeaders.h" #include "QtProjectWizardContentPathsSource.h" #include "QtProjectWizardContentProjectData.h" #include "QtProjectWizardContentSelect.h" #include "QtProjectWizardContentSourceGroupData.h" #include "QtProjectWizardContentSourceGroupInfoText.h" #include "QtProjectWizardContentUnloadable.h" -#include "QtProjectWizardContentVS.h" #include "QtSourceGroupWizardPage.h" -#include "SourceGroupSettingsCEmpty.h" -#include "SourceGroupSettingsCppEmpty.h" #include "SourceGroupSettingsCustomCommand.h" -#include "SourceGroupSettingsCxxCdb.h" -#include "SourceGroupSettingsCxxCdbVs.h" -#include "SourceGroupSettingsCxxCodeblocks.h" -#include "SourceGroupSettingsJavaEmpty.h" -#include "SourceGroupSettingsJavaGradle.h" -#include "SourceGroupSettingsJavaMaven.h" -#include "SourceGroupSettingsPythonEmpty.h" #include "SourceGroupSettingsUnloadable.h" #include "MessageLoadProject.h" #include "MessageStatus.h" @@ -64,6 +36,43 @@ #include "Application.h" +#if BUILD_CXX_LANGUAGE_PACKAGE +#include "QtProjectWizardContentCppStandard.h" +#include "QtProjectWizardContentCrossCompilationOptions.h" +#include "QtProjectWizardContentCStandard.h" +#include "QtProjectWizardContentCxxPchFlags.h" +#include "QtProjectWizardContentFlags.h" +#include "QtProjectWizardContentPathCDB.h" +#include "QtProjectWizardContentPathCodeblocksProject.h" +#include "QtProjectWizardContentPathCxxPch.h" +#include "QtProjectWizardContentPathsFrameworkSearch.h" +#include "QtProjectWizardContentPathsFrameworkSearchGlobal.h" +#include "QtProjectWizardContentPathsHeaderSearch.h" +#include "QtProjectWizardContentPathsHeaderSearchGlobal.h" +#include "QtProjectWizardContentPathsIndexedHeaders.h" +#include "QtProjectWizardContentVS.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCdbVs.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#endif // BUILD_CXX_LANGUAGE_PACKAGE + +#if BUILD_JAVA_LANGUAGE_PACKAGE +#include "QtProjectWizardContentJavaStandard.h" +#include "QtProjectWizardContentPathSourceGradle.h" +#include "QtProjectWizardContentPathSourceMaven.h" +#include "QtProjectWizardContentPathsClassJava.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaMaven.h" +#endif // BUILD_JAVA_LANGUAGE_PACKAGE + +#if BUILD_PYTHON_LANGUAGE_PACKAGE +#include "QtProjectWizardContentPathPythonEnvironment.h" +#include "SourceGroupSettingsPythonEmpty.h" +#endif // BUILD_PYTHON_LANGUAGE_PACKAGE + namespace { diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.cpp index e2641982..fc2b0d9a 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentCStandard.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include @@ -48,5 +46,3 @@ void QtProjectWizardContentCStandard::save() m_sourceGroupSettings->setCStandard(m_standard->currentText().toStdWString()); } } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.h index 39dd9c28..f708a72e 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCStandard.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_C_STANDARD #define QT_PROJECT_WIZARD_CONTENT_C_STANDARD -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QComboBox; @@ -32,6 +28,4 @@ private: QComboBox* m_standard; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_C_STANDARD diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp index 4c6ccedc..ebf15bc3 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentCppStandard.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include @@ -48,5 +46,3 @@ void QtProjectWizardContentCppStandard::save() m_sourceGroupSettings->setCppStandard(m_standard->currentText().toStdWString()); } } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.h index 81ae0d88..7779dcb0 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCppStandard.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_CPP_STANDARD #define QT_PROJECT_WIZARD_CONTENT_CPP_STANDARD -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QComboBox; @@ -32,6 +28,4 @@ private: QComboBox* m_standard; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_CPP_STANDARD diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp index 635e3062..19756178 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentCrossCompilationOptions.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include #include @@ -167,5 +165,3 @@ void QtProjectWizardContentCrossCompilationOptions::updateTargetOptionsEnabled() m_sys->setEnabled(useTargetOptions); m_abi->setEnabled(useTargetOptions); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h index 41494505..70e4d824 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCrossCompilationOptions.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_CROSS_COMPILATION_OPTIONS #define QT_PROJECT_WIZARD_CONTENT_CROSS_COMPILATION_OPTIONS -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QCheckBox; @@ -42,6 +38,4 @@ private: QComboBox* m_abi; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_CROSS_COMPILATION_OPTIONS diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp index b4729626..083876ad 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentCxxPchFlags.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include @@ -85,5 +83,3 @@ bool QtProjectWizardContentCxxPchFlags::check() return true; } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h index 2c876bf2..fcfd72a5 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentCxxPchFlags.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_CXX_PCH_FLAGS_H #define QT_PROJECT_WIZARD_CONTENT_CXX_PCH_FLAGS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QCheckBox; @@ -38,6 +34,4 @@ private: QtStringListBox* m_list; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_CXX_PCH_FLAGS_H diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.cpp index 18ebd5d0..18e9e36c 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentFlags.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include @@ -71,5 +69,3 @@ bool QtProjectWizardContentFlags::check() return true; } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.h index 996e3cd8..f61355c9 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentFlags.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_FLAGS_H #define QT_PROJECT_WIZARD_CONTENT_FLAGS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QtStringListBox; @@ -36,6 +32,4 @@ private: QtStringListBox* m_list; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_FLAGS_H diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp index 9b670541..3b36dc77 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentJavaStandard.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include #include @@ -48,5 +46,3 @@ void QtProjectWizardContentJavaStandard::save() m_sourceGroupSettings->setJavaStandard(m_standard->currentText().toStdWString()); } } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.h index 90374d25..eab2b63a 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentJavaStandard.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_JAVA_STANDARD #define QT_PROJECT_WIZARD_CONTENT_JAVA_STANDARD -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QComboBox; @@ -32,6 +28,4 @@ private: QComboBox* m_standard; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_JAVA_STANDARD diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.cpp index d7bad794..85f16217 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentVS.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "MessageIDECreateCDB.h" QtProjectWizardContentVS::QtProjectWizardContentVS(QtProjectWizardWindow* window) @@ -46,5 +44,3 @@ void QtProjectWizardContentVS::handleVSCDBClicked() { MessageIDECreateCDB().dispatch(); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.h b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.h index c740b343..db98a783 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.h +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentVS.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_VS_H #define QT_PROJECT_WIZARD_CONTENT_VS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContent.h" class QtProjectWizardContentVS @@ -21,6 +17,4 @@ private slots: void handleVSCDBClicked(); }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_VS_H diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp index ef4b8a23..20112faf 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathCDB.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPathsIndexedHeaders.h" #include "SourceGroupCxxCdb.h" #include "SourceGroupSettingsCxxCdb.h" @@ -135,5 +133,3 @@ std::shared_ptr QtProjectWizardContentPathCDB::getSourceGro { return m_settings; } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h index d51dedf7..f6bf8e4c 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCDB.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATH_CDB_H #define QT_PROJECT_WIZARD_CONTENT_PATH_CDB_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPath.h" #include "SingleValueCache.h" @@ -41,6 +37,4 @@ private: mutable SingleValueCache> m_filePaths; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATH_CDB_H diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp index a0811236..46db3757 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathCodeblocksProject.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPathsIndexedHeaders.h" #include "SourceGroupCxxCodeblocks.h" #include "SourceGroupSettingsCxxCodeblocks.h" @@ -115,5 +113,3 @@ std::shared_ptr QtProjectWizardContentPathCodeblocksProject { return m_settings; } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h index a3e45c4b..00b340a9 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCodeblocksProject.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATH_CODE_BLOCKS_PROJECT_H #define QT_PROJECT_WIZARD_CONTENT_PATH_CODE_BLOCKS_PROJECT_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPath.h" #include "SingleValueCache.h" @@ -41,6 +37,4 @@ private: mutable SingleValueCache> m_filePaths; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATH_CODE_BLOCKS_PROJECT_H diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp index 3e92dbec..aafa1dfe 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathCxxPch.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "IndexerCommandCxx.h" @@ -110,5 +108,3 @@ std::shared_ptr QtProjectWizardContentPathCxxPch::getSource { return m_settings; } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h index dd65a77b..17568e0e 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathCxxPch.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATH_CXX_PCH_H #define QT_PROJECT_WIZARD_CONTENT_PATH_CXX_PCH_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPath.h" #include "SingleValueCache.h" @@ -35,6 +31,4 @@ private: std::shared_ptr m_settingsCxxPch; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATH_CXX_PCH_H diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp index bbd9d69d..22b123bb 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathPythonEnvironment.h" -#if BUILD_PYTHON_LANGUAGE_PACKAGE - #include "ResourcePaths.h" #include "SourceGroupSettingsPythonEmpty.h" #include "utilityApp.h" @@ -91,5 +89,3 @@ std::shared_ptr QtProjectWizardContentPathPythonEnvironment { return m_settings; } - -#endif // BUILD_PYTHON_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h index 0c031c7a..2104229b 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathPythonEnvironment.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATH_PYTHON_ENVIRONMENT_H #define QT_PROJECT_WIZARD_CONTENT_PATH_PYTHON_ENVIRONMENT_H -#include "language_packages.h" - -#if BUILD_PYTHON_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPath.h" #include "QtThreadedFunctor.h" @@ -31,6 +27,4 @@ private: QLabel* m_resultLabel; }; -#endif // BUILD_PYTHON_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATH_PYTHON_ENVIRONMENT_H diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp index afb18d6a..6d6245ff 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathSourceGradle.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include #include "Application.h" @@ -73,5 +71,3 @@ std::shared_ptr QtProjectWizardContentPathSourceGradle::get { return m_settings; } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h index 33767048..e85301c5 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceGradle.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_GRADLE_H #define QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_GRADLE_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPath.h" class QCheckBox; @@ -34,6 +30,4 @@ private: QCheckBox* m_shouldIndexTests; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_GRADLE_H diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp index 101b590b..14888593 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathSourceMaven.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include #include "Application.h" @@ -103,5 +101,3 @@ std::shared_ptr QtProjectWizardContentPathSourceMaven::getS { return m_settings; } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h index 37ee9af7..749524bc 100644 --- a/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h +++ b/src/lib_gui/qt/project_wizard/content/path/QtProjectWizardContentPathSourceMaven.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_MAVEN_H #define QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_MAVEN_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPath.h" class QCheckBox; @@ -34,6 +30,4 @@ private: QCheckBox* m_shouldIndexTests; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATH_SOURCE_MAVEN_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp index 78f9bb92..dda9c484 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathsClassJava.h" -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include #include "SourceGroupSettings.h" @@ -56,5 +54,3 @@ void QtProjectWizardContentPathsClassJava::save() settings->setUseJreSystemLibrary(m_useJreSystemLibraryCheckBox->isChecked()); } } - -#endif // BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h index 8783176d..b35e441f 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsClassJava.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_CLASS_JAVA_H #define QT_PROJECT_WIZARD_CONTENT_PATHS_CLASS_JAVA_H -#include "language_packages.h" - -#if BUILD_JAVA_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPaths.h" class QCheckBox; @@ -25,6 +21,4 @@ private: QCheckBox* m_useJreSystemLibraryCheckBox; }; -#endif // BUILD_JAVA_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATHS_CLASS_JAVA_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp index 5554edca..e3d6bec4 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathsFrameworkSearch.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "SourceGroupSettings.h" #include "SourceGroupSettingsWithCxxPathsAndFlags.h" @@ -43,5 +41,3 @@ bool QtProjectWizardContentPathsFrameworkSearch::isScrollAble() const { return true; } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h index bbb438a5..1685832a 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearch.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_H #define QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPaths.h" class QtProjectWizardContentPathsFrameworkSearch @@ -22,6 +18,4 @@ public: virtual bool isScrollAble() const override; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp index faa9e31c..b51e4613 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathsFrameworkSearchGlobal.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "ApplicationSettings.h" #include "utilityPathDetection.h" @@ -34,5 +32,3 @@ void QtProjectWizardContentPathsFrameworkSearchGlobal::save() ApplicationSettings::getInstance()->setFrameworkSearchPaths(m_list->getPathsAsDisplayed()); ApplicationSettings::getInstance()->save(); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h index df906809..97d1bf1f 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsFrameworkSearchGlobal.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_GLOBAL_H #define QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_GLOBAL_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPaths.h" class QtProjectWizardContentPathsFrameworkSearchGlobal @@ -19,6 +15,4 @@ public: virtual void save() override; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATHS_FRAMEWORK_SEARCH_GLOBAL_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp index ace6f1a6..ccea3235 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathsHeaderSearch.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include @@ -399,5 +397,3 @@ void QtProjectWizardContentPathsHeaderSearch::showValidationResult(const std::ve connect(m_filesDialog.get(), &QtTextEditDialog::canceled, this, &QtProjectWizardContentPathsHeaderSearch::closedFilesDialog); } } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h index 422c1c6d..b14d35dd 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_H #define QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "FilePathFilter.h" #include "QtProjectWizardContentPaths.h" @@ -43,6 +39,4 @@ private: const bool m_indicateAsAdditional; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp index 10e5901e..097869fb 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathsHeaderSearchGlobal.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "ApplicationSettings.h" @@ -112,5 +110,3 @@ void QtProjectWizardContentPathsHeaderSearchGlobal::setPaths(const std::vectoraddPaths({ ResourcePaths::getCxxCompilerHeaderPath() }, true); m_list->addPaths(paths); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h index 7c538445..88ef0b0a 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_GLOBAL_H #define QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_GLOBAL_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPaths.h" class QtProjectWizardContentPathsHeaderSearchGlobal @@ -27,6 +23,4 @@ private: void setPaths(const std::vector& paths); }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATHS_HEADER_SEARCH_GLOBAL_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp index 47f7fe54..f036bf7c 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.cpp @@ -1,7 +1,5 @@ #include "QtProjectWizardContentPathsIndexedHeaders.h" -#if BUILD_CXX_LANGUAGE_PACKAGE - #include #include "CodeblocksProject.h" @@ -253,5 +251,3 @@ void QtProjectWizardContentPathsIndexedHeaders::savedFilesDialog() m_list->setPaths(dynamic_cast(m_filesDialog.get())->getPathsList()); closedFilesDialog(); } - -#endif // BUILD_CXX_LANGUAGE_PACKAGE diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h index 45f75425..bc2893af 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsIndexedHeaders.h @@ -1,10 +1,6 @@ #ifndef QT_PROJECT_WIZARD_CONTENT_PATHS_INDEXED_HEADER_PATHS_H #define QT_PROJECT_WIZARD_CONTENT_PATHS_INDEXED_HEADER_PATHS_H -#include "language_packages.h" - -#if BUILD_CXX_LANGUAGE_PACKAGE - #include "QtProjectWizardContentPaths.h" class SourceGroupSettingsCxxCdb; @@ -38,6 +34,4 @@ private: const std::string m_projectKindName; }; -#endif // BUILD_CXX_LANGUAGE_PACKAGE - #endif // QT_PROJECT_WIZARD_CONTENT_PATHS_INDEXED_HEADER_PATHS_H diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp index b5eb115a..52992a0f 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsSource.cpp @@ -4,13 +4,13 @@ #include "SourceGroupCustomCommand.h" #include "SourceGroupSettingsCustomCommand.h" -#include "SourceGroupSettingsWithCxxPathsAndFlags.h" #include "SourceGroupSettingsWithSourcePaths.h" #include "utility.h" #include "utilityFile.h" #if BUILD_CXX_LANGUAGE_PACKAGE #include "SourceGroupCxxEmpty.h" +#include "SourceGroupSettingsWithCxxPathsAndFlags.h" #endif // BUILD_CXX_LANGUAGE_PACKAGE #if BUILD_JAVA_LANGUAGE_PACKAGE diff --git a/src/lib_gui/utility/utilityPathDetection.cpp b/src/lib_gui/utility/utilityPathDetection.cpp index 8a0c5262..3c76e968 100644 --- a/src/lib_gui/utility/utilityPathDetection.cpp +++ b/src/lib_gui/utility/utilityPathDetection.cpp @@ -1,29 +1,33 @@ #include "utilityPathDetection.h" +#include "language_packages.h" + #include "logging.h" +#include "utilityApp.h" -#include "JavaPathDetectorLinux.h" -#include "JavaPathDetectorMac.h" -#include "JavaPathDetectorWindows.h" - -#include "JreSystemLibraryPathDetectorLinux.h" -#include "JreSystemLibraryPathDetectorMac.h" -#include "JreSystemLibraryPathDetectorWindows.h" - -#include "MavenPathDetectorUnix.h" -#include "MavenPathDetectorWindows.h" - +#if BUILD_CXX_LANGUAGE_PACKAGE #include "CxxFrameworkPathDetector.h" #include "CxxHeaderPathDetector.h" #include "CxxVs10To14HeaderPathDetector.h" #include "CxxVs15HeaderPathDetector.h" +#endif // BUILD_CXX_LANGUAGE_PACKAGE -#include "utilityApp.h" +#if BUILD_JAVA_LANGUAGE_PACKAGE +#include "JavaPathDetectorLinux.h" +#include "JavaPathDetectorMac.h" +#include "JavaPathDetectorWindows.h" +#include "JreSystemLibraryPathDetectorLinux.h" +#include "JreSystemLibraryPathDetectorMac.h" +#include "JreSystemLibraryPathDetectorWindows.h" +#include "MavenPathDetectorUnix.h" +#include "MavenPathDetectorWindows.h" +#endif // BUILD_JAVA_LANGUAGE_PACKAGE std::shared_ptr utility::getJavaRuntimePathDetector() { std::shared_ptr combinedDetector = std::make_shared(); +#if BUILD_JAVA_LANGUAGE_PACKAGE switch (utility::getOsType()) { case OS_WINDOWS: @@ -39,6 +43,7 @@ std::shared_ptr utility::getJavaRuntimePathDetector() LOG_WARNING("No suitable Java Runtime path detector found"); break; } +#endif // BUILD_JAVA_LANGUAGE_PACKAGE return combinedDetector; } @@ -47,6 +52,7 @@ std::shared_ptr utility::getJreSystemLibraryPathsDetector( { std::shared_ptr combinedDetector = std::make_shared(); +#if BUILD_JAVA_LANGUAGE_PACKAGE switch (utility::getOsType()) { case OS_WINDOWS: @@ -62,6 +68,7 @@ std::shared_ptr utility::getJreSystemLibraryPathsDetector( LOG_WARNING("No suitable JRE system library path detector found"); break; } +#endif // BUILD_JAVA_LANGUAGE_PACKAGE return combinedDetector; } @@ -70,6 +77,7 @@ std::shared_ptr utility::getMavenExecutablePathDetector() { std::shared_ptr combinedDetector = std::make_shared(); +#if BUILD_JAVA_LANGUAGE_PACKAGE switch (utility::getOsType()) { case OS_WINDOWS: @@ -83,6 +91,7 @@ std::shared_ptr utility::getMavenExecutablePathDetector() LOG_WARNING("No suitable Maven path detector found"); break; } +#endif // BUILD_JAVA_LANGUAGE_PACKAGE return combinedDetector; } @@ -96,6 +105,7 @@ std::shared_ptr utility::getCxxVsHeaderPathDetector() return combinedDetector; } +#if BUILD_CXX_LANGUAGE_PACKAGE combinedDetector->addDetector(std::make_shared()); combinedDetector->addDetector(std::make_shared(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2015, false, APPLICATION_ARCHITECTURE_X86_32)); @@ -114,6 +124,7 @@ std::shared_ptr utility::getCxxVsHeaderPathDetector() combinedDetector->addDetector(std::make_shared(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2010, false, APPLICATION_ARCHITECTURE_X86_64)); combinedDetector->addDetector(std::make_shared(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2010, true, APPLICATION_ARCHITECTURE_X86_32)); combinedDetector->addDetector(std::make_shared(CxxVs10To14HeaderPathDetector::VISUAL_STUDIO_2010, true, APPLICATION_ARCHITECTURE_X86_64)); +#endif // BUILD_CXX_LANGUAGE_PACKAGE return combinedDetector; } @@ -121,15 +132,19 @@ std::shared_ptr utility::getCxxVsHeaderPathDetector() std::shared_ptr utility::getCxxHeaderPathDetector() { std::shared_ptr combinedDetector = getCxxVsHeaderPathDetector(); +#if BUILD_CXX_LANGUAGE_PACKAGE combinedDetector->addDetector(std::make_shared("clang")); combinedDetector->addDetector(std::make_shared("gcc")); +#endif // BUILD_CXX_LANGUAGE_PACKAGE return combinedDetector; } std::shared_ptr utility::getCxxFrameworkPathDetector() { std::shared_ptr combinedDetector = std::make_shared(); +#if BUILD_CXX_LANGUAGE_PACKAGE combinedDetector->addDetector(std::make_shared("clang")); combinedDetector->addDetector(std::make_shared("gcc")); +#endif // BUILD_CXX_LANGUAGE_PACKAGE return combinedDetector; } diff --git a/src/test/SettingsTestSuite.cpp b/src/test/SettingsTestSuite.cpp index 773bb7e3..03502035 100644 --- a/src/test/SettingsTestSuite.cpp +++ b/src/test/SettingsTestSuite.cpp @@ -1,10 +1,7 @@ #include "catch.hpp" -#include "language_packages.h" - #include "ProjectSettings.h" #include "Settings.h" -#include "SourceGroupSettingsWithCxxPathsAndFlags.h" #include "SourceGroupSettings.h" #include "SourceGroupSettingsWithSourcePaths.h" diff --git a/src/test/SourceGroupTestSuite.cpp b/src/test/SourceGroupTestSuite.cpp index 04dad623..ffa97f55 100644 --- a/src/test/SourceGroupTestSuite.cpp +++ b/src/test/SourceGroupTestSuite.cpp @@ -4,38 +4,39 @@ #include "language_packages.h" -#include "IndexerCommandCustom.h" -#include "SourceGroupCustomCommand.h" -#include "SourceGroupSettingsCEmpty.h" -#include "SourceGroupSettingsCppEmpty.h" -#include "SourceGroupSettingsCxxCdb.h" -#include "SourceGroupSettingsCxxCodeblocks.h" -#include "SourceGroupSettingsCustomCommand.h" -#include "SourceGroupSettingsJavaEmpty.h" -#include "SourceGroupSettingsJavaGradle.h" -#include "SourceGroupSettingsJavaMaven.h" -#include "ProjectSettings.h" +#include "Application.h" #include "ApplicationSettings.h" -#include "FileSystem.h" -#include "TextAccess.h" #include "AppPath.h" +#include "FileSystem.h" +#include "IndexerCommandCustom.h" +#include "ProjectSettings.h" +#include "SourceGroupCustomCommand.h" +#include "SourceGroupSettingsCustomCommand.h" +#include "TextAccess.h" #include "utilityPathDetection.h" #include "utilityString.h" #include "Version.h" -#include "Application.h" #if BUILD_CXX_LANGUAGE_PACKAGE #include "IndexerCommandCxx.h" #include "SourceGroupCxxEmpty.h" #include "SourceGroupCxxCdb.h" #include "SourceGroupCxxCodeblocks.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCodeblocks.h" #endif // BUILD_CXX_LANGUAGE_PACKAGE + #if BUILD_JAVA_LANGUAGE_PACKAGE #include "IndexerCommandJava.h" #include "JavaEnvironmentFactory.h" #include "SourceGroupJavaEmpty.h" #include "SourceGroupJavaGradle.h" #include "SourceGroupJavaMaven.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaMaven.h" #include "utilityJava.h" #endif // BUILD_JAVA_LANGUAGE_PACKAGE