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_java/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_files(
-	LIB_JAVA_FILES
+	LIB_JAVA
 
 	data/indexer/IndexerCommandJava.cpp
 	data/indexer/IndexerCommandJava.h

src/lib_java/LanguagePackageJava.cpp

@@ -1,6 +1,6 @@
 #include "LanguagePackageJava.h"
 
-#include "data/indexer/IndexerJava.h"
+#include "IndexerJava.h"
 
 std::vector<std::shared_ptr<IndexerBase>> LanguagePackageJava::instantiateSupportedIndexers() const
 {

src/lib_java/data/indexer/IndexerCommandJava.cpp

@@ -1,9 +1,9 @@
-#include "data/indexer/IndexerCommandJava.h"
+#include "IndexerCommandJava.h"
 
 #include <QJsonArray>
 #include <QJsonObject>
 
-#include "utility/utilityString.h"
+#include "utilityString.h"
 
 IndexerCommandType IndexerCommandJava::getStaticIndexerCommandType()
 {

src/lib_java/data/indexer/IndexerCommandJava.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "data/indexer/IndexerCommand.h"
+#include "IndexerCommand.h"
 
 class FilePath;
 class FilePathFilter;

src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp

@@ -1,6 +1,6 @@
-#include "data/indexer/IndexerCommandJava.h"
+#include "IndexerCommandJava.h"
 
-#include "utility/utilityString.h"
+#include "utilityString.h"
 
 IndexerCommandType IndexerCommandJava::getStaticIndexerCommandType()
 {

src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "data/indexer/IndexerCommand.h"
+#include "IndexerCommand.h"
 
 class FilePath;
 

src/lib_java/data/indexer/IndexerJava.cpp

@@ -1,8 +1,8 @@
-#include "data/indexer/IndexerJava.h"
+#include "IndexerJava.h"
 
-#include "data/indexer/IndexerCommandJava.h"
-#include "data/parser/ParserClientImpl.h"
-#include "data/parser/java/JavaParser.h"
+#include "IndexerCommandJava.h"
+#include "ParserClientImpl.h"
+#include "JavaParser.h"
 
 IndexerJava::~IndexerJava()
 {

src/lib_java/data/indexer/IndexerJava.h

@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "data/indexer/IndexerCommandJava.h"
-#include "data/indexer/Indexer.h"
+#include "IndexerCommandJava.h"
+#include "Indexer.h"
 
 class IndexerJava: public Indexer<IndexerCommandJava>
 {

src/lib_java/data/parser/java/JavaEnvironment.cpp

@@ -1,9 +1,9 @@
-#include "data/parser/java/JavaEnvironment.h"
+#include "JavaEnvironment.h"
 
 #include <jni.h>
 
-#include "utility/logging/logging.h"
-#include "data/parser/java/JavaEnvironmentFactory.h"
+#include "logging.h"
+#include "JavaEnvironmentFactory.h"
 
 JavaEnvironment::~JavaEnvironment()
 {

src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp

@@ -1,14 +1,14 @@
-#include "data/parser/java/JavaEnvironmentFactory.h"
+#include "JavaEnvironmentFactory.h"
 
 #include <cstdlib>
 
 #include <jni.h>
 
-#include "data/parser/java/JavaEnvironment.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/logging/logging.h"
-#include "utility/utilityLibrary.h"
-#include "utility/utilityWindows.h"
+#include "JavaEnvironment.h"
+#include "ApplicationSettings.h"
+#include "logging.h"
+#include "utilityLibrary.h"
+#include "utilityWindows.h"
 
 void JavaEnvironmentFactory::createInstance(std::string classPath, std::string& errorString)
 {

src/lib_java/data/parser/java/JavaParser.cpp

@@ -1,17 +1,17 @@
-#include "data/parser/java/JavaParser.h"
+#include "JavaParser.h"
 
 #include <jni.h>
 
-#include "data/name/NameHierarchy.h"
-#include "data/parser/java/JavaEnvironmentFactory.h"
-#include "data/parser/ParseLocation.h"
-#include "data/parser/ReferenceKind.h"
-#include "data/parser/ParserClient.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/text/TextAccess.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityJava.h"
-#include "utility/utilityString.h"
+#include "NameHierarchy.h"
+#include "JavaEnvironmentFactory.h"
+#include "ParseLocation.h"
+#include "ReferenceKind.h"
+#include "ParserClient.h"
+#include "ApplicationSettings.h"
+#include "TextAccess.h"
+#include "ResourcePaths.h"
+#include "utilityJava.h"
+#include "utilityString.h"
 
 void JavaParser::clearCaches()
 {

src/lib_java/data/parser/java/JavaParser.h

@@ -5,12 +5,12 @@
 #include <mutex>
 #include <string>
 
-#include "data/indexer/IndexerCommandJava.h"
-#include "data/parser/Parser.h"
-#include "data/parser/java/JavaEnvironment.h"
-#include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/MessageInterruptTasksCounter.h"
+#include "IndexerCommandJava.h"
+#include "Parser.h"
+#include "JavaEnvironment.h"
+#include "FilePath.h"
+#include "logging.h"
+#include "MessageInterruptTasksCounter.h"
 
 struct JNIEnv_;
 typedef JNIEnv_ JNIEnv;

src/lib_java/project/SourceGroupFactoryModuleJava.cpp

@@ -1,13 +1,13 @@
-#include "project/SourceGroupFactoryModuleJava.h"
+#include "SourceGroupFactoryModuleJava.h"
 
-#include "project/SourceGroupJavaEmpty.h"
-#include "project/SourceGroupJavaGradle.h"
-#include "project/SourceGroupJavaMaven.h"
-#include "project/SourceGroupJavaSonargraph.h"
-#include "settings/SourceGroupSettingsJavaEmpty.h"
-#include "settings/SourceGroupSettingsJavaGradle.h"
-#include "settings/SourceGroupSettingsJavaMaven.h"
-#include "settings/SourceGroupSettingsJavaSonargraph.h"
+#include "SourceGroupJavaEmpty.h"
+#include "SourceGroupJavaGradle.h"
+#include "SourceGroupJavaMaven.h"
+#include "SourceGroupJavaSonargraph.h"
+#include "SourceGroupSettingsJavaEmpty.h"
+#include "SourceGroupSettingsJavaGradle.h"
+#include "SourceGroupSettingsJavaMaven.h"
+#include "SourceGroupSettingsJavaSonargraph.h"
 
 bool SourceGroupFactoryModuleJava::supports(SourceGroupType type) const
 {

src/lib_java/project/SourceGroupFactoryModuleJava.h

@@ -1,7 +1,7 @@
 #ifndef SOURCE_GROUP_FACTORY_MODULE_JAVA_H
 #define SOURCE_GROUP_FACTORY_MODULE_JAVA_H
 
-#include "project/SourceGroupFactoryModule.h"
+#include "SourceGroupFactoryModule.h"
 
 class SourceGroupFactoryModuleJava: public SourceGroupFactoryModule
 {

src/lib_java/project/SourceGroupJava.cpp

@@ -1,9 +1,9 @@
-#include "project/SourceGroupJava.h"
+#include "SourceGroupJava.h"
 
-#include "data/indexer/IndexerCommandJava.h"
-#include "settings/SourceGroupSettingsJava.h"
-#include "utility/file/FileManager.h"
-#include "utility/logging/logging.h"
+#include "IndexerCommandJava.h"
+#include "SourceGroupSettingsJava.h"
+#include "FileManager.h"
+#include "logging.h"
 
 std::set<FilePath> SourceGroupJava::filterToContainedFilePaths(const std::set<FilePath>& filePaths) const
 {

src/lib_java/project/SourceGroupJava.h

@@ -5,7 +5,7 @@
 #include <set>
 #include <vector>
 
-#include "project/SourceGroup.h"
+#include "SourceGroup.h"
 
 class SourceGroupSettingsJava;
 

src/lib_java/project/SourceGroupJavaEmpty.cpp

@@ -1,7 +1,7 @@
-#include "project/SourceGroupJavaEmpty.h"
+#include "SourceGroupJavaEmpty.h"
 
-#include "settings/SourceGroupSettingsJavaEmpty.h"
-#include "utility/utilityJava.h"
+#include "SourceGroupSettingsJavaEmpty.h"
+#include "utilityJava.h"
 
 SourceGroupJavaEmpty::SourceGroupJavaEmpty(std::shared_ptr<SourceGroupSettingsJavaEmpty> settings)
 	: m_settings(settings)

src/lib_java/project/SourceGroupJavaEmpty.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "project/SourceGroupJava.h"
+#include "SourceGroupJava.h"
 
 class SourceGroupSettingsJavaEmpty;
 

src/lib_java/project/SourceGroupJavaGradle.cpp

@@ -1,12 +1,12 @@
-#include "project/SourceGroupJavaGradle.h"
+#include "SourceGroupJavaGradle.h"
 
-#include "component/view/DialogView.h"
-#include "settings/SourceGroupSettingsJavaGradle.h"
-#include "utility/file/FileSystem.h"
-#include "utility/ScopedFunctor.h"
-#include "utility/utility.h"
-#include "utility/utilityGradle.h"
-#include "utility/utilityJava.h"
+#include "DialogView.h"
+#include "SourceGroupSettingsJavaGradle.h"
+#include "FileSystem.h"
+#include "ScopedFunctor.h"
+#include "utility.h"
+#include "utilityGradle.h"
+#include "utilityJava.h"
 #include "Application.h"
 
 SourceGroupJavaGradle::SourceGroupJavaGradle(std::shared_ptr<SourceGroupSettingsJavaGradle> settings)

src/lib_java/project/SourceGroupJavaGradle.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "project/SourceGroupJava.h"
+#include "SourceGroupJava.h"
 
 class SourceGroupSettingsJavaGradle;
 

src/lib_java/project/SourceGroupJavaMaven.cpp

@@ -1,14 +1,14 @@
-#include "project/SourceGroupJavaMaven.h"
+#include "SourceGroupJavaMaven.h"
 
-#include "component/view/DialogView.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/SourceGroupSettingsJavaMaven.h"
-#include "utility/file/FileSystem.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/ScopedFunctor.h"
-#include "utility/utility.h"
-#include "utility/utilityJava.h"
-#include "utility/utilityMaven.h"
+#include "DialogView.h"
+#include "ApplicationSettings.h"
+#include "SourceGroupSettingsJavaMaven.h"
+#include "FileSystem.h"
+#include "MessageStatus.h"
+#include "ScopedFunctor.h"
+#include "utility.h"
+#include "utilityJava.h"
+#include "utilityMaven.h"
 #include "Application.h"
 
 SourceGroupJavaMaven::SourceGroupJavaMaven(std::shared_ptr<SourceGroupSettingsJavaMaven> settings)

src/lib_java/project/SourceGroupJavaMaven.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "project/SourceGroupJava.h"
+#include "SourceGroupJava.h"
 
 class SourceGroupSettingsJavaMaven;
 

src/lib_java/project/SourceGroupJavaSonargraph.cpp

@@ -1,11 +1,11 @@
-#include "project/SourceGroupJavaSonargraph.h"
+#include "SourceGroupJavaSonargraph.h"
 
-#include "data/indexer/IndexerCommandJava.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/SourceGroupSettingsJavaSonargraph.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/sonargraph/SonargraphProject.h"
-#include "utility/utilityJava.h"
+#include "IndexerCommandJava.h"
+#include "ApplicationSettings.h"
+#include "SourceGroupSettingsJavaSonargraph.h"
+#include "MessageStatus.h"
+#include "SonargraphProject.h"
+#include "utilityJava.h"
 #include "Application.h"
 
 SourceGroupJavaSonargraph::SourceGroupJavaSonargraph(std::shared_ptr<SourceGroupSettingsJavaSonargraph> settings)

src/lib_java/project/SourceGroupJavaSonargraph.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <set>
 
-#include "project/SourceGroup.h"
+#include "SourceGroup.h"
 
 class SourceGroupSettingsJavaSonargraph;
 

src/lib_java/utility/utilityGradle.cpp

@@ -1,15 +1,15 @@
-#include "utility/utilityGradle.h"
+#include "utilityGradle.h"
 
 #include <set>
 
-#include "data/parser/java/JavaEnvironment.h"
-#include "data/parser/java/JavaEnvironmentFactory.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityJava.h"
-#include "utility/utilityString.h"
+#include "JavaEnvironment.h"
+#include "JavaEnvironmentFactory.h"
+#include "ApplicationSettings.h"
+#include "logging.h"
+#include "MessageStatus.h"
+#include "ResourcePaths.h"
+#include "utilityJava.h"
+#include "utilityString.h"
 #include "Application.h"
 
 namespace

src/lib_java/utility/utilityJava.cpp

@@ -1,16 +1,16 @@
-#include "utility/utilityGradle.h"
+#include "utilityGradle.h"
 
-#include "component/view/DialogView.h"
-#include "data/parser/java/JavaEnvironment.h"
-#include "data/parser/java/JavaEnvironmentFactory.h"
-#include "settings/SourceGroupSettingsWithClasspath.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/text/TextAccess.h"
-#include "utility/ResourcePaths.h"
-#include "utility/ScopedFunctor.h"
-#include "utility/utilityString.h"
+#include "DialogView.h"
+#include "JavaEnvironment.h"
+#include "JavaEnvironmentFactory.h"
+#include "SourceGroupSettingsWithClasspath.h"
+#include "ApplicationSettings.h"
+#include "logging.h"
+#include "MessageStatus.h"
+#include "TextAccess.h"
+#include "ResourcePaths.h"
+#include "ScopedFunctor.h"
+#include "utilityString.h"
 #include "Application.h"
 
 namespace utility

src/lib_java/utility/utilityMaven.cpp

@@ -1,15 +1,15 @@
-#include "utility/utilityMaven.h"
+#include "utilityMaven.h"
 
 #include <cstdlib>
 
-#include "settings/ApplicationSettings.h"
-#include "utility/file/FilePath.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/text/TextAccess.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityString.h"
-#include "utility/utilityXml.h"
-#include "utility/utility.h"
+#include "ApplicationSettings.h"
+#include "FilePath.h"
+#include "MessageStatus.h"
+#include "TextAccess.h"
+#include "utilityApp.h"
+#include "utilityString.h"
+#include "utilityXml.h"
+#include "utility.h"
 #include "Application.h"
 
 namespace